362 files changed, 142283 insertions, 112423 deletions

diff --git a/TAO/tao/AbstractBase.cpp b/TAO/tao/AbstractBase.cpp
index 1b7f65f89fd..91ed3acd319 100644
--- a/TAO/tao/AbstractBase.cpp
+++ b/TAO/tao/AbstractBase.cpp
@@ -1,3 +1,5 @@
+// "$Id$"
+
 #include "tao/AbstractBase.h"
 
 #include "tao/Stub.h"
@@ -96,6 +98,13 @@ CORBA::AbstractBase::_remove_ref (void)
 {
 }
 
+void
+CORBA::AbstractBase::_tao_any_destructor (void *x)
+{
+  CORBA::AbstractBase_ptr tmp = ACE_static_cast (CORBA::AbstractBase_ptr, x);
+  CORBA::release (tmp);
+}
+
 CORBA::Object_ptr
 CORBA::AbstractBase::_to_object (void)
 {
diff --git a/TAO/tao/AbstractBase.h b/TAO/tao/AbstractBase.h
index 5d52bfc81da..38dc37bdc24 100644
--- a/TAO/tao/AbstractBase.h
+++ b/TAO/tao/AbstractBase.h
@@ -23,7 +23,6 @@
 
 #include "ace/CORBA_macros.h"
 
-
 class TAO_Stub;
 class TAO_Abstract_ServantBase;
 
@@ -65,6 +64,9 @@ namespace CORBA
     static CORBA::AbstractBase_ptr _duplicate (CORBA::AbstractBase_ptr obj);
     static CORBA::AbstractBase_ptr _nil (void);
 
+    /// Used in the implementation of CORBA::Any
+    static void _tao_any_destructor (void*);
+
     CORBA::Object_ptr _to_object (void);
     CORBA::ValueBase *_to_value (void);
 
diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp
index 9a810548d4e..d91d3e970f5 100644
--- a/TAO/tao/Abstract_Servant_Base.cpp
+++ b/TAO/tao/Abstract_Servant_Base.cpp
@@ -1,7 +1,10 @@
 // $Id$
+
 #include "tao/Abstract_Servant_Base.h"
 
-ACE_RCSID (tao, Abstract_Servant_Base, "$Id$")
+ACE_RCSID (tao, 
+           Abstract_Servant_Base, 
+           "$Id$")
 
 TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (void)
 {
@@ -13,8 +16,6 @@ TAO_Abstract_ServantBase::~TAO_Abstract_ServantBase (void)
   // No-Op.
 }
 
-
-
 void
 TAO_Abstract_ServantBase::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index a0fa343064f..aa81020b045 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -41,6 +41,12 @@ typedef void (*TAO_Skeleton)(
 #endif
   );
 
+namespace CORBA
+{
+  class InterfaceDef;
+  typedef InterfaceDef *InterfaceDef_ptr;
+};
+
 class TAO_Export TAO_Abstract_ServantBase
 {
 public:
diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h
index f8a172cd560..2dde56c7f67 100644
--- a/TAO/tao/Acceptor_Filter.h
+++ b/TAO/tao/Acceptor_Filter.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_MProfile;
+#include "tao/Object_KeyC.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
@@ -31,8 +31,8 @@ class TAO_MProfile;
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+class TAO_MProfile;
 class TAO_Acceptor;
-class TAO_ObjectKey;
 
 /**
  * @class TAO_Acceptor_Filter
@@ -53,7 +53,7 @@ public:
    * selected acceptors (endpoints) from the array delimited by
    * <acceptors_begin> and <acceptors_end>.
    */
-  virtual int fill_profile (const TAO_ObjectKey &object_key,
+  virtual int fill_profile (const TAO::ObjectKey &object_key,
                             TAO_MProfile &mprofile,
                             TAO_Acceptor **acceptors_begin,
                             TAO_Acceptor **acceptors_end,
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
index c5951915b33..bb7a26db570 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -133,7 +133,7 @@ TAO_Adapter_Registry::insert (TAO_Adapter *adapter
 }
 
 void
-TAO_Adapter_Registry::dispatch (TAO_ObjectKey &key,
+TAO_Adapter_Registry::dispatch (TAO::ObjectKey &key,
                                 TAO_ServerRequest &request,
                                 CORBA::Object_out forward_to
                                 ACE_ENV_ARG_DECL)
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index dd3e5057303..6b1bdcc6571 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -17,6 +17,7 @@
 
 #include "tao/corbafwd.h"
 #include "tao/Exception.h"
+#include "tao/Object_KeyC.h"
 #include "ace/Service_Object.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -34,7 +35,6 @@ class TAO_ORB_Core;
 class TAO_Stub;
 class TAO_MProfile;
 class TAO_ServerRequest;
-class TAO_ObjectKey;
 
 class TAO_Export TAO_Adapter
 {
@@ -62,7 +62,7 @@ public:
   virtual int priority (void) const = 0;
 
   /// Return the status....
-  virtual int dispatch (TAO_ObjectKey &key,
+  virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
                         CORBA::Object_out forward_to
                         ACE_ENV_ARG_DECL)
@@ -141,7 +141,7 @@ public:
    * It tries the adapters ordered by priority, stopping when the
    * adapter returns a status different from DS_MISMATCHED_KEY
    */
-  void dispatch (TAO_ObjectKey &key,
+  void dispatch (TAO::ObjectKey &key,
                  TAO_ServerRequest &request,
                  CORBA::Object_out forward_to
                  ACE_ENV_ARG_DECL)
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 966aab39b9b..e55dd8c03d7 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -1,14 +1,7 @@
 // $Id$
 
-// Portions of this file are:
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-
-#include "tao/Any.h"
-#include "tao/Marshal.h"
+#include "tao/Any_T.h"
 #include "tao/ORB_Core.h"
-#include "tao/AbstractBase.h"
-#include "tao/debug.h"
 #include "tao/Codeset_Translator_Factory.h"
 
 #if !defined (__ACE_INLINE__)
@@ -19,324 +12,360 @@ ACE_RCSID (tao,
            Any,
            "$Id$")
 
-
-CORBA::TypeCode_ptr
-CORBA::Any::type (void) const
+CORBA::Any::Any (void)
+  : impl_ (0)
 {
-  return CORBA::TypeCode::_duplicate (this->type_.in ());
 }
 
-// Will replace if the TypeCode arg is an alias for the existing one -
-// otherwise raises an exception.
-
-void
-CORBA::Any::type (CORBA::TypeCode_ptr tc
-                  ACE_ENV_ARG_DECL)
+CORBA::Any::Any (const CORBA::Any &rhs)
+  : impl_ (rhs.impl_)
 {
-  CORBA::Boolean equiv = this->type_->equivalent (tc
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (equiv)
+  if (this->impl_ != 0)
     {
-      this->type_ = CORBA::TypeCode::_duplicate (tc);
-    }
-  else
-    {
-      ACE_THROW (CORBA::BAD_TYPECODE ());
+      this->impl_->_add_ref ();
     }
 }
 
-// This method is deprecated and will eventually be removed from the
-// spec. It is included here for backward compatibility and its return
-// value may NOT be cast to anything useful. It will only tell whether the
-// Any contains a value or not. Use of >>= is recommended for anything else.
-
-const void *
-CORBA::Any::value (void) const
+CORBA::Any::Any (CORBA::TypeCode_ptr tc,
+                 void *value,
+                 CORBA::Boolean release)
 {
-  if (this->any_owns_data_)
+  if (value != 0)
     {
-      return this->value_;
+      ACE_DECLARE_NEW_CORBA_ENV;
+      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      return;
     }
-  else
+
+  ACE_NEW (this->impl_,
+           TAO::Unknown_IDL_Type (tc,
+                                  0,
+                                  tc->byte_order_,
+                                  release));
+}
+
+CORBA::Any::~Any (void)
+{
+  if (this->impl_ != 0)
     {
-      return this->cdr_;
+      this->impl_->_remove_ref ();
     }
 }
 
-// Default "Any" constructor -- initializes to nulls per the
-// OMG C++ mapping.
+CORBA::Any &
+CORBA::Any::operator= (const CORBA::Any &rhs)
+{
+  if (this->impl_ != rhs.impl_)
+    {
+      if (this->impl_ != 0)
+        {
+          this->impl_->free_value ();
+        }
+
+      this->impl_ = rhs.impl_;
 
-// NOTE: null (zero) typecode pointers are also treated as the null
-// typecode ...
+      if (this->impl_ != 0)
+        {
+          this->impl_->_add_ref ();
+        }
+    }
 
-CORBA::Any::Any (void)
-  : type_ (CORBA::TypeCode::_duplicate (CORBA::_tc_null)),
-    byte_order_ (TAO_ENCAP_BYTE_ORDER),
-    cdr_ (0),
-    any_owns_data_ (0),
-    contains_local_ (0),
-    value_ (0),
-    destructor_ (0),
-    char_translator_ (0),
-    wchar_translator_ (0)
-{
-}
-
-CORBA::Any::Any (CORBA::TypeCode_ptr tc)
-  : type_ (CORBA::TypeCode::_duplicate (tc)),
-    byte_order_ (TAO_ENCAP_BYTE_ORDER),
-    cdr_ (0),
-    any_owns_data_ (0),
-    contains_local_ (0),
-    value_ (0),
-    destructor_ (0),
-    char_translator_ (0),
-    wchar_translator_ (0)
-{
-}
-
-// Constructor using a message block.
-CORBA::Any::Any (CORBA::TypeCode_ptr type,
-                 CORBA::UShort,
-                 int byte_order,
-                 const ACE_Message_Block* mb)
-  : type_ (CORBA::TypeCode::_duplicate (type)),
-    byte_order_ (byte_order),
-    any_owns_data_ (0),
-    contains_local_ (0),
-    value_ (0),
-    destructor_ (0),
-    char_translator_ (0),
-    wchar_translator_ (0)
-{
-  ACE_NEW (this->cdr_,
-           ACE_Message_Block);
-  ACE_CDR::consolidate (this->cdr_,
-                        mb);
+  return *this;
 }
 
-// Copy constructor for "Any".
-CORBA::Any::Any (const CORBA::Any &src)
-  : cdr_ (0),
-    any_owns_data_ (0),
-    contains_local_ (src.contains_local_),
-    value_ (0),
-    destructor_ (0),
-    char_translator_ (0),
-    wchar_translator_ (0)
+void
+CORBA::Any::replace (CORBA::TypeCode_ptr,
+                     void *,
+                     CORBA::Boolean)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
+}
 
+void 
+CORBA::Any::replace (TAO::Any_Impl *new_impl)
 {
-  if (!CORBA::is_nil (src.type_.in ()))
+  if (this->impl_ != 0)
     {
-      this->type_ = CORBA::TypeCode::_duplicate (src.type_.in ());
+      this->impl_->_remove_ref ();
     }
-  else
+
+  this->impl_ = new_impl;
+}
+
+CORBA::TypeCode_ptr
+CORBA::Any::type (void) const
+{
+  if (this->impl_ != 0)
     {
-      this->type_ = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
+      return this->impl_->type ();
     }
 
-  // CDR stream always contains encoded object, if any holds anything
-  // at all.
-  this->byte_order_ = src.byte_order_;
+  return CORBA::TypeCode::_duplicate (CORBA::_tc_null);
+}
 
-  if (src.cdr_ != 0)
+CORBA::TypeCode_ptr
+CORBA::Any::_tao_get_typecode (void) const
+{
+  if (this->impl_ != 0)
     {
-      ACE_NEW (this->cdr_,
-               ACE_Message_Block);
-      ACE_CDR::consolidate (this->cdr_,
-                            src.cdr_);
+      return this->impl_->_tao_get_typecode ();
     }
 
-  this->char_translator_ = src.char_translator_;
-  this->wchar_translator_ = src.wchar_translator_;
-
-  // No need to copy src's value_.  We can always get that from cdr.
+  return CORBA::_tc_null;
 }
 
-// assignment operator
+ACE_Message_Block *
+CORBA::Any::_tao_get_cdr (void) const
+{
+  if (this->impl_ != 0)
+    {
+      return this->impl_->_tao_get_cdr ();
+    }
 
-CORBA::Any &
-CORBA::Any::operator= (const CORBA::Any &src)
+  return 0;
+}
+
+int
+CORBA::Any::_tao_byte_order (void) const
 {
-  // Check if it is a self assignment
-  if (this == &src)
+  if (this->impl_ != 0)
     {
-      return *this;
+      return this->impl_->_tao_byte_order ();
     }
 
-  // Decrement the refcount on the Message_Block we hold, it does not
-  // matter if we own the data or not, because we always own the
-  // message block (i.e. it is always cloned or duplicated.
-  ACE_Message_Block::release ((ACE_Message_Block *) this->cdr_);
-  this->cdr_ = 0;
+  return TAO_ENCAP_BYTE_ORDER;
+}
 
-  // If we own any previous data, deallocate it.
-  this->free_value ();
+void
+CORBA::Any::type (CORBA::TypeCode_ptr tc
+                  ACE_ENV_ARG_DECL)
+{
+  CORBA::Boolean equiv = 0;
 
-  // Now copy the contents of the source to ourselves.
-  if (!CORBA::is_nil (src.type_.in ()))
+  if (this->impl_ != 0)
     {
-      this->type_ =
-        CORBA::TypeCode::_duplicate (src.type_.in ());
+      equiv = 
+        this->impl_->_tao_get_typecode ()->equivalent (tc
+                                                       ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+  if (equiv)
+    {
+      this->impl_->type (tc);
     }
   else
     {
-      this->type_ =
-        CORBA::TypeCode::_duplicate (CORBA::_tc_null);
+      ACE_THROW (CORBA::BAD_TYPECODE ());
     }
+}
 
-  this->byte_order_ = src.byte_order_;
+void
+CORBA::Any::_tao_any_destructor (void *x)
+{
+  CORBA::Any *tmp = ACE_static_cast (CORBA::Any *, x);
+  delete tmp;
+}
 
-  if (src.cdr_ != 0)
+const void *
+CORBA::Any::value (void) const
+{
+  if (this->impl_ != 0)
     {
-      ACE_NEW_RETURN (this->cdr_,
-                      ACE_Message_Block,
-                      *this);
-
-      ACE_CDR::consolidate (this->cdr_,
-                            src.cdr_);
+      return this->impl_->value ();
     }
 
-  return *this;
+  return 0;
 }
 
-// Destructor for an "Any" deep-frees memory if needed.
-CORBA::Any::~Any (void)
+CORBA::Any::to_object::to_object (CORBA::Object_out obj)
+  : ref_ (obj.ptr ())
 {
-  // Decrement the refcount on the Message_Block we hold, it does not
-  // matter if we own the data or not, because we always own the
-  // message block (i.e. it is always cloned or duplicated.
+}
 
-  ACE_Message_Block::release (this->cdr_);
-  this->cdr_ = 0;
+CORBA::Any::to_abstract_base::to_abstract_base (CORBA::AbstractBase_ptr &obj)
+  : ref_ (obj)
+{
+}
 
-  this->free_value ();
+CORBA::Any::to_value::to_value (CORBA::ValueBase *& obj)
+  : ref_ (obj)
+{
 }
 
-// TAO proprietary methods, used in the implementation of the >>= and
-// <<= operators.
+CORBA::Boolean
+CORBA::Any::checked_to_object (CORBA::Object_ptr &_tao_elem) const
+{
+  if (this->impl_ == 0)
+    {
+      return 0;
+    }
 
-void
-CORBA::Any::_tao_replace (CORBA::TypeCode_ptr tc,
-                          int byte_order,
-                          const ACE_Message_Block *mb,
-                          TAO_Codeset_Translator_Factory *ctrans,
-                          TAO_Codeset_Translator_Factory *wtrans)
-{
-  // Decrement the refcount on the Message_Block we hold, it does not
-  // matter if we own the data or not, because we always own the
-  // message block (i.e. it is always cloned or duplicated).
-  ACE_Message_Block::release (this->cdr_);
-  this->cdr_ = 0;
+  return this->impl_->to_object (_tao_elem);
+}
 
-  this->free_value ();
+CORBA::Boolean
+CORBA::Any::checked_to_value (CORBA::ValueBase *&_tao_elem) const
+{
+  if (this->impl_ == 0)
+    {
+      return 0;
+    }
+
+  return this->impl_->to_value (_tao_elem);
+}
 
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
+CORBA::Boolean
+CORBA::Any::checked_to_abstract_base (
+    CORBA::AbstractBase_ptr &_tao_elem
+  ) const
+{
+  if (this->impl_ == 0)
+    {
+      return 0;
+    }
 
-  this->byte_order_ = byte_order;
+  return this->impl_->to_abstract_base (_tao_elem);
+}
 
-  ACE_NEW (this->cdr_,
-           ACE_Message_Block);
+// =======================================================================
 
-  ACE_CDR::consolidate (this->cdr_,
-                        mb);
-  // We can save the decode operation if there's no need to extract
-  // the object.
+TAO::Any_Impl::Any_Impl (_tao_destructor destructor,
+                         CORBA::TypeCode_ptr tc)
+  : value_destructor_ (destructor),
+    type_ (tc),
+    refcount_ (1)
+{
+}
 
-  // assign the char and wchar translator factories
-  this->char_translator_ = ctrans;
-  this->wchar_translator_ = wtrans;
+TAO::Any_Impl::~Any_Impl (void)
+{
+}
+
+CORBA::Boolean
+TAO::Any_Impl::marshal (TAO_OutputCDR &cdr)
+{
+  if ((cdr << this->type_) == 0)
+    {
+      return 0;
+    }
+
+  return this->marshal_value (cdr);
 }
 
 void
-CORBA::Any::_tao_replace (CORBA::TypeCode_ptr tc,
-                          int byte_order,
-                          const ACE_Message_Block *mb,
-                          CORBA::Boolean any_owns_data,
-                          void* value,
-                          CORBA::Any::_tao_destructor destructor)
-{
-  // Decrement the refcount on the Message_Block we hold, it does not
-  // matter if we own the data or not, because we always own the
-  // message block (i.e. it is always cloned or duplicated).
-  ACE_Message_Block::release (this->cdr_);
-  this->cdr_ = 0;
+TAO::Any_Impl::_tao_any_string_destructor (void *x)
+{
+  char *tmp = ACE_static_cast (char *, x);
+  CORBA::string_free (tmp);
+}
 
-  this->free_value ();
+void
+TAO::Any_Impl::_tao_any_wstring_destructor (void *x)
+{
+  CORBA::WChar *tmp = ACE_static_cast (CORBA::WChar *, x);
+  CORBA::wstring_free (tmp);
+}
 
-  this->any_owns_data_ = any_owns_data;
-  this->value_ = value;
+void
+TAO::Any_Impl::_add_ref (void)
+{
+  ++this->refcount_;
+}
 
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
+void
+TAO::Any_Impl::_remove_ref (void)
+{
+  if (--this->refcount_ != 0)
+    {
+      return;
+    }
 
-  this->byte_order_ = byte_order;
-  ACE_NEW (this->cdr_, ACE_Message_Block);
-  ACE_CDR::consolidate (this->cdr_, mb);
-  // We can save the decode operation if there's no need to extract
-  // the object.
+  this->free_value ();
+  delete this;
+}
 
-  this->destructor_ = destructor;
+void 
+TAO::Any_Impl::_tao_decode (TAO_InputCDR &
+                            ACE_ENV_ARG_DECL_NOT_USED)
+{
 }
 
 void
-CORBA::Any::_tao_replace (CORBA::TypeCode_ptr tc,
-                          CORBA::Boolean any_owns_data,
-                          void* value,
-                          CORBA::Any::_tao_destructor destructor)
+TAO::Any_Impl::assign_translator (CORBA::TCKind,
+                                  TAO_InputCDR *)
 {
-  this->free_value ();
+}
 
-  this->any_owns_data_ = any_owns_data;
-  this->value_ = value;
+// =======================================================================
 
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
+TAO::Unknown_IDL_Type::Unknown_IDL_Type (
+    CORBA::TypeCode_ptr tc,
+    const ACE_Message_Block *mb,
+    int byte_order,
+    CORBA::Boolean release_tc,
+    TAO_Codeset_Translator_Factory *ctrans,
+    TAO_Codeset_Translator_Factory *wtrans
+  )
+  : TAO::Any_Impl (0,
+                   tc),
+    cdr_ (ACE_Message_Block::duplicate (mb)),
+    byte_order_ (byte_order),
+    release_tc_ (release_tc),
+    char_translator_ (ctrans),
+    wchar_translator_ (wtrans)
+{
+}
 
-  this->destructor_ = destructor;
+TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void)
+{
 }
 
-// Free internal data.
-void
-CORBA::Any::free_value (void)
+CORBA::Boolean
+TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr)
 {
-  if (this->any_owns_data_
-      && this->value_ != 0
-      && this->destructor_ != 0)
+  ACE_TRY_NEW_ENV
     {
-      (*this->destructor_) (this->value_);
+      TAO_InputCDR input (this->cdr_,
+                          this->byte_order_);
+
+      CORBA::TypeCode::traverse_status status =
+        TAO_Marshal_Object::perform_append (this->type_,
+                                            &input,
+                                            &cdr
+                                            ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          return 0;
+        }
     }
-  this->any_owns_data_ = 0;
-  this->value_ = 0;
-  this->destructor_ = 0;
+  ACE_CATCH (CORBA::Exception, ex)
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+
+  return 1;
 }
 
 void
-CORBA::Any::_tao_encode (TAO_OutputCDR &cdr,
-                         TAO_ORB_Core *orb_core
-                         ACE_ENV_ARG_DECL)
-{
-  // Always append the CDR stream, even when the value_.
-  if (this->cdr_ == 0)
-    ACE_THROW (CORBA::NO_IMPLEMENT ());
-
-  TAO_InputCDR in (this->cdr_,
-                   this->byte_order_,
-                   TAO_DEF_GIOP_MAJOR,
-                   TAO_DEF_GIOP_MINOR,
-                   orb_core);
-  TAO_Marshal_Object::perform_append (this->type_.in (),
-                                      &in,
-                                      &cdr
-                                      ACE_ENV_ARG_PARAMETER);
+TAO::Unknown_IDL_Type::free_value (void)
+{
+  if (this->release_tc_ == 1)
+    {
+      CORBA::release (this->type_);
+    }
+
+  ACE_Message_Block::release (this->cdr_);
 }
 
 void
-CORBA::Any::_tao_decode (TAO_InputCDR &cdr
-                         ACE_ENV_ARG_DECL)
+TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
+                                    ACE_ENV_ARG_DECL)
 {
-  // Just read into the CDR stream...
-
   // @@ (JP) The following code depends on the fact that
   //         TAO_InputCDR does not contain chained message blocks,
   //         otherwise <begin> and <end> could be part of
@@ -345,9 +374,9 @@ CORBA::Any::_tao_decode (TAO_InputCDR &cdr
   // This will be the start of a new message block.
   char *begin = cdr.rd_ptr ();
 
-  // Skip over the next aregument.
+  // Skip over the next argument.
   CORBA::TypeCode::traverse_status status =
-    TAO_Marshal_Object::perform_skip (this->type_.in (),
+    TAO_Marshal_Object::perform_skip (this->type_,
                                       &cdr
                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -361,1659 +390,962 @@ CORBA::Any::_tao_decode (TAO_InputCDR &cdr
   char *end = cdr.rd_ptr ();
 
   // The ACE_CDR::mb_align() call can shift the rd_ptr by up to
-  // ACE_CDR::MAX_ALIGNMENT-1 bytes. Similarly, the offset adjustment
+  // ACE_CDR::MAX_ALIGNMENT - 1 bytes. Similarly, the offset adjustment
   // can move the rd_ptr by up to the same amount. We accommodate
   // this by including 2 * ACE_CDR::MAX_ALIGNMENT bytes of additional
   // space in the message block.
   size_t size = end - begin;
-  ACE_Message_Block mb (size + 2 * ACE_CDR::MAX_ALIGNMENT);
-  ACE_CDR::mb_align (&mb);
+  
+  ACE_Message_Block::release (this->cdr_);
+  ACE_NEW (this->cdr_,
+           ACE_Message_Block (size + 2 * ACE_CDR::MAX_ALIGNMENT));
+           
+  ACE_CDR::mb_align (this->cdr_);
   ptr_arith_t offset = ptr_arith_t (begin) % ACE_CDR::MAX_ALIGNMENT;
-  mb.rd_ptr (offset);
-  mb.wr_ptr (offset + size);
+  this->cdr_->rd_ptr (offset);
+  this->cdr_->wr_ptr (offset + size);
 
-  ACE_OS::memcpy (mb.rd_ptr (),
+  ACE_OS::memcpy (this->cdr_->rd_ptr (),
                   begin,
                   size);
 
-  // get character translator, if necessary.
-  TAO_Codeset_Translator_Factory *ctrans = 0;
-  if (cdr.char_translator() != 0)
-    ctrans = cdr.orb_core()->resource_factory()->
-      get_char_translator(cdr.char_translator()->ncs(),
-                          cdr.char_translator()->tcs());
+  // Get character translators, if necessary.
+  if (cdr.char_translator () != 0)
+    {
+      this->char_translator_ =
+        cdr.orb_core ()->resource_factory ()->get_char_translator (
+                             cdr.char_translator ()->ncs (),
+                             cdr.char_translator ()->tcs ()
+                           );
+    }
 
-  TAO_Codeset_Translator_Factory *wtrans = 0;
-  if (cdr.wchar_translator() != 0)
-    wtrans = cdr.orb_core()->resource_factory()->
-      get_wchar_translator(cdr.wchar_translator()->ncs(),
-                           cdr.wchar_translator()->tcs());
+  if (cdr.wchar_translator () != 0)
+    {
+      this->wchar_translator_ =
+        cdr.orb_core ()->resource_factory ()->get_wchar_translator (
+                             cdr.wchar_translator ()->ncs (),
+                             cdr.wchar_translator ()->tcs ()
+                           );
+    }
+}
 
-  // Stick it into the Any. It gets duplicated there.
-  this->_tao_replace (this->type_.in (),
-                      cdr.byte_order (),
-                      &mb,
-                      ctrans,
-                      wtrans);
+void
+TAO::Unknown_IDL_Type::assign_translator (CORBA::TCKind kind,
+                                          TAO_InputCDR *cdr)
+{
+  switch (kind)
+    {
+      case CORBA::tk_string:
+      case CORBA::tk_char:
+        if (this->char_translator_ != 0)
+          {
+            this->char_translator_->assign (cdr);
+          }
+
+        break;
+      case CORBA::tk_wstring:
+      case CORBA::tk_wchar:
+        if (this->wchar_translator_ != 0)
+          {
+            this->wchar_translator_->assign (cdr);
+          }
+
+        break;
+      default:
+        break;
+    }
 }
 
-// Insertion operators.
+// ****************************************************************
+
+CORBA::Any_var &
+CORBA::Any_var::operator= (CORBA::Any *p)
+{
+  if (this->ptr_ != p)
+    {
+      delete this->ptr_;
+      this->ptr_ = p;
+    }
+
+  return *this;
+}
+
+CORBA::Any_var &
+CORBA::Any_var::operator= (const CORBA::Any_var &r)
+{
+  CORBA::Any_ptr tmp = 0;
+
+  ACE_NEW_RETURN (tmp,
+                  CORBA::Any (*r.ptr_),
+                  *this);
+
+  delete this->ptr_;
+  this->ptr_ = tmp;
+  return *this;
+}
+
+// ***********************************************************************
+
+CORBA::Boolean 
+operator<< (TAO_OutputCDR &cdr, const CORBA::Any &any)
+{
+  TAO::Any_Impl *impl = any.impl ();
+
+  if (impl != 0)
+    {
+      return impl->marshal (cdr);
+    }
+
+  return (cdr << CORBA::_tc_null);
+}
+
+CORBA::Boolean
+operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
+{
+  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
+
+  if ((cdr >> tc) == 0)
+    {
+      return 0;
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (kind == CORBA::tk_any)
+        {
+          tc->_decr_refcnt ();
+          CORBA::Any nested_any;
+
+          TAO::Any_Any_Impl *any_impl = 0;
+          ACE_NEW_RETURN (any_impl,
+                          TAO::Any_Any_Impl (nested_any),
+                          0);
+
+          any.replace (any_impl);
+          return any_impl->demarshal_value (cdr);
+        }
+
+      TAO::Unknown_IDL_Type *impl = 0;
+      ACE_NEW_RETURN (impl,
+                      TAO::Unknown_IDL_Type (tc,
+                                             0,
+                                             cdr.byte_order ()),
+                      0);
+
+      any.replace (impl);
+      impl->_tao_decode (cdr
+                         ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::Exception, ex)
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+
+  return 1;
+}
+
+// =======================================================================
+
+// Insertion of the special basic types.
 
 void
-CORBA::Any::operator<<= (CORBA::Short s)
+CORBA::Any::operator<<= (CORBA::Any::from_boolean b)
 {
-  TAO_OutputCDR stream;
-  stream << s;
-  this->_tao_replace (CORBA::_tc_short,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Special_Basic_Impl_T<
+      CORBA::Boolean, 
+      CORBA::Any::from_boolean,
+      CORBA::Any::to_boolean
+    >::insert (*this,
+               CORBA::_tc_boolean,
+               b.val_);
 }
 
 void
-CORBA::Any::operator<<= (CORBA::UShort s)
+CORBA::Any::operator<<= (CORBA::Any::from_octet o)
 {
-  TAO_OutputCDR stream;
-  stream << s;
-  this->_tao_replace (CORBA::_tc_ushort,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Special_Basic_Impl_T<
+      CORBA::Octet, 
+      CORBA::Any::from_octet,
+      CORBA::Any::to_octet
+    >::insert (*this,
+               CORBA::_tc_octet,
+               o.val_);
 }
 
 void
-CORBA::Any::operator<<= (CORBA::Long l)
+CORBA::Any::operator<<= (CORBA::Any::from_char c)
 {
-  TAO_OutputCDR stream;
-  stream << l;
-  this->_tao_replace (CORBA::_tc_long,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Special_Basic_Impl_T<
+      char, 
+      CORBA::Any::from_char,
+      CORBA::Any::to_char
+    >::insert (*this,
+               CORBA::_tc_char,
+               c.val_);
 }
 
 void
-CORBA::Any::operator<<= (CORBA::ULong l)
+CORBA::Any::operator<<= (CORBA::Any::from_wchar wc)
 {
-  TAO_OutputCDR stream;
-  stream << l;
-  this->_tao_replace (CORBA::_tc_ulong,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Special_Basic_Impl_T<
+      CORBA::WChar, 
+      CORBA::Any::from_wchar,
+      CORBA::Any::to_wchar
+    >::insert (*this,
+               CORBA::_tc_wchar,
+               wc.val_);
 }
 
 void
-CORBA::Any::operator<<= (CORBA::LongLong l)
+CORBA::Any::operator<<= (CORBA::Any::from_string s)
 {
-  TAO_OutputCDR stream;
-  stream << l;
-  this->_tao_replace (CORBA::_tc_longlong,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Special_Impl_T<
+      char, 
+      CORBA::Any::from_string,
+      CORBA::Any::to_string
+    >::insert (*this,
+               TAO::Any_Impl::_tao_any_string_destructor,
+               CORBA::tk_string,
+               s.nocopy_ ? s.val_ : CORBA::string_dup (s.val_),
+               s.bound_);
 }
 
 void
-CORBA::Any::operator<<= (CORBA::ULongLong l)
+CORBA::Any::operator<<= (CORBA::Any::from_wstring ws)
 {
-  TAO_OutputCDR stream;
-  stream << l;
-  this->_tao_replace (CORBA::_tc_ulonglong,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Special_Impl_T<
+      CORBA::WChar, 
+      CORBA::Any::from_wstring,
+      CORBA::Any::to_wstring
+    >::insert (*this,
+               TAO::Any_Impl::_tao_any_wstring_destructor,
+               CORBA::tk_wstring,
+               ws.nocopy_ ? ws.val_ : CORBA::wstring_dup (ws.val_),
+               ws.bound_);
 }
 
+// Insertion of the other basic types.
+
 void
-CORBA::Any::operator<<= (CORBA::Float f)
+operator<<= (CORBA::Any &any, CORBA::Short s)
 {
-  TAO_OutputCDR stream;
-  stream << f;
-  this->_tao_replace (CORBA::_tc_float,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Basic_Impl_T<CORBA::Short>::insert (any,
+                                               CORBA::_tc_short,
+                                               s);
 }
 
 void
-CORBA::Any::operator<<= (CORBA::Double d)
+operator<<= (CORBA::Any &any, CORBA::UShort us)
 {
-  TAO_OutputCDR stream;
-  stream << d;
-  this->_tao_replace (CORBA::_tc_double,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Basic_Impl_T<CORBA::UShort>::insert (any,
+                                                CORBA::_tc_ushort,
+                                                us);
 }
 
 void
-CORBA::Any::operator<<= (CORBA::LongDouble d)
+operator<<= (CORBA::Any &any, CORBA::Long l)
 {
-  TAO_OutputCDR stream;
-  stream << d;
-  this->_tao_replace (CORBA::_tc_longdouble,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Basic_Impl_T<CORBA::Long>::insert (any,
+                                              CORBA::_tc_long,
+                                              l);
 }
 
-// Insertion of Any - copying.
 void
-CORBA::Any::operator<<= (const CORBA::Any &a)
+operator<<= (CORBA::Any &any, CORBA::ULong ul)
 {
-  TAO_OutputCDR stream;
-  stream << a;
-  this->_tao_replace (CORBA::_tc_any,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Basic_Impl_T<CORBA::ULong>::insert (any,
+                                               CORBA::_tc_ulong,
+                                               ul);
 }
 
-// Insertion of Any - non-copying.
 void
-CORBA::Any::_tao_any_destructor (void *x)
+operator<<= (CORBA::Any &any, CORBA::LongLong ll)
 {
-  CORBA::Any *tmp = ACE_static_cast (CORBA::Any *, x);
-  delete tmp;
+  TAO::Any_Basic_Impl_T<CORBA::LongLong>::insert (any,
+                                                  CORBA::_tc_longlong,
+                                                  ll);
 }
 
 void
-CORBA::Any::operator<<= (CORBA::Any *a)
+operator<<= (CORBA::Any &any, CORBA::ULongLong ull)
 {
-  TAO_OutputCDR stream;
-  stream << *a;
-  this->_tao_replace (CORBA::_tc_any,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin (),
-                      1,
-                      a,
-                      CORBA::Any::_tao_any_destructor);
+  TAO::Any_Basic_Impl_T<CORBA::ULongLong>::insert (any,
+                                                   CORBA::_tc_ulonglong,
+                                                   ull);
 }
 
-// implementing the special types
+void
+operator<<= (CORBA::Any &any, CORBA::Float f)
+{
+  TAO::Any_Basic_Impl_T<CORBA::Float>::insert (any,
+                                               CORBA::_tc_float,
+                                               f);
+}
 
 void
-CORBA::Any::operator<<= (from_boolean b)
+operator<<= (CORBA::Any &any, CORBA::Double d)
 {
-  TAO_OutputCDR stream;
-  stream << b;
-  this->_tao_replace (CORBA::_tc_boolean,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Basic_Impl_T<CORBA::Double>::insert (any,
+                                                CORBA::_tc_double,
+                                                d);
 }
 
 void
-CORBA::Any::operator<<= (from_octet o)
+operator<<= (CORBA::Any &any, CORBA::LongDouble ld)
 {
-  TAO_OutputCDR stream;
-  stream << o;
-  this->_tao_replace (CORBA::_tc_octet,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Basic_Impl_T<CORBA::LongDouble>::insert (any,
+                                                    CORBA::_tc_longdouble,
+                                                    ld);
 }
 
+// Insertion of Any - copying.
 void
-CORBA::Any::operator<<= (from_char c)
+operator<<= (CORBA::Any &any, const CORBA::Any &a)
 {
-  TAO_OutputCDR stream;
-  stream << c;
-  this->_tao_replace (CORBA::_tc_char,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Any_Impl::insert_copy (any,
+                                  a);
 }
 
+// Insertion of Any - non-copying.
 void
-CORBA::Any::operator<<= (from_wchar wc)
+operator<<= (CORBA::Any &any, CORBA::Any *a)
 {
-  TAO_OutputCDR stream;
-  stream << wc;
-  this->_tao_replace (CORBA::_tc_wchar,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Dual_Impl_T<CORBA::Any>::insert (any,
+                                            CORBA::Any::_tao_any_destructor,
+                                            CORBA::_tc_any,
+                                            a);
 }
 
 void
-CORBA::Any::operator<<= (CORBA::TypeCode_ptr tc)
+operator<<= (CORBA::Any &any, CORBA::TypeCode_ptr tc)
 {
-  TAO_OutputCDR stream;
-  stream << tc;
-  this->_tao_replace (CORBA::_tc_TypeCode,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Impl_T<CORBA::TypeCode>::insert (
+      any,
+      CORBA::TypeCode::_tao_any_destructor,
+      CORBA::_tc_TypeCode,
+      tc
+    );
 }
 
 // Insertion of CORBA::Exception - copying.
 void
-CORBA::Any::operator<<= (const CORBA::Exception &exception)
+operator<<= (CORBA::Any &any, const CORBA::Exception &exception)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      TAO_OutputCDR stream;
-      exception._tao_encode (stream
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->_tao_replace (exception._type (),
-                          TAO_ENCAP_BYTE_ORDER,
-                          stream.begin ());
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::Exception ")
-                             ACE_TEXT ("insertion\n"));
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO::Any_Dual_Impl_T<CORBA::Exception>::insert_copy (
+      any,
+      CORBA::Exception::_tao_any_destructor,
+      exception._type (),
+      exception
+    );
 }
 
 // Insertion of CORBA::Exception - non-copying.
 void
-CORBA::Any::operator<<= (CORBA::Exception *exception)
+operator<<= (CORBA::Any &any, CORBA::Exception *exception)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      TAO_OutputCDR stream;
-      exception->_tao_encode (stream
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->_tao_replace (exception->_type (),
-                          TAO_ENCAP_BYTE_ORDER,
-                          stream.begin (),
-                          1,
-                          exception,
-                          CORBA::Exception::_tao_any_destructor);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::Exception ")
-                             ACE_TEXT ("insertion\n"));
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO::Any_Dual_Impl_T<CORBA::Exception>::insert (
+      any,
+      CORBA::Exception::_tao_any_destructor,
+      exception->_type (),
+      exception
+    );
 }
 
 // Insertion of CORBA object - copying.
 void
-CORBA::Any::operator<<= (const CORBA::Object_ptr obj)
+operator<<= (CORBA::Any &any, const CORBA::Object_ptr obj)
 {
-  CORBA::Object_ptr objptr =
-    CORBA::Object::_duplicate (obj);
-
-  (*this) <<= &objptr;
+  CORBA::Object_ptr dup = CORBA::Object::_duplicate (obj);
+  any <<= &dup;
 }
 
 // Insertion of CORBA object - non-copying.
 void
-CORBA::Any::operator<<= (CORBA::Object_ptr *objptr)
+operator<<= (CORBA::Any &any, CORBA::Object_ptr *objptr)
 {
-  if (objptr == 0)
-    {
-      return; // @@ Should we raise an exception?
-    }
-
-  TAO_OutputCDR stream;
-  stream << *objptr;
-  this->_tao_replace (CORBA::_tc_Object,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Impl_T<CORBA::Object>::insert (any,
+                                          CORBA::Object::_tao_any_destructor,
+                                          CORBA::_tc_Object,
+                                          *objptr);
 }
 
-// Insertion of from_string.
+// These are copying versions for unbounded (w)strings. They are not inlined,
+// to avoid use in Any.i before definition in ORB.i.
+
 void
-CORBA::Any::operator<<= (from_string s)
+operator<<= (CORBA::Any &any, const char* s)
 {
-  TAO_OutputCDR stream;
-  stream << s;
-
-  char *tmp;
-  // Non-copying.
-  if (s.nocopy_)
-    {
-      tmp = s.val_;
-    }
-  else
-    {
-      tmp = CORBA::string_dup (s.val_);
-    }
-
-  if (s.bound_ > 0)
-    {
-      // If the inserted string is bounded, we create a typecode.
-      static CORBA::Long _oc_string [] =
-      {
-        TAO_ENCAP_BYTE_ORDER,   // native endian + padding; "tricky"
-        ACE_static_cast (CORBA::Long, s.bound_)
-      };
-
-      CORBA::TypeCode_ptr tc = 0;
-
-      ACE_NEW (tc,
-               CORBA::TypeCode (CORBA::tk_string,
-                                sizeof _oc_string,
-                                (char *) &_oc_string,
-                                1,
-                                sizeof (CORBA::String_var)));
-
-      this->_tao_replace (tc,
-                          TAO_ENCAP_BYTE_ORDER,
-                          stream.begin (),
-                          1,
-                          tmp,
-                          CORBA::Any::_tao_any_string_destructor);
-
-      CORBA::release (tc);
-    }
-  else
-    {
-      // Unbounded.
-      this->_tao_replace (CORBA::_tc_string,
-                          TAO_ENCAP_BYTE_ORDER,
-                          stream.begin (),
-                          1,
-                          tmp,
-                          CORBA::Any::_tao_any_string_destructor);
-    }
+  TAO::Any_Impl_T<char>::insert (any,
+                                 TAO::Any_Impl::_tao_any_string_destructor,
+                                 CORBA::_tc_string,
+                                 CORBA::string_dup (s));
 }
 
 void
-CORBA::Any::operator<<= (from_wstring ws)
+operator<<= (CORBA::Any &any, const CORBA::WChar* ws)
 {
-  TAO_OutputCDR stream;
-  stream << ws;
-
-  CORBA::WChar *tmp;
-  // Non-copying.
-  if (ws.nocopy_)
-    {
-      tmp = ws.val_;
-    }
-  else
-    {
-      tmp = CORBA::wstring_dup (ws.val_);
-    }
-
-  if (ws.bound_ > 0)
-    {
-      // If the inserted string is bounded, we create a typecode.
-      static CORBA::Long _oc_wstring [] =
-      {
-        TAO_ENCAP_BYTE_ORDER,   // native endian + padding; "tricky"
-        ACE_static_cast (CORBA::Long, ws.bound_)
-      };
-
-      CORBA::TypeCode_ptr tc = 0;
-      ACE_NEW (tc,
-               CORBA::TypeCode (CORBA::tk_wstring,
-                                sizeof _oc_wstring,
-                                (char *) &_oc_wstring,
-                                1,
-                                sizeof (CORBA::WString_var)));
-
-      this->_tao_replace (tc,
-                          TAO_ENCAP_BYTE_ORDER,
-                          stream.begin (),
-                          1,
-                          tmp,
-                          CORBA::Any::_tao_any_wstring_destructor);
-
-      CORBA::release (tc);
-    }
-  else
-    {
-      this->_tao_replace (CORBA::_tc_wstring,
-                          TAO_ENCAP_BYTE_ORDER,
-                          stream.begin (),
-                          1,
-                          tmp,
-                          CORBA::Any::_tao_any_wstring_destructor);
-    }
+  TAO::Any_Impl_T<CORBA::WChar>::insert (
+      any,
+      TAO::Any_Impl::_tao_any_wstring_destructor,
+      CORBA::_tc_wstring,
+      CORBA::wstring_dup (ws)
+    );
 }
 
 // Extraction: these are safe and hence we have to check that the
 // typecode of the Any is equal to the one we are trying to extract
 // into.
 
+// Extraction into the special basic types.
+
 CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Short &s) const
+CORBA::Any::operator>>= (CORBA::Any::to_boolean b) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_short
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        return 0;
-
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_);
-      return stream.read_short (s);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::Short ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return TAO::Any_Special_Basic_Impl_T<
+      CORBA::Boolean, 
+      CORBA::Any::from_boolean,
+      CORBA::Any::to_boolean
+    >::extract (*this,
+                CORBA::_tc_boolean,
+                b.ref_);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::UShort &s) const
+CORBA::Any::operator>>= (CORBA::Any::to_octet o) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_ushort
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_);
-
-      return stream.read_ushort (s);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::UShort ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return TAO::Any_Special_Basic_Impl_T<
+      CORBA::Octet, 
+      CORBA::Any::from_octet,
+      CORBA::Any::to_octet
+    >::extract (*this,
+                CORBA::_tc_octet,
+                o.ref_);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Long &l) const
+CORBA::Any::operator>>= (CORBA::Any::to_char c) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_long
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_);
-
-      return stream.read_long (l);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::Long ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return TAO::Any_Special_Basic_Impl_T<
+      char, 
+      CORBA::Any::from_char,
+      CORBA::Any::to_char
+    >::extract (*this,
+                CORBA::_tc_char,
+                c.ref_);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::ULong &l) const
+CORBA::Any::operator>>= (CORBA::Any::to_wchar wc) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_ulong
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_);
-
-      return stream.read_ulong (l);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::ULong ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return TAO::Any_Special_Basic_Impl_T<
+      CORBA::WChar, 
+      CORBA::Any::from_wchar,
+      CORBA::Any::to_wchar
+    >::extract (*this,
+                CORBA::_tc_wchar,
+                wc.ref_);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::LongLong &l) const
+CORBA::Any::operator>>= (CORBA::Any::to_string s) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_longlong
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_);
-
-      return stream.read_longlong (l);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::LongLong ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return 
+    TAO::Any_Special_Impl_T<
+        char, 
+        CORBA::Any::from_string,
+        CORBA::Any::to_string
+      >::extract (*this,
+                  TAO::Any_Impl::_tao_any_string_destructor,
+                  CORBA::tk_string,
+                  s.bound_,
+                  s.val_);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::ULongLong &l) const
+CORBA::Any::operator>>= (CORBA::Any::to_wstring ws) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_ulonglong
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          if (this->any_owns_data_ && this->value_)
-            {
-              l = *(CORBA::ULongLong *) this->value_;
-              return 1;
-            }
-          else
-            {
-              TAO_InputCDR stream (this->cdr_,
-                                   this->byte_order_);
-              return stream.read_ulonglong (l);
-            }
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::ULongLong ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return 
+    TAO::Any_Special_Impl_T<
+        CORBA::WChar, 
+        CORBA::Any::from_wstring,
+        CORBA::Any::to_wstring
+      >::extract (*this,
+                  TAO::Any_Impl::_tao_any_wstring_destructor,
+                  CORBA::tk_wstring,
+                  ws.bound_,
+                  ws.val_);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Float &f) const
+CORBA::Any::operator>>= (CORBA::Any::to_object obj) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_float
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_);
-
-      return stream.read_float (f);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::Float ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return this->checked_to_object (obj.ref_);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Double &d) const
+CORBA::Any::operator>>= (CORBA::Any::to_abstract_base obj) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_double
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_);
-
-      return stream.read_double (d);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::Double ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return this->checked_to_abstract_base (obj.ref_);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::LongDouble &ld) const
+CORBA::Any::operator>>= (CORBA::Any::to_value obj) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_longdouble
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
+  return this->checked_to_value (obj.ref_);
+}
 
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_);
+// Extraction into the other basic types.
 
-      return stream.read_longdouble (ld);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::LongDouble ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+CORBA::Boolean
+operator>>= (const CORBA::Any &any, CORBA::Short &s)
+{
+  return TAO::Any_Basic_Impl_T<CORBA::Short>::extract (any,
+                                                       CORBA::_tc_short,
+                                                       s);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any &a) const
+operator>>= (const CORBA::Any &any, CORBA::UShort &us)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_any
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_);
-      if (stream >> a)
-        {
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::Any ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return TAO::Any_Basic_Impl_T<CORBA::UShort>::extract (any,
+                                                        CORBA::_tc_ushort,
+                                                        us);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (const CORBA::Any *&a) const
+operator>>= (const CORBA::Any &any, CORBA::Long &l)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      a = 0;
-      CORBA::Boolean equivalent =
-        this->type_->equivalent (CORBA::_tc_any
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!equivalent)
-        {
-          return 0;
-        }
-
-      if (this->any_owns_data_ && this->value_)
-        {
-          a = (CORBA::Any *) this->value_;
-          return 1;
-        }
-      else
-        {
-          CORBA::Any *x;
-          ACE_NEW_RETURN (x, CORBA::Any, 0);
-          CORBA::Any_var tmp = x;
-          TAO_InputCDR stream (this->cdr_,
-                               this->byte_order_);
-
-          if (!(stream >> tmp.inout ()))
-            {
-              return 0;
-            }
-
-          ACE_const_cast(
-            CORBA::Any*,
-            this)->_tao_replace (CORBA::_tc_any,
-                                 1,
-                                 ACE_static_cast (CORBA::Any *, tmp),
-                                 CORBA::Any::_tao_any_destructor);
-
-          ACE_const_cast (CORBA::Any *&, a) = tmp._retn ();
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::Any ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  a = 0;
-  return 0;
+  return TAO::Any_Basic_Impl_T<CORBA::Long>::extract (any,
+                                                      CORBA::_tc_long,
+                                                      l);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (const char *&s) const
+operator>>= (const CORBA::Any &any, CORBA::ULong &ul)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      s = 0;
-
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_string
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      if (this->any_owns_data_ && this->value_)
-        {
-          s = ACE_static_cast (char *, this->value_);
-          return 1;
-        }
-
-
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_);
-
-      if (this->char_translator_)
-        this->char_translator_->assign(&stream);
-
-      CORBA::String_var tmp;
-
-      if (!stream.read_string (tmp.out ()))
-        {
-          return 0;
-        }
-
-      ACE_const_cast(CORBA::Any*,
-                     this)->_tao_replace (CORBA::_tc_string,
-                                          1,
-                                          tmp.inout (),
-                                          CORBA::Any::_tao_any_string_destructor);
-
-      s = tmp._retn ();
-      return 1;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  s = 0;
-  return 0;
+  return TAO::Any_Basic_Impl_T<CORBA::ULong>::extract (any,
+                                                       CORBA::_tc_ulong,
+                                                       ul);
 }
 
-void
-CORBA::Any::_tao_any_string_destructor (void *x)
+CORBA::Boolean
+operator>>= (const CORBA::Any &any, CORBA::LongLong &ll)
 {
-  char *tmp = ACE_static_cast (char *, x);
-  CORBA::string_free (tmp);
+  return 
+    TAO::Any_Basic_Impl_T<CORBA::LongLong>::extract (any,
+                                                     CORBA::_tc_longlong,
+                                                     ll);
 }
 
-void
-CORBA::Any::_tao_any_wstring_destructor (void *x)
+CORBA::Boolean
+operator>>= (const CORBA::Any &any, CORBA::ULongLong &ull)
 {
-  CORBA::WChar *tmp = ACE_static_cast (CORBA::WChar *, x);
-  CORBA::wstring_free (tmp);
+  return 
+    TAO::Any_Basic_Impl_T<CORBA::ULongLong>::extract (any,
+                                                      CORBA::_tc_ulonglong,
+                                                      ull);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (const CORBA::WChar *&s) const
+operator>>= (const CORBA::Any &any, CORBA::Float &f)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      s = 0;
-
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_wstring
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      if (this->any_owns_data_ && this->value_)
-        {
-          s = ACE_static_cast (CORBA::WChar *, this->value_);
-          return 1;
-        }
-
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_);
-
-      if (this->wchar_translator_)
-        this->wchar_translator_->assign(&stream);
-
-      CORBA::WString_var tmp;
-
-      if (!stream.read_wstring (tmp.out ()))
-        {
-          return 0;
-        }
-
-      ACE_const_cast(CORBA::Any*,
-                     this)->_tao_replace (CORBA::_tc_wstring,
-                                          1,
-                                          tmp.inout (),
-                                          CORBA::Any::_tao_any_wstring_destructor);
-
-      s = tmp._retn ();
-      return 1;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in unbounded wstring ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return TAO::Any_Basic_Impl_T<CORBA::Float>::extract (any,
+                                                       CORBA::_tc_float,
+                                                       f);
 }
 
-void
-CORBA::Any::_tao_any_tc_destructor (void *x)
+CORBA::Boolean
+operator>>= (const CORBA::Any &any, CORBA::Double &d)
 {
-  CORBA::TypeCode_ptr tmp = ACE_static_cast (CORBA::TypeCode_ptr, x);
-  CORBA::release (tmp);
+  return TAO::Any_Basic_Impl_T<CORBA::Double>::extract (any,
+                                                        CORBA::_tc_double,
+                                                        d);
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::TypeCode_ptr &tc) const
+operator>>= (const CORBA::Any &any, CORBA::LongDouble &ld)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_TypeCode
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      if (this->any_owns_data_ && this->value_)
-        {
-          tc = ACE_static_cast (CORBA::TypeCode_ptr, this->value_);
-          return 1;
-        }
-
-      TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
-                           this->byte_order_);
-      CORBA::TypeCode_var tmp;
-
-      if (!(stream >> tmp.inout ()))
-        {
-          return 0;
-        }
-
-      ACE_const_cast(CORBA::Any*,
-                     this)->_tao_replace (CORBA::_tc_TypeCode,
-                                          1,
-                                          tmp.in (),
-                                          CORBA::Any::_tao_any_tc_destructor);
-
-      tc = tmp._retn ();
-      return 1;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::TypeCode_ptr ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return 
+    TAO::Any_Basic_Impl_T<CORBA::LongDouble>::extract (any,
+                                                       CORBA::_tc_longdouble,
+                                                       ld);
 }
 
-// = extraction into the special types
-
 CORBA::Boolean
-CORBA::Any::operator>>= (to_boolean b) const
+operator>>= (const CORBA::Any &any, const CORBA::Any &a)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_boolean
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
-                           this->byte_order_);
-
-      return stream.read_boolean (b.ref_);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::Boolean ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return TAO::Any_Any_Impl::extract_ref (
+      any,
+      ACE_const_cast (CORBA::Any &, a)
+    );
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (to_octet o) const
+operator>>= (const CORBA::Any &any, const CORBA::Any *&a)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_octet
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
-                           this->byte_order_);
-
-      return stream.read_octet (o.ref_);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::Octet ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return TAO::Any_Dual_Impl_T<CORBA::Any>::extract (
+      any,
+      CORBA::Any::_tao_any_destructor,
+      CORBA::_tc_any,
+      a
+    );
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (to_char c) const
+operator>>= (const CORBA::Any &any, const char *&s)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_char
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
-                           this->byte_order_);
-      if (this->char_translator_)
-        this->char_translator_->assign (&stream);
-
-      return stream.read_char (c.ref_);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::Char ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return TAO::Any_Impl_T<char>::extract (
+      any,
+      TAO::Any_Impl::_tao_any_string_destructor,
+      CORBA::_tc_string,
+      ACE_const_cast (char *&, s)
+    );
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (to_wchar wc) const
+operator>>= (const CORBA::Any &any, const CORBA::WChar *&ws)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_wchar
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          return 0;
-        }
-
-      TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
-                           this->byte_order_);
-      if (this->wchar_translator_)
-        this->wchar_translator_->assign (&stream);
-
-      return stream.read_wchar (wc.ref_);
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::WChar ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return TAO::Any_Impl_T<CORBA::WChar>::extract (
+      any,
+      TAO::Any_Impl::_tao_any_wstring_destructor,
+      CORBA::_tc_wstring,
+      ACE_const_cast (CORBA::WChar *&, ws)
+    );
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (to_string s) const
+operator>>= (const CORBA::Any &any, CORBA::TypeCode_ptr &tc)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_.in ());
-
-      while (kind == CORBA::tk_alias)
-        {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (kind != CORBA::tk_string)
-        {
-          return 0;
-        }
-
-      CORBA::ULong bound = tcvar->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (s.bound_ != bound)
-        {
-          return 0;
-        }
-
-      if (this->any_owns_data_ && this->value_)
-        {
-          s.val_ = ACE_static_cast (char *, this->value_);
-          return 1;
-        }
-
-      TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
-                           this->byte_order_);
-      if (this->char_translator_)
-        this->char_translator_->assign (&stream);
-
-      CORBA::String_var tmp;
-
-      if (!stream.read_string (tmp.out ()))
-        {
-          return 0;
-        }
+  return TAO::Any_Impl_T<CORBA::TypeCode>::extract (
+      any,
+      CORBA::TypeCode::_tao_any_destructor,
+      CORBA::_tc_TypeCode,
+      tc
+    );
+}
 
-      CORBA::Any *non_const_this = ACE_const_cast (CORBA::Any*,
-                                                   this);
-      non_const_this->_tao_replace (CORBA::_tc_string,
-                                    1,
-                                    tmp.inout (),
-                                    CORBA::Any::_tao_any_string_destructor);
+// =======================================================================
 
-      s.val_ = tmp._retn ();
-      return 1;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in bounded string ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
+// Specializations for CORBA::Any
 
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::Any>::marshal_value (TAO_OutputCDR &cdr)
+{
   return 0;
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (to_wstring ws) const
+TAO::Any_Impl_T<CORBA::Any>::demarshal_value (TAO_InputCDR &cdr)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_.in ());
-
-      while (kind == CORBA::tk_alias)
-        {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (kind != CORBA::tk_wstring)
-        {
-          return 0;
-        }
-
-      CORBA::ULong bound = tcvar->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (ws.bound_ != bound)
-        {
-          return 0;
-        }
-
-      if (this->any_owns_data_ && this->value_)
-        {
-          ws.val_ = ACE_static_cast (CORBA::WChar *, this->value_);
-          return 1;
-        }
+  return 0;
+}
 
-      TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
-                           this->byte_order_);
+// =======================================================================
 
-      if (this->char_translator_)
-        this->char_translator_->assign (&stream);
+// Specializations of the create_empty method for long long and long double.
 
-      CORBA::WString_var tmp;
+TAO::Any_Basic_Impl_T<CORBA::LongLong> *
+TAO::Any_Basic_Impl_T<CORBA::LongLong>::create_empty (
+    CORBA::TypeCode_ptr tc
+  )
+{
+  CORBA::LongLong zero = ACE_CDR_LONGLONG_INITIALIZER;
+  TAO::Any_Basic_Impl_T<CORBA::LongLong> * retval = 0;
+  ACE_NEW_RETURN (retval,
+                  TAO::Any_Basic_Impl_T<CORBA::LongLong> (tc,
+                                                          zero),
+                  0);
+  return retval;
+}
 
-      if (!stream.read_wstring (tmp.out ()))
-        {
-          return 0;
-        }
+TAO::Any_Basic_Impl_T<CORBA::LongDouble> *
+TAO::Any_Basic_Impl_T<CORBA::LongDouble>::create_empty (
+    CORBA::TypeCode_ptr tc
+  )
+{
+  CORBA::LongDouble zero = ACE_CDR_LONG_DOUBLE_INITIALIZER;
+  TAO::Any_Basic_Impl_T<CORBA::LongDouble> * retval = 0;
+  ACE_NEW_RETURN (retval,
+                  TAO::Any_Basic_Impl_T<CORBA::LongDouble> (tc,
+                                                            zero),
+                  0);
+  return retval;
+}
 
-      CORBA::Any *non_const_this = ACE_const_cast (CORBA::Any*,
-                                                   this);
-      non_const_this->_tao_replace (CORBA::_tc_wstring,
-                                    1,
-                                    ACE_static_cast (CORBA::WChar *, tmp),
-                                    CORBA::Any::_tao_any_wstring_destructor);
+// =======================================================================
 
-      ws.val_ = tmp._retn ();
-      return 1;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in bounded wstring ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
+// Specializations for CORBA::Exception
 
-  return 0;
+TAO::Any_Dual_Impl_T<CORBA::Exception>::Any_Dual_Impl_T (
+    _tao_destructor destructor,
+    CORBA::TypeCode_ptr tc,
+    const CORBA::Exception & val
+  )
+  : Any_Impl (destructor,
+              tc)
+{
+  this->value_ = val._tao_duplicate ();
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (to_object obj) const
+TAO::Any_Dual_Impl_T<CORBA::Exception>::marshal_value (TAO_OutputCDR &cdr)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->value_->_tao_encode (cdr
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_.in ());
-
-      while (kind == CORBA::tk_alias)
-        {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (kind != CORBA::tk_objref)
-        {
-          return 0;
-        }
-
-      // It is hard to apply this optimization, because value_ points
-      // to a derived class from CORBA::Object, and with multiple
-      // virtual inheritance.  One posibility is to use a helper
-      // function to upcast from void* to CORBA::Object_ptr, but this
-      // is only useful to implement the >>=(to_object) operator,
-      // which is very rarely used.
-      // It is better to just demarshal the object everytime,
-      // specially because the caller owns the returned object.
-      //
-      // if (this->any_owns_data_ && this->value_)
-      //  {
-      //    // CORBA 2.3 has changed the behavior of this operator. Caller
-      //    // is now responsible for release.
-      //    obj.ref_ =
-      //      CORBA::Object::_duplicate (
-      //          (*this->upcast_) (this->value_)
-      //        );
-      //    return 1;
-      //  }
-
-      // @@ This uses ORB_Core instance because we need one to
-      // demarshal objects (to create the right profiles for that
-      // object), but the Any does not belong to any ORB.
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_,
-                           TAO_DEF_GIOP_MAJOR,
-                           TAO_DEF_GIOP_MINOR,
-                           TAO_ORB_Core_instance ());
-
-      if (stream >> obj.ref_)
-        {
-          return 1;
-        }
+      return 1;
     }
   ACE_CATCHANY
     {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::Object_ptr ")
-                             ACE_TEXT ("extraction\n"));
     }
   ACE_ENDTRY;
-
+  
   return 0;
 }
 
 CORBA::Boolean
-CORBA::Any::operator>>= (to_abstract_base obj) const
+TAO::Any_Dual_Impl_T<CORBA::Exception>::demarshal_value (TAO_InputCDR &cdr)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->value_->_tao_decode (cdr
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_.in ());
-
-      while (kind == CORBA::tk_alias)
-        {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (kind != CORBA::tk_abstract_interface)
-        {
-          return 0;
-        }
-
-      // @@ This uses ORB_Core instance because we need one to
-      //    demarshal objects (to create the right profiles for that
-      //    object), but the Any does not belong to any ORB.
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_,
-                           TAO_DEF_GIOP_MAJOR,
-                           TAO_DEF_GIOP_MINOR,
-                           TAO_ORB_Core_instance ());
-
-      if (stream >> obj.ref_)
-        {
-          return 1;
-        }
+      return 1;
     }
   ACE_CATCHANY
     {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::AbstractBase ")
-                             ACE_TEXT ("extraction\n"));
     }
   ACE_ENDTRY;
-
+  
   return 0;
 }
 
-CORBA::Boolean
-CORBA::Any::operator>>= (to_value obj) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_.in ());
+// =======================================================================
 
-      while (kind == CORBA::tk_alias)
-        {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (kind != CORBA::tk_value)
-        {
-          return 0;
-        }
-
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_);
-
-      if (stream >> obj.ref_)
-        {
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception in CORBA::ValueBase ")
-                             ACE_TEXT ("extraction\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
+TAO::Any_Any_Impl::Any_Any_Impl (void)
+  : TAO::Any_Dual_Impl_T<CORBA::Any> (CORBA::_tc_any),
+    any_holder_ (CORBA::Any ())
+{
+  this->value_ = &this->any_holder_;
 }
 
-// this is a copying version for unbounded strings Not inline, to
-// avoid use in Any.i before definition in ORB.i.
+TAO::Any_Any_Impl::Any_Any_Impl (const CORBA::Any &val)
+  : TAO::Any_Dual_Impl_T<CORBA::Any> (CORBA::_tc_any),
+    any_holder_ (val)
+{
+  this->value_ = &this->any_holder_;
+}
 
-void
-CORBA::Any::operator<<= (const char* s)
+TAO::Any_Any_Impl::~Any_Any_Impl (void)
 {
-  TAO_OutputCDR stream;
-  stream << s;
-  this->_tao_replace (CORBA::_tc_string,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
 }
 
-// And the version for unbounded wide string.
 void
-CORBA::Any::operator<<= (const CORBA::WChar* s)
+TAO::Any_Any_Impl::insert_copy (CORBA::Any & any,
+                                const CORBA::Any & value)
 {
-  TAO_OutputCDR stream;
-  stream << s;
-  this->_tao_replace (CORBA::_tc_wstring,
-                      TAO_ENCAP_BYTE_ORDER,
-                      stream.begin ());
+  TAO::Any_Any_Impl *new_impl = 0;
+  ACE_NEW (new_impl,
+           TAO::Any_Any_Impl (value));
+  any.replace (new_impl);
 }
 
 CORBA::Boolean
-operator<< (TAO_OutputCDR& cdr,
-            const CORBA::Any &x)
+TAO::Any_Any_Impl::extract_ref (const CORBA::Any & any,
+                                CORBA::Any & _tao_elem)
 {
-  // If a locality-constrained interface is contained at
-  // any level, the Any cannot be marshaled.
-  if (x.contains_local ())
-    {
-      return 0;
-    }
-
-  CORBA::TypeCode_var tc = x.type ();
-
-  if (!(cdr << tc.in ()))
-    {
-      return 0;
-    }
-
   ACE_TRY_NEW_ENV
     {
-      TAO_InputCDR input (x._tao_get_cdr (),
-                          x._tao_byte_order ());
-
-      CORBA::TypeCode::traverse_status status =
-        TAO_Marshal_Object::perform_append (tc.in (),
-                                            &input,
-                                            &cdr
-                                            ACE_ENV_ARG_PARAMETER);
+      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (CORBA::_tc_any
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
+      if (_tao_equiv == 0)
         {
           return 0;
         }
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
 
-  return 1;
-}
+      TAO::Any_Impl *impl = any.impl ();
 
-CORBA::Boolean
-operator>> (TAO_InputCDR &cdr, CORBA::Any &x)
-{
-  CORBA::TypeCode_var tc;
+      TAO::Any_Any_Impl *narrow_impl =
+        dynamic_cast <TAO::Any_Any_Impl *> (impl);
 
-  if (!(cdr >> tc.out ()))
-    {
-      return 0;
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      // @@ (JP) The following code depends on the fact that
-      //         TAO_InputCDR does not contain chained message blocks,
-      //         otherwise <begin> and <end> could be part of
-      //         different buffers!
-
-      // This will be the start of a new message block.
-      char *begin = cdr.rd_ptr ();
+      if (narrow_impl != 0)
+        {
+          _tao_elem = *narrow_impl->value_;
+          return 1;
+        }
 
-      // Skip over the next aregument.
-      CORBA::TypeCode::traverse_status status =
-        TAO_Marshal_Object::perform_skip (tc.in (),
-                                          &cdr
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
 
-      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
+      if (mb == 0)
         {
           return 0;
         }
 
-      // This will be the end of the new message block.
-      char *end = cdr.rd_ptr ();
-
-      // The ACE_CDR::mb_align() call can shift the rd_ptr by up to
-      // ACE_CDR::MAX_ALIGNMENT-1 bytes. Similarly, the offset adjustment
-      // can move the rd_ptr by up to the same amount. We accommodate
-      // this by including 2 * ACE_CDR::MAX_ALIGNMENT bytes of additional
-      // space in the message block.
-      size_t size = end - begin;
-      ACE_Message_Block mb (size + 2 * ACE_CDR::MAX_ALIGNMENT);
-      ACE_CDR::mb_align (&mb);
-      ptr_arith_t offset = ptr_arith_t (begin) % ACE_CDR::MAX_ALIGNMENT;
-      mb.rd_ptr (offset);
-      mb.wr_ptr (offset + size);
-      ACE_OS::memcpy (mb.rd_ptr (), begin, size);
-
-      // get character translator, if necessary.
-      TAO_Codeset_Translator_Factory *ctrans = 0;
-      if (cdr.char_translator() != 0)
-        ctrans = cdr.orb_core()->resource_factory()->
-          get_char_translator(cdr.char_translator()->ncs(),
-                              cdr.char_translator()->tcs());
-
-      TAO_Codeset_Translator_Factory *wtrans = 0;
-      if (cdr.wchar_translator() != 0)
-        wtrans = cdr.orb_core()->resource_factory()->
-          get_wchar_translator(cdr.wchar_translator()->ncs(),
-                               cdr.wchar_translator()->tcs());
-
-      // Stick it into the Any. It gets duplicated there.
-      x._tao_replace (tc.in (),
-                      cdr.byte_order (),
-                      &mb,
-                      ctrans,
-                      wtrans);
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
+      TAO::Any_Any_Impl *replacement = 0;
+      ACE_NEW_RETURN (replacement,
+                      TAO::Any_Any_Impl,
+                      0);
+                      
+      auto_ptr<TAO::Any_Any_Impl> replacement_safety (replacement);
 
-  return 1;
-}
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
 
-// ****************************************************************
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
 
-CORBA::Any_var &
-CORBA::Any_var::operator= (CORBA::Any *p)
-{
-  if (this->ptr_ != p)
+      if (result == 1)
+        {
+          _tao_elem = *replacement->value_;
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return result;
+        }
+    }
+  ACE_CATCHANY
     {
-      delete this->ptr_;
-
-      this->ptr_ = p;
     }
-
-  return *this;
+  ACE_ENDTRY;
+  
+  return 0;
 }
 
-CORBA::Any_var &
-CORBA::Any_var::operator= (const CORBA::Any_var& r)
-{
-  CORBA::Any_ptr tmp;
-
-  ACE_NEW_RETURN (tmp,
-                  CORBA::Any (*r.ptr_),
-                  *this);
-
-  delete this->ptr_;
-
-  this->ptr_ = tmp;
-
-  return *this;
-}
+void
+TAO::Any_Any_Impl::free_value (void)
+{
+  this->any_holder_.impl ()->free_value ();
+}
+
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO::Any_Special_Basic_Impl_T<
+      CORBA::Boolean, 
+      CORBA::Any::from_boolean,
+      CORBA::Any::to_boolean
+    >;
+
+template class TAO::Any_Special_Basic_Impl_T<
+      CORBA::Octet, 
+      CORBA::Any::from_octet,
+      CORBA::Any::to_octet
+    >;
+
+template class TAO::Any_Special_Basic_Impl_T<
+      char, 
+      CORBA::Any::from_char,
+      CORBA::Any::to_char
+    >;
+
+template class TAO::Any_Special_Basic_Impl_T<
+      CORBA::WChar, 
+      CORBA::Any::from_wchar,
+      CORBA::Any::to_wchar
+    >;
+
+template class TAO::Any_Special_Impl_T<
+      char, 
+      CORBA::Any::from_string,
+      CORBA::Any::to_string
+    >;
+
+template class TAO::Any_Special_Impl_T<
+      CORBA::WChar, 
+      CORBA::Any::from_wstring,
+      CORBA::Any::to_wstring
+    >;
+
+template class TAO::Any_Basic_Impl_T<CORBA::Short>;
+template class TAO::Any_Basic_Impl_T<CORBA::UShort>;
+template class TAO::Any_Basic_Impl_T<CORBA::Long>;
+template class TAO::Any_Basic_Impl_T<CORBA::ULong>;
+template class TAO::Any_Basic_Impl_T<CORBA::LongLong>;
+template class TAO::Any_Basic_Impl_T<CORBA::ULongLong>;
+template class TAO::Any_Basic_Impl_T<CORBA::Float>;
+template class TAO::Any_Basic_Impl_T<CORBA::Double>;
+template class TAO::Any_Dual_Impl_T<CORBA::Any>;
+template class TAO::Any_Impl_T<CORBA::TypeCode>;
+template class TAO::Any_Dual_Impl_T<CORBA::Exception>;
+template class TAO::Any_Impl_T<CORBA::Any>;
+template class TAO::Any_Impl_T<char>;
+template class TAO::Any_Impl_T<CORBA::WChar>;
+template class TAO::Any_Impl_T<CORBA::Object>;
+template class TAO::Any_Impl_T<CORBA::AbstractBase>;
+template class TAO::Any_Impl_T<CORBA::ValueBase>;
+template class TAO::Any_Impl_T<CORBA::Any>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO::Any_Special_Basic_Impl_T<
+      CORBA::Boolean, 
+      CORBA::Any::from_boolean,
+      CORBA::Any::to_boolean
+    >
+
+#pragma instantiate TAO::Any_Special_Basic_Impl_T<
+      CORBA::Octet, 
+      CORBA::Any::from_octet,
+      CORBA::Any::to_octet
+    >
+
+#pragma instantiate TAO::Any_Special_Basic_Impl_T<
+      char, 
+      CORBA::Any::from_char,
+      CORBA::Any::to_char
+    >
+
+#pragma instantiate TAO::Any_Special_Basic_Impl_T<
+      CORBA::WChar, 
+      CORBA::Any::from_wchar,
+      CORBA::Any::to_wchar
+    >
+
+#pragma instantiate TAO::Any_Special_Impl_T<
+      char, 
+      CORBA::Any::from_string,
+      CORBA::Any::to_string
+    >
+
+#pragma instantiate TAO::Any_Special_Impl_T<
+      CORBA::WChar, 
+      CORBA::Any::from_wstring,
+      CORBA::Any::to_wstring
+    >
+
+#pragma instantiate TAO::Any_Basic_Impl_T<CORBA::Short>
+#pragma instantiate TAO::Any_Basic_Impl_T<CORBA::UShort>
+#pragma instantiate TAO::Any_Basic_Impl_T<CORBA::Long>
+#pragma instantiate TAO::Any_Basic_Impl_T<CORBA::ULong>
+#pragma instantiate TAO::Any_Basic_Impl_T<CORBA::LongLong>
+#pragma instantiate TAO::Any_Basic_Impl_T<CORBA::ULongLong>
+#pragma instantiate TAO::Any_Basic_Impl_T<CORBA::Float>
+#pragma instantiate TAO::Any_Basic_Impl_T<CORBA::Double>
+#pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Any>
+#pragma instantiate TAO::Any_Impl_T<CORBA::TypeCode>
+#pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Exception>
+#pragma instantiate TAO::Any_Impl_T<CORBA::Any>
+#pragma instantiate TAO::Any_Impl_T<char>
+#pragma instantiate TAO::Any_Impl_T<CORBA::WChar>
+#pragma instantiate TAO::Any_Impl_T<CORBA::Object>
+#pragma instantiate TAO::Any_Impl_T<CORBA::AbstractBase>
+#pragma instantiate TAO::Any_Impl_T<CORBA::ValueBase>
+#pragma instantiate TAO::Any_Impl_T<CORBA::Any>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index ac3dcef0733..b7a7c7c603c 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -6,8 +6,7 @@
  *
  *  $Id$
  *
- *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author  Aniruddha Gokhale
+ *  @author  Carlos O'Ryan and Jeff Parsons
  */
 //=============================================================================
 
@@ -26,6 +25,11 @@
 #include "tao/Object.h"
 #include "tao/Typecode.h"
 
+namespace TAO
+{
+  class Any_Impl;
+};
+
 class TAO_Codeset_Translator_Factory;
 
 namespace CORBA
@@ -33,177 +37,42 @@ namespace CORBA
   /**
    * @class Any
    *
-   * @brief Class "Any" can wrap values of any type, with the assistance
-   * of a TypeCode to describe that type.
+   * @brief Generic container for IDL types.
    *
-   * This includes three constructors, a destructor, and a "replace"
-   * method for the "Any" data type.  "Any" values pair a pointer to
-   * a data structure in the native binary representation (e.g. C
-   * struct) with a TypeCode that describes that data structure.
-   * The copy constructor and the destructor each use the TypeCode
-   * interpreter with specialized "visit" callback routines.  The
-   * "visit" routines are used respectively to make "deep copies"
-   * and perform "deep frees" of the aritrary values as described by
-   * the "Any" value's typecode.
-   * Note that these "visit" routines are called directly, and they
-   * choose whether or not to use the TypeCode interpreter to
-   * examine constituents.  In the simple cases, the "visit"
-   * routines can do their work without any further calls; only for
-   * constructed types is the interpreter's knowledge really
-   * required.
-   * @par
-   * THREADING NOTE: "Any" is a data structure which must be
-   * protected by external critical sections.  Like simpler numeric
-   * types, "Any" instances are accessed and modified atomically.
-   * This implementation is reentrant, so that independent "Any"
-   * values may be manipulated concurrently when the underlying
-   * programming environment is itself reentrant.
- */
+   * This is the top-level class of the Any implementation. It exposes the
+   * spec-required functionality, but is mostly a wrapper for one of the
+   * template classes below.
+   */
   class TAO_Export Any
   {
   public:
+    typedef Any_ptr _ptr_type;
+    typedef Any_var _var_type;
 
-    // = Minor codes for exceptional returns
-    enum
-      {
-        UNINITIALIZED_type = 0xf000,
-        VALUE_WITHOUT_TYPE,
-        UNSUPPORTED_OPERATION
-      };
-
-    // = Initialization and termination operations.
-
-    /// Default constructor.
     Any (void);
+    Any (const Any &);
 
-    /// Constructor.
-    Any (CORBA::TypeCode_ptr type);
-
-    /// Constructor.
-    /**
-     * Constructor used by DynAny and others to optimize Any
-     * activities by using CDR.  The dummy arg is to keep calls like
-     * CORBA::Any foo (CORBA::TypeCode_ptr bar (0), 0) from being
-     * confused with the constructor above.
-     *
-     * @note This is a TAO-specific constructor.
-     */
-    Any (CORBA::TypeCode_ptr type,
-         CORBA::UShort dummy,
-         int byte_order,
-         const ACE_Message_Block* mb);
+    /// This signature is required by the C++ mapping, but allows
+    /// obvious type safety dangers. TAO's implementation will
+    /// accept only 0 for the void*. This constructor is
+    /// used with interceptors, where an Any may need to be
+    /// created that contains a void type.
+    Any (TypeCode_ptr,
+         void *,
+         Boolean release = 0);
 
-    /// Copy constructor.
-    Any (const Any &a);
-
-    /// Destructor.
     ~Any (void);
 
-    /// assignment operator
-    Any & operator= (const Any &);
-
-    // = NOTE: 94-9-14 has assignment operator plus many insertion, as
-    // specified below.
-
-    // =type safe insertion
-
-    /// Insert a short.
-    void operator<<= (CORBA::Short);
-
-    /// Insert an unsigned short.
-    void operator<<= (CORBA::UShort);
-
-    /// Insert a long.
-    void operator<<= (CORBA::Long);
-
-    /// Insert an unsigned long.
-    void operator<<= (CORBA::ULong);
-
-    /// Insert a long long.
-    void operator<<= (CORBA::LongLong);
-
-    /// Insert an unsigned long long.
-    void operator<<= (CORBA::ULongLong);
-
-    /// Insert a float.
-    void operator<<= (CORBA::Float);
-
-    /// Insert a double.
-    void operator<<= (CORBA::Double);
-
-    /// Insert a long double.
-    void operator<<= (CORBA::LongDouble);
-
-    /// Insert an Any, copying.
-    void operator<<= (const Any &);
-
-    /// Insert an Any, non-copying.
-    void operator<<= (CORBA::Any_ptr);
-
-    /// Insert unbounded string
-    void operator<<= (const char*);
-
-    /// Insert unbounded wide string.
-    void operator<<= (const CORBA::WChar *);
-
-    /// Insert a TypeCode.
-    void operator<<= (CORBA::TypeCode_ptr);
-
-    /// Insert an object reference, copying.
-    void operator<<= (const CORBA::Object_ptr);
-
-    /// Insert an object reference, non-copying.  Any assumes the
-    /// ownership of the object.
-    void operator<<= (CORBA::Object_ptr *);
-
-    // =Type safe extraction.
-
-    /// Extract a short.
-    CORBA::Boolean operator>>= (CORBA::Short&) const;
-
-    /// Extract an unsigned short.
-    CORBA::Boolean operator>>= (CORBA::UShort&) const;
-
-    /// Extract a long.
-    CORBA::Boolean operator>>= (CORBA::Long&) const;
-
-    /// Extract an unsigned long.
-    CORBA::Boolean operator>>= (CORBA::ULong&) const;
-
-    /// Extract a long long.
-    CORBA::Boolean operator>>= (CORBA::LongLong&) const;
+    Any &operator= (const Any &);
+    TAO::Any_Impl *impl (void) const;
 
-    /// Extract an unsigned long long.
-    CORBA::Boolean operator>>= (CORBA::ULongLong&) const;
+    /// Used in our destruction if we ourselves are stored in an Any.
+    static void _tao_any_destructor (void *);
 
-    /// Extract a float.
-    CORBA::Boolean operator>>= (CORBA::Float&) const;
-
-    /// Extract a double.
-    CORBA::Boolean operator>>= (CORBA::Double&) const;
-
-    /// Extract a long double.
-    CORBA::Boolean operator>>= (CORBA::LongDouble&) const;
-
-    /// Extract an Any.
-    CORBA::Boolean operator>>= (Any &) const; // non-spec
-    CORBA::Boolean operator>>= (const Any *&) const;
-
-    /// Extract a TypeCode.
-    CORBA::Boolean operator>>= (CORBA::TypeCode_ptr&) const;
-
-    /// Extract an unbounded string
-    CORBA::Boolean operator>>= (const char*&) const;
-
-    /// Extract an unbounded wide string.
-    CORBA::Boolean operator>>= (const CORBA::WChar*&) const;
-
-    // = Special types.
-
-    // These are needed for insertion and extraction of booleans,
-    // octets, chars, and bounded strings. CORBA spec requires
-    // that they be here, we just typedef to the already-defined
-    // ACE_OutputCDR types.
+    /// These are needed for insertion and extraction of booleans,
+    /// octets, chars, and bounded strings. CORBA spec requires
+    /// that they be here, we just typedef to the already-defined
+    /// ACE_OutputCDR types.
 
     typedef ACE_OutputCDR::from_boolean from_boolean;
     typedef ACE_OutputCDR::from_octet from_octet;
@@ -212,34 +81,17 @@ namespace CORBA
     typedef ACE_OutputCDR::from_string from_string;
     typedef ACE_OutputCDR::from_wstring from_wstring;
 
-    /// Insert a boolean.
-    void operator<<= (from_boolean);
+    /// Insertion of the special types.
 
-    /// Insert a char.
+    void operator<<= (from_boolean);
     void operator<<= (from_char);
-
-    /// Insert a wchar.
     void operator<<= (from_wchar);
-
-    /// Insert an octet.
     void operator<<= (from_octet);
-
-    /// Insert a bounded string.
     void operator<<= (from_string);
-
-    /// Insert a bounded wide string.
     void operator<<= (from_wstring);
 
-    /// Insert an exception into the Any (copying)
-    void operator<<= (const CORBA::Exception &exception);
-
-    /// Insert an exception into the Any (non-copying).
-    void operator<<= (CORBA::Exception *exception);
-
-    // = Special types.
-
-    // These extract octets, chars, booleans, bounded strings, and
-    // object references. All these are defined in ACE_InputCDR.
+    /// These extract octets, chars, booleans, bounded strings, and
+    /// object references. All these are defined in ACE_InputCDR.
 
     typedef ACE_InputCDR::to_boolean to_boolean;
     typedef ACE_InputCDR::to_char to_char;
@@ -248,196 +100,83 @@ namespace CORBA
     typedef ACE_InputCDR::to_string to_string;
     typedef ACE_InputCDR::to_wstring to_wstring;
 
-    // These are not in ACE.
+    /// These are not in ACE.
 
     struct TAO_Export to_object
     {
       // This signature reflects the change set out in
       // issue 154 of the 1.3 RTF.
-      to_object (CORBA::Object_out obj);
-      CORBA::Object_ptr &ref_;
-  };
+      to_object (Object_out obj);
+      Object_ptr &ref_;
+    };
 
     struct TAO_Export to_abstract_base
     {
-      to_abstract_base (CORBA::AbstractBase_ptr &obj);
-      CORBA::AbstractBase_ptr &ref_;
+      to_abstract_base (AbstractBase_ptr &obj);
+      AbstractBase_ptr &ref_;
     };
 
     struct TAO_Export to_value
     {
-      to_value (CORBA::ValueBase *&base);
-      CORBA::ValueBase *&ref_;
+      to_value (ValueBase *&base);
+      ValueBase *&ref_;
     };
 
-    // Extraction of the special types.
-
-    /// extract a boolean
-    CORBA::Boolean operator>>= (to_boolean) const;
-
-    /// extract an octet
-    CORBA::Boolean operator>>= (to_octet) const;
-
-    /// extract a char
-    CORBA::Boolean operator>>= (to_char) const;
-
-    /// extract a wchar
-    CORBA::Boolean operator>>= (to_wchar) const;
-
-    /// extract a bounded string
-    CORBA::Boolean operator>>= (to_string) const;
-
-    /// extract a bounded wide string
-    CORBA::Boolean operator>>= (to_wstring) const;
-
-    /// extract an object reference
-    CORBA::Boolean operator>>= (to_object) const;
+    /// Extraction of the special types.
 
-    /// extract an abstract interface
-    CORBA::Boolean operator>>= (to_abstract_base) const;
+    Boolean operator>>= (to_boolean) const;
+    Boolean operator>>= (to_octet) const;
+    Boolean operator>>= (to_char) const;
+    Boolean operator>>= (to_wchar) const;
+    Boolean operator>>= (to_string) const;
+    Boolean operator>>= (to_wstring) const;
+    Boolean operator>>= (to_object) const;
+    Boolean operator>>= (to_abstract_base) const;
+    Boolean operator>>= (to_value) const;
 
-    /// extract a valuetype
-    CORBA::Boolean operator>>= (to_value) const;
+    /// Spec-defined signature.
+    void replace (TypeCode_ptr,
+                  void *value,
+                  Boolean release = 0);
 
-    // the following are unsafe operations
-    // ORBOS/90-01-11, pg 672: For C++ mapping using the
-    // CORBA::Environment parameter, two forms of the replace method
-    // are provided.
+    /// TAO-specific signature.
+    void replace (TAO::Any_Impl *);
 
     /// Return TypeCode of the element stored in the Any.
-    CORBA::TypeCode_ptr type (void) const;
+    TypeCode_ptr type (void) const;
 
-    /// For use along with <<= of a value of aliased type when the
-    /// alias must be preserved.
-    void type (CORBA::TypeCode_ptr type
+    /// For use along with <<= of a value of aliased type when the alias must
+    /// be preserved.
+    void type (TypeCode_ptr
                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-    /**
-     * Returns 0 if the Any has not been assigned a value, following
-     * the CORBA spec (ORBOS/98-01-11) it returns a non-zero value
-     * otherwise. TAO does *not* guarantee that this value may be
-     * casted to the contained type safely.
-     */
-    const void *value (void) const;
-
-    /**
-     * @name TAO Extensions
-     *
-     * TAO-specific methods.
-     */
-    //@{
-
-    /**
-     * Reports whether the Any own the data or not. This is used by the
-     * >>= operators generated by the IDL compiler. The >>= operator
-     * checks if the Any owns the data. If it does, then it will simply
-     * retrieve the data from internal cache.  Otherwise, the operator
-     * will have to decode the cdr string.
-     */
-    CORBA::Boolean any_owns_data (void) const;
-
-    /// Reports whether the Any contains (at some level) a local type.
-    CORBA::Boolean contains_local (void) const;
+    /// TAO extension, does not return a duplicate.
+    CORBA::TypeCode_ptr _tao_get_typecode (void) const;
 
-    /// Set the member contains_local_.
-    void contains_local (CORBA::Boolean val);
-
-    /// Message block accessor.
-    /// Get the byte order inside the CDR stream.
-    ACE_Message_Block* _tao_get_cdr (void) const;
+    ACE_Message_Block *_tao_get_cdr (void) const;
     int _tao_byte_order (void) const;
 
-    /// Generated data types define a 'destructor' function that
-    /// correctly destroys an object stored in the Any.
-    typedef void (*_tao_destructor)(void*);
-
-    /// Replace via message block instead of <value_>.
-    void _tao_replace (CORBA::TypeCode_ptr,
-                       int byte_order,
-                       const ACE_Message_Block *mb,
-                       TAO_Codeset_Translator_Factory *ctrans = 0,
-                       TAO_Codeset_Translator_Factory *wtrans = 0);
-
-    /// Replace all the contents of the any, used in the <<= operators.
-    void _tao_replace (CORBA::TypeCode_ptr type,
-                       int byte_order,
-                       const ACE_Message_Block *mb,
-                       CORBA::Boolean any_owns_data,
-                       void* value,
-                       CORBA::Any::_tao_destructor destructor);
-
-    /// Replace the value of the Any, used in the >>= operators.
-    void _tao_replace (CORBA::TypeCode_ptr type,
-                       CORBA::Boolean any_owns_data,
-                       void* value,
-                       CORBA::Any::_tao_destructor destructor);
-
-    /// Encode the contents of the Any into <cdr>
-    void _tao_encode (TAO_OutputCDR &cdr,
-                      TAO_ORB_Core *orb_core
-                      ACE_ENV_ARG_DECL);
-
-    /// Decode the <cdr> using the typecode in the Any object.
-    void _tao_decode (TAO_InputCDR &cdr
-                      ACE_ENV_ARG_DECL);
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    // Useful for template programming.
-    typedef CORBA::Any_ptr _ptr_type;
-    typedef CORBA::Any_var _var_type;
-#endif /* __GNUC__ */
-
-    // Used to release Anys contained into anys.
-    static void _tao_any_destructor (void*);
-    static void _tao_any_string_destructor (void*);
-    static void _tao_any_wstring_destructor (void*);
-    static void _tao_any_tc_destructor (void*);
-
-    //@}
-
-  protected:
-
-    /// Release the @c value_.
-    void free_value (void);
+    /// Spec-required method - not type safe.
+    const void *value (void) const;
 
   private:
+    CORBA::Boolean checked_to_object (CORBA::Object_ptr &) const;
+    CORBA::Boolean checked_to_value (CORBA::ValueBase *&) const;
+    CORBA::Boolean checked_to_abstract_base (CORBA::AbstractBase_ptr &) const;
 
-    /// Typecode for the @c Any.
-    CORBA::TypeCode_var type_;
-
-    int byte_order_;
-
-    /// encoded value.
-    ACE_Message_Block *cdr_;
-
-    /// Flag that indicates the ORB is responsible for deleting the data.
-    CORBA::Boolean any_owns_data_;
-
-    /// Flag that indicates the Any contains (at some level) a
-    /// locality-constrained type, and so cannot be marshaled.
-    CORBA::Boolean contains_local_;
-
-    /// Value for the <Any>.
-    void *value_;
-
-    /// If not zero this is the function used to destroy objects.
-    CORBA::Any::_tao_destructor destructor_;
-
-    /// Codeset translator factories obtained from the decoding CDR, used to
-    /// translate strings when actually needed.
-    TAO_Codeset_Translator_Factory *char_translator_;
-    TAO_Codeset_Translator_Factory *wchar_translator_;
-
-    // 94-9-14 hides unsigned char insert/extract
+    // Unimplemented - hides unsigned char insert/extract.
     void operator<<= (unsigned char);
     CORBA::Boolean operator>>= (unsigned char&) const;
 
-    friend class CORBA::NVList;
+  private:
+    TAO::Any_Impl *impl_;
+
+    friend class CORBA_NVList;
     friend class TAO_Marshal_Any;
   };
 
   /**
-   * @class Any_var
+   * @class CORBA::Any_var
    *
    * @brief Provide for automatic storage deallocation on going out of
    * scope.
@@ -445,190 +184,301 @@ namespace CORBA
   class TAO_Export Any_var
   {
   public:
-    /// default constructor
     Any_var (void);
-
-    /// Construct from an Any pointer
-    Any_var (CORBA::Any *a);
-
-    /// Copy constructor
-    Any_var (const Any_var &a);
-
-    /// destructor
+    Any_var (Any *a);
+    Any_var (const Any_var &);
     ~Any_var (void);
 
-    /// assignment from a pointer to Any
-    Any_var &operator= (CORBA::Any *a);
+    Any_var &operator= (Any *);
 
-    /// assignment from an Any_var
     /**
-     * This operation requires memory allocation.  If the allocation
-     * fails, (*this) is returned unmodified.
+     * Assignment from an Any_var
+     * This operation requires memory allocation.
+     * If the allocation fails, *this is returned
+     * unmodified.
      */
-    Any_var &operator= (const Any_var &a);
+    Any_var &operator= (const Any_var &);
 
-    /// arrow operator (smart pointer)
-    CORBA::Any *operator-> (void);
+    /// Arrow operator (smart pointer).
+    Any *operator-> (void);
 
-    /// cast
-    operator CORBA::Any &();
+    /// Cast.
+    operator const Any *() const;
 
-    /// cast
-    operator const CORBA::Any *() const;
+    /// Cast.
+    operator Any *&();
 
-    /// cast
-    operator CORBA::Any *&();
+    /// For in Any parameter.
+    const Any &in (void) const;
 
-    /// for in Any parameter
-    const CORBA::Any &in (void) const;
+    /// For inout Any parameter.
+    Any &inout (void);
 
-    /// for inout Any parameter
-    CORBA::Any &inout (void);
+    /// For out Any parameter.
+    Any *&out (void);
 
-    /// for out Any parameter
-    CORBA::Any *&out (void);
+    /// For Any return type.
+    Any *_retn (void);
 
-    CORBA::Any *_retn (void);
   private:
     /// Holds the Any.
-    CORBA::Any *ptr_;
+    Any *ptr_;
   };
 
   /**
-   * @class Any_out
+   * @class CORBA::Any_out
    *
-   * @brief Any_out
+   * @brief CORBA::Any_out
    *
-   * The _out class for CORBA::Any. This is used to help in managing
-   * the out parameters.
+   * The _out class for CORBA::Any. This is used to help in
+   * managing the out parameters.
    */
   class TAO_Export Any_out
   {
   public:
+    Any_out (Any *&);
+    Any_out (Any_var &);
+    Any_out (const Any_out &);
 
-    /// construction from a reference to a CORBA::Any
-    Any_out (CORBA::Any *&p);
+    /// Assignment from a Any_out.
+    Any_out &operator= (const Any_out &s);
 
-    /// construction from a var
-    Any_out (CORBA::Any_var &p);
+    /// Assignment from a Any.
+    Any_out &operator= (Any *);
 
-    /// copy constructor
-    Any_out (const Any_out &s);
+    /// Cast.
+    operator Any *&();
 
-    /// assignment from a CORBA::Any_out
-    Any_out &operator= (const Any_out &s);
+    /// Return underlying instance.
+    Any *& ptr (void);
+
+    Any *operator-> (void);
+
+  private:
+    /// Assignment from _var disallowed.
+    void operator= (const Any_var &);
+
+  private:
+    /// Instance.
+    Any *&ptr_;
+  };
+};
 
-    /// assignment from a CORBA::Any
-    Any_out &operator= (CORBA::Any *p);
+namespace TAO
+{
+  /**
+   * @class Any_Impl
+   *
+   * @brief Base class for the template subclasses.
+   *
+   * Contains common functionality and some pure virtual methods.
+   */
+  class TAO_Export Any_Impl
+  {
+  public:
+    /// Generated data types define a 'destructor' function that
+    /// correctly destroys an object stored in an Any.
+    typedef void (*_tao_destructor)(void *);
 
-    /// cast
-    operator CORBA::Any *&();
+    CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &) = 0;
+    virtual const void *value (void) const = 0;
 
-    /// return underlying instance
-    CORBA::Any *& ptr (void);
+    virtual void free_value (void);
 
-    CORBA::Any *operator-> (void);
+    CORBA::TypeCode_ptr type (void) const;
+    CORBA::TypeCode_ptr _tao_get_typecode (void) const;
+    void type (CORBA::TypeCode_ptr);
 
-  private:
-    /// Instance
-    CORBA::Any *&ptr_;
+    virtual ACE_Message_Block *_tao_get_cdr (void) const;
+    virtual int _tao_byte_order (void) const;
+
+    virtual void _add_ref (void);
+    virtual void _remove_ref (void);
+
+    /// Used to release these CORBA basic types.
+    static void _tao_any_string_destructor (void *);
+    static void _tao_any_wstring_destructor (void *);
+
+    // Used only by Unknown_IDL_Type.
+    virtual void _tao_decode (TAO_InputCDR &
+                              ACE_ENV_ARG_DECL_NOT_USED);
+    virtual void assign_translator (CORBA::TCKind,
+                                    TAO_InputCDR *cdr);
+
+    virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
+    virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
+    virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
+
+  protected:
+    Any_Impl (_tao_destructor,
+              CORBA::TypeCode_ptr);
+    virtual ~Any_Impl (void);
+
+    TAO::Any_Impl::_tao_destructor value_destructor_;
+    CORBA::TypeCode_ptr type_;
 
-    /// assignment from _var disallowed
-    void operator= (const CORBA::Any_var &);
+  private:
+    /// Number of outstanding references to this object.
+    CORBA::ULong refcount_;
   };
-} // End namespace CORBA
 
-// These operators are too complex to be inline....
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr,
-                                      const CORBA::Any &x);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
-                                      CORBA::Any &x);
+  class TAO_Export Unknown_IDL_Type : public Any_Impl
+  {
+  public:
+    Unknown_IDL_Type (CORBA::TypeCode_ptr,
+                      const ACE_Message_Block *,
+                      int byte_order,
+                      CORBA::Boolean release_tc = 0,
+                      TAO_Codeset_Translator_Factory *ctrans = 0,
+                      TAO_Codeset_Translator_Factory *wtrans = 0);
+    virtual ~Unknown_IDL_Type (void);
 
-#if defined (__ACE_INLINE__)
-# include "tao/Any.i"
-#else
-
-// Copying versions of insertion
-// operators which are defined as members of the Any class
-// must also be defined for Any_var.
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::Short);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::UShort);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::Long);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::ULong);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::LongLong);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::ULongLong);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::Float);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::Double);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             const CORBA::Any&);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             const char*);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::TypeCode_ptr);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             const CORBA::Object_ptr);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::Any::from_boolean);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::Any::from_char);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::Any::from_wchar);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::Any::from_octet);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::Any::from_string);
-TAO_Export void operator<<= (CORBA::Any_var &,
-                             CORBA::Any::from_wstring);
-
-// These are not required by the spec, but will make users
-// of other ORBs that are used to them more comfortable.
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
-                                       CORBA::Short&);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
-                                       CORBA::UShort&);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
-                                       CORBA::Long&);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
-                                       CORBA::ULong&);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
-                                       CORBA::LongLong&);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
-                                       CORBA::ULongLong&);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
-                                       CORBA::Float&);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
-                                       CORBA::Double&);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
-                                       CORBA::Any&);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
-                                       CORBA::TypeCode_ptr&);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
-                                       const char*&);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
-                                       const CORBA::WChar*&);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    virtual const void *value (void) const;
+    virtual void free_value (void);
+
+    virtual ACE_Message_Block *_tao_get_cdr (void) const;
+    virtual int _tao_byte_order (void) const;
+
+    virtual void _tao_decode (TAO_InputCDR &
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    virtual void assign_translator (CORBA::TCKind,
+                                    TAO_InputCDR *cdr);
+
+    TAO_Codeset_Translator_Factory *char_translator (void);
+    TAO_Codeset_Translator_Factory *wchar_translator (void);
+
+  private:
+    ACE_Message_Block *cdr_;
+    int byte_order_;
+    CORBA::Boolean release_tc_;
+    TAO_Codeset_Translator_Factory *char_translator_;
+    TAO_Codeset_Translator_Factory *wchar_translator_;
+  };
+};
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Any &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Any &);
+
+/// Typesafe insertion.
+
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Short);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::UShort);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Long);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ULong);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::LongLong);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ULongLong);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Float);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Double);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::LongDouble);
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::Any &);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Any *);
+TAO_Export void operator<<= (CORBA::Any &, const char *);
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::WChar *);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::TypeCode_ptr);
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::Object_ptr);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Object_ptr *);
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::Exception &);
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Exception *);
+
+/// Typesafe extraction.
+
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       CORBA::Short &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       CORBA::UShort &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       CORBA::Long &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       CORBA::ULong &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       CORBA::LongLong &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       CORBA::ULongLong &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       CORBA::Float &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       CORBA::Double &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       CORBA::LongDouble &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       const CORBA::Any &); // non-spec
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       const CORBA::Any *&);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       CORBA::TypeCode_ptr &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       const char *&);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
+                                       const CORBA::WChar *&);
+
+/// Copying versions of insertion operators for basic types
+/// must also be defined for CORBA::Any_var.
+
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Short);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::UShort);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Long);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::ULong);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::LongLong);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::ULongLong);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Float);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Double);
+TAO_Export void operator<<= (CORBA::Any_var &, const CORBA::Any &);
+TAO_Export void operator<<= (CORBA::Any_var &, const char *);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::TypeCode_ptr);
+TAO_Export void operator<<= (CORBA::Any_var &, const CORBA::Object_ptr);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_boolean);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_char);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_wchar);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_octet);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_string);
+TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_wstring);
+
+/// These are not required by the spec, but will make users
+/// of other ORBs that are used to them more comfortable.
+
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &, 
+                                       CORBA::Short &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
+                                       CORBA::UShort &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
+                                       CORBA::Long &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
+                                       CORBA::ULong &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
+                                       CORBA::LongLong &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
+                                       CORBA::ULongLong &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
+                                       CORBA::Float &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
+                                       CORBA::Double &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
+                                       CORBA::Any &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
+                                       CORBA::TypeCode_ptr &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
+                                       const char *&);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
+                                       const CORBA::WChar *&);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
                                        CORBA::Any::to_boolean);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
                                        CORBA::Any::to_octet);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
                                        CORBA::Any::to_char);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
                                        CORBA::Any::to_wchar);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
                                        CORBA::Any::to_string);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
                                        CORBA::Any::to_wstring);
-TAO_Export CORBA::Boolean operator>>= (CORBA::Any_var &,
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
                                        CORBA::Any::to_object);
 
+#if defined (__ACE_INLINE__)
+# include "tao/Any.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i
index 3b3cac24321..88586c64431 100644
--- a/TAO/tao/Any.i
+++ b/TAO/tao/Any.i
@@ -2,54 +2,10 @@
 //
 // $Id$
 
-// Insertion from special types.
-
-ACE_INLINE CORBA::Boolean
-CORBA::Any::any_owns_data (void) const
-{
-  return (this->any_owns_data_ != 0 && this->value_ != 0);
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA::Any::contains_local (void) const
-{
-  return this->contains_local_;
-}
-
-ACE_INLINE void
-CORBA::Any::contains_local (CORBA::Boolean val)
-{
-  this->contains_local_ = val;
-}
-
-ACE_INLINE ACE_Message_Block*
-CORBA::Any::_tao_get_cdr (void) const
-{
-  return this->cdr_;
-}
-
-ACE_INLINE int
-CORBA::Any::_tao_byte_order (void) const
-{
-  return this->byte_order_;
-}
-
-ACE_INLINE
-CORBA::Any::to_object::to_object (CORBA::Object_out obj)
-  : ref_ (obj.ptr ())
-{
-}
-
-ACE_INLINE
-CORBA::Any::to_abstract_base::to_abstract_base (CORBA::AbstractBase_ptr &obj)
-  : ref_ (obj)
-{
-}
-
-ACE_INLINE
-CORBA::Any::to_value::to_value (CORBA::ValueBase *&obj)
-  : ref_ (obj)
+ACE_INLINE TAO::Any_Impl *
+CORBA::Any::impl (void) const
 {
+  return this->impl_;
 }
 
 // *************************************************************
@@ -69,7 +25,7 @@ CORBA::Any_var::Any_var (CORBA::Any *p)
 }
 
 ACE_INLINE
-CORBA::Any_var::Any_var (const CORBA::Any_var& r)
+CORBA::Any_var::Any_var (const CORBA::Any_var &r)
 {
   CORBA::Any_ptr nptr;
   ACE_NEW (nptr,
@@ -84,12 +40,6 @@ CORBA::Any_var::~Any_var (void)
 }
 
 ACE_INLINE
-CORBA::Any_var::operator CORBA::Any &()
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
 CORBA::Any_var::operator CORBA::Any *&()
 {
   return this->ptr_;
@@ -252,117 +202,117 @@ operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_wstring rhs)
 // *************************************************************
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::Short &rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::Short &rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::UShort &rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::UShort &rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::Long &rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::Long &rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::ULong &rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::ULong &rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::LongLong &rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::LongLong &rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::ULongLong &rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::ULongLong &rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::Float &rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::Float &rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::Double &rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::Double &rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::Any &rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::Any &rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::TypeCode_ptr &rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::TypeCode_ptr &rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, const char *&rhs)
+operator >>= (const CORBA::Any_var &lhs, const char *&rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, const CORBA::WChar *&rhs)
+operator >>= (const CORBA::Any_var &lhs, const CORBA::WChar *&rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::Any::to_boolean rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_boolean rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::Any::to_octet rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_octet rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::Any::to_char rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_char rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::Any::to_wchar rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_wchar rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::Any::to_string rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_string rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::Any::to_wstring rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_wstring rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 ACE_INLINE CORBA::Boolean
-operator >>= (CORBA::Any_var &lhs, CORBA::Any::to_object rhs)
+operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_object rhs)
 {
-  return lhs.inout () >>= rhs;
+  return lhs.in () >>= rhs;
 }
 
 // *************************************************************
@@ -419,3 +369,81 @@ CORBA::Any_out::operator-> (void)
 {
   return this->ptr_;
 }
+
+// ***********************************************************************
+
+ACE_INLINE void
+TAO::Any_Impl::free_value (void)
+{
+  // Does nothing so that subclasses for basic types don't have to
+  // override it.
+}
+
+ACE_INLINE CORBA::TypeCode_ptr
+TAO::Any_Impl::type (void) const
+{
+  return CORBA::TypeCode::_duplicate (this->type_);
+}
+
+ACE_INLINE CORBA::TypeCode_ptr
+TAO::Any_Impl::_tao_get_typecode (void) const
+{
+  return this->type_;
+}
+
+ACE_INLINE void
+TAO::Any_Impl::type (CORBA::TypeCode_ptr tc)
+{
+  this->type_ = tc;
+}
+
+ACE_INLINE ACE_Message_Block *
+TAO::Any_Impl::_tao_get_cdr (void) const
+{
+  return 0;
+}
+
+ACE_INLINE int
+TAO::Any_Impl::_tao_byte_order (void) const
+{
+  return TAO_ENCAP_BYTE_ORDER;
+}
+
+ACE_INLINE CORBA::Boolean
+TAO::Any_Impl::to_object (CORBA::Object_ptr &) const
+{
+  return 0;
+}
+
+ACE_INLINE CORBA::Boolean
+TAO::Any_Impl::to_value (CORBA::ValueBase *&) const
+{
+  return 0;
+}
+
+ACE_INLINE CORBA::Boolean
+TAO::Any_Impl::to_abstract_base (CORBA::AbstractBase_ptr &) const
+{
+  return 0;
+}
+
+// ***********************************************************************
+
+ACE_INLINE const void *
+TAO::Unknown_IDL_Type::value (void) const
+{
+  return this->cdr_;
+}
+
+ACE_INLINE ACE_Message_Block *
+TAO::Unknown_IDL_Type::_tao_get_cdr (void) const
+{
+  return this->cdr_;
+}
+
+ACE_INLINE int
+TAO::Unknown_IDL_Type::_tao_byte_order (void) const
+{
+  return this->byte_order_;
+}
+
diff --git a/TAO/tao/Any_T.cpp b/TAO/tao/Any_T.cpp
new file mode 100644
index 00000000000..25488812f6e
--- /dev/null
+++ b/TAO/tao/Any_T.cpp
@@ -0,0 +1,800 @@
+// $Id$
+
+#ifndef TAO_ANY_T_C
+#define TAO_ANY_T_C
+
+#include "tao/Any_T.h"
+#include "tao/Marshal.h"
+#include "tao/debug.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Any_T.inl"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID (tao,
+           Any_T,
+           "$Id$")
+
+template<typename T>
+TAO::Any_Impl_T<T>::Any_Impl_T (_tao_destructor destructor,
+                                CORBA::TypeCode_ptr tc,
+                                T * const val)
+  : Any_Impl (destructor,
+              tc),
+    value_ (val)
+{
+}
+
+template<typename T>
+TAO::Any_Impl_T<T>::~Any_Impl_T (void)
+{
+}
+
+template<typename T> void
+TAO::Any_Impl_T<T>::insert (CORBA::Any & any,
+                            _tao_destructor destructor,
+                            CORBA::TypeCode_ptr tc,
+                            T * const value)
+{
+  TAO::Any_Impl_T<T> *new_impl = 0;
+  ACE_NEW (new_impl,
+           TAO::Any_Impl_T<T> (destructor,
+                               tc,
+                               value));
+  any.replace (new_impl);
+}
+
+template<typename T> CORBA::Boolean
+TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
+                             _tao_destructor destructor,
+                             CORBA::TypeCode_ptr tc,
+                             T *& _tao_elem)
+{
+  _tao_elem = 0;
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (_tao_equiv == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Impl *impl = any.impl ();
+
+      TAO::Any_Impl_T<T> *narrow_impl =
+        dynamic_cast <TAO::Any_Impl_T<T> *> (impl);
+
+      if (narrow_impl != 0)
+        {
+          _tao_elem = (T *) narrow_impl->value_;
+          return 1;
+        }
+
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
+
+      if (mb == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Impl_T<T> *replacement = 0;
+      ACE_NEW_RETURN (replacement,
+                      TAO::Any_Impl_T<T> (destructor,
+                                          any_tc,
+                                          0),
+                      0);
+                      
+      auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement);
+
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
+
+      CORBA::TCKind kind = any_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      impl->assign_translator (kind,
+                               &cdr);
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
+
+      if (result == 1)
+        {
+          _tao_elem = ACE_const_cast (T *, replacement->value_);
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return result;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+template<typename T> void
+TAO::Any_Impl_T<T>::free_value (void)
+{
+  if (this->value_destructor_ != 0)
+    {
+      (*this->value_destructor_) (this->value_);
+      this->value_destructor_ = 0;
+    }
+
+  this->value_ = 0;
+}
+
+// =======================================================================
+
+template<typename T, typename T_forany>
+TAO::Any_Array_Impl_T<T, T_forany>::Any_Array_Impl_T (
+    _tao_destructor destructor,
+    CORBA::TypeCode_ptr tc,
+    T * const val
+  )
+  : Any_Impl (destructor,
+              tc),
+    value_ (val)
+{
+}
+
+template<typename T, typename T_forany>
+TAO::Any_Array_Impl_T<T, T_forany>::~Any_Array_Impl_T (void)
+{
+}
+
+template<typename T, typename T_forany> void
+TAO::Any_Array_Impl_T<T, T_forany>::insert (CORBA::Any & any,
+                                            _tao_destructor destructor,
+                                            CORBA::TypeCode_ptr tc,
+                                            T * const value)
+{
+  TAO::Any_Array_Impl_T<T, T_forany> *new_impl = 0;
+  typedef TAO::Any_Array_Impl_T<T, T_forany> ARRAY_ANY_IMPL;
+  ACE_NEW (new_impl,
+           ARRAY_ANY_IMPL (destructor,
+                           tc,
+                           value));
+  any.replace (new_impl);
+}
+
+template<typename T, typename T_forany> CORBA::Boolean
+TAO::Any_Array_Impl_T<T, T_forany>::extract (const CORBA::Any & any,
+                                             _tao_destructor destructor,
+                                             CORBA::TypeCode_ptr tc,
+                                             const T *& _tao_elem)
+{
+  _tao_elem = 0;
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (_tao_equiv == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Impl *impl = any.impl ();
+
+      TAO::Any_Array_Impl_T<T, T_forany> *narrow_impl =
+        dynamic_cast <TAO::Any_Array_Impl_T<T, T_forany> *> (impl);
+
+      if (narrow_impl != 0)
+        {
+          _tao_elem = ACE_const_cast (const T *&, 
+                                      narrow_impl->value_);
+          return 1;
+        }
+
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
+
+      if (mb == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Array_Impl_T<T, T_forany> *replacement = 0;
+      typedef TAO::Any_Array_Impl_T<T, T_forany> ARRAY_ANY_IMPL;
+      ACE_NEW_RETURN (replacement,
+                      ARRAY_ANY_IMPL (destructor,
+                                      any_tc,
+                                      0),
+                      0);
+                      
+      auto_ptr<TAO::Any_Array_Impl_T<T, T_forany> > replacement_safety (
+          replacement
+        );
+
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
+
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
+
+      if (result == 1)
+        {
+          _tao_elem = ACE_const_cast (const T *&, 
+                                      replacement->value_);
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return result;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+template<typename T, typename T_forany> void
+TAO::Any_Array_Impl_T<T, T_forany>::free_value (void)
+{
+  if (this->value_destructor_ != 0)
+    {
+      (*this->value_destructor_) (this->value_);
+      this->value_destructor_ = 0;
+    }
+
+  this->value_ = 0;
+}
+
+// =======================================================================
+
+template<typename T, typename from_T, typename to_T>
+TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T (
+    _tao_destructor destructor,
+    CORBA::TypeCode_ptr tc,
+    T * const val,
+    CORBA::ULong bound
+  )
+  : Any_Impl (destructor,
+              tc),
+    value_ (val),
+    bound_ (bound)
+{
+}
+
+template<typename T, typename from_T, typename to_T>
+TAO::Any_Special_Impl_T<T, from_T, to_T>::~Any_Special_Impl_T (void)
+{
+}
+
+template<typename T, typename from_T, typename to_T>
+void
+TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any,
+                                                  _tao_destructor destructor,
+                                                  CORBA::TCKind kind,
+                                                  T * const value,
+                                                  CORBA::ULong bound)
+{
+  CORBA::TypeCode_ptr tc = kind == CORBA::tk_string 
+                           ? CORBA::TypeCode::_duplicate (CORBA::_tc_string)
+                           : CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
+
+  if (bound > 0)
+    {
+      static CORBA::Long _oc_buffer [] =
+        {
+          TAO_ENCAP_BYTE_ORDER,
+          ACE_static_cast (CORBA::Long, bound)
+        };
+
+      ACE_NEW (tc,
+               CORBA::TypeCode (kind,
+                                sizeof _oc_buffer,
+                                (char *) &_oc_buffer,
+                                1,
+                                0));
+    }
+
+  Any_Special_Impl_T<T, from_T, to_T> *new_impl = 0;
+  ACE_NEW (new_impl,
+           Any_Special_Impl_T (destructor,
+                               tc,
+                               value,
+                               bound));
+  any.replace (new_impl);
+}
+
+template<typename T, typename from_T, typename to_T>
+CORBA::Boolean
+TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
+                                                   _tao_destructor destructor,
+                                                   CORBA::TCKind kind,
+                                                   CORBA::ULong bound,
+                                                   const T *& _tao_elem)
+{
+  CORBA::TypeCode_ptr any_type = any._tao_get_typecode ();
+  _tao_elem = 0;
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TCKind any_kind = any_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (any_kind != kind)
+        {
+          return 0;
+        }
+
+      CORBA::ULong any_bound = 
+        any_type->length (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (any_bound != bound)
+        {
+          return 0;
+        }
+
+      TAO::Any_Impl *impl = any.impl ();
+
+      typedef TAO::Any_Special_Impl_T<T, from_T, to_T> 
+        BOUNDED_TSTRING_ANY_IMPL;
+
+      TAO::Any_Special_Impl_T<T, from_T, to_T> *narrow_impl =
+        dynamic_cast <BOUNDED_TSTRING_ANY_IMPL *> (impl);
+
+      if (narrow_impl != 0)
+        {
+          _tao_elem = narrow_impl->value_;
+          return 1;
+        }
+
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
+
+      if (mb == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Special_Impl_T<T, from_T, to_T> *replacement = 0;
+      ACE_NEW_RETURN (replacement,
+                      BOUNDED_TSTRING_ANY_IMPL (destructor,
+                                                any_type,
+                                                0,
+                                                bound),
+                      0);
+                      
+      auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (
+          replacement
+        );
+
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
+
+      impl->assign_translator (kind,
+                               &cdr);
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
+
+      if (result == 1)
+        {
+          _tao_elem = replacement->value_;
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return 1;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+template<typename T, typename from_T, typename to_T>
+void
+TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value (void)
+{
+  if (this->value_destructor_ != 0)
+    {
+      (*this->value_destructor_) (this->value_);
+      this->value_destructor_ = 0;
+    }
+
+  CORBA::release (this->type_);
+  this->type_ = CORBA::TypeCode::_nil ();
+  this->value_ = 0;
+}
+
+// =======================================================================
+
+template<typename T>
+TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc,
+                                            const T & val)
+  : Any_Impl (0,
+              tc),
+    value_ (val)
+{
+}
+
+template<typename T>
+TAO::Any_Basic_Impl_T<T>::~Any_Basic_Impl_T (void)
+{
+}
+
+template<typename T> void
+TAO::Any_Basic_Impl_T<T>::insert (CORBA::Any & any,
+                                  CORBA::TypeCode_ptr tc,
+                                  const T & value)
+{
+  Any_Basic_Impl_T<T> *new_impl = 0;
+  ACE_NEW (new_impl,
+           Any_Basic_Impl_T (tc,
+                             value));
+  any.replace (new_impl);
+}
+
+template<typename T> CORBA::Boolean
+TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
+                                   CORBA::TypeCode_ptr tc,
+                                   T & _tao_elem)
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (_tao_equiv == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Impl *impl = any.impl ();
+
+      TAO::Any_Basic_Impl_T<T> *narrow_impl =
+        dynamic_cast <TAO::Any_Basic_Impl_T<T> *> (impl);
+
+      if (narrow_impl != 0)
+        {
+          _tao_elem = narrow_impl->value_;
+          return 1;
+        }
+
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
+
+      if (mb == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Basic_Impl_T<T> *replacement = 
+        TAO::Any_Basic_Impl_T<T>::create_empty (any_tc);
+                      
+      auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement);
+
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
+
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
+
+      if (result == 1)
+        {
+          _tao_elem = replacement->value_;
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return result;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+template<typename T> TAO::Any_Basic_Impl_T<T> *
+TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc)
+{
+  TAO::Any_Basic_Impl_T<T> * retval = 0;
+  ACE_NEW_RETURN (retval,
+                  TAO::Any_Basic_Impl_T<T> (tc,
+                                            ACE_static_cast (T, 0)),
+                  0);
+  return retval;
+}
+
+// =======================================================================
+
+template<typename T, typename from_T, typename to_T>
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::Any_Special_Basic_Impl_T (
+    CORBA::TypeCode_ptr tc,
+    const T & val
+  )
+  : Any_Impl (0,
+              tc),
+    value_ (val)
+{
+}
+
+template<typename T, typename from_T, typename to_T>
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::~Any_Special_Basic_Impl_T (
+    void
+  )
+{
+}
+
+template<typename T, typename from_T, typename to_T> void
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::insert (
+    CORBA::Any & any,
+    CORBA::TypeCode_ptr tc,
+    const T & value
+  )
+{
+  Any_Special_Basic_Impl_T<T, from_T, to_T> *new_impl = 0;
+  ACE_NEW (new_impl,
+           Any_Special_Basic_Impl_T (tc,
+                                     value));
+  any.replace (new_impl);
+}
+
+template<typename T, typename from_T, typename to_T> CORBA::Boolean
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::extract (
+    const CORBA::Any & any,
+    CORBA::TypeCode_ptr tc,
+    T & _tao_elem
+  )
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
+
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (_tao_equiv == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Impl *impl = any.impl ();
+
+      typedef TAO::Any_Special_Basic_Impl_T<T, from_T, to_T> 
+        UNSIGNED_CHAR_ANY_IMPL;
+
+      TAO::Any_Special_Basic_Impl_T<T, from_T, to_T> *narrow_impl =
+        dynamic_cast <UNSIGNED_CHAR_ANY_IMPL *> (impl);
+
+      if (narrow_impl != 0)
+        {
+          _tao_elem = narrow_impl->value_;
+          return 1;
+        }
+
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
+
+      if (mb == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Special_Basic_Impl_T<T, from_T, to_T> *replacement = 0;
+      ACE_NEW_RETURN (replacement,
+                      UNSIGNED_CHAR_ANY_IMPL (any_tc,
+                                              0),
+                      0);
+                      
+      auto_ptr<UNSIGNED_CHAR_ANY_IMPL> replacement_safety (replacement);
+
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
+
+      CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      impl->assign_translator (kind,
+                               &cdr);
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
+
+      if (result == 1)
+        {
+          _tao_elem = replacement->value_;
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return result;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+// =======================================================================
+
+template<typename T>
+TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
+                                          CORBA::TypeCode_ptr tc,
+                                          T * const val)
+  : Any_Impl (destructor,
+              tc),
+    value_ (val)
+{
+}
+
+template<typename T>
+TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
+                                          CORBA::TypeCode_ptr tc,
+                                          const T & val)
+  : Any_Impl (0,
+              tc)
+{
+  ACE_NEW (this->value_,
+           T (val));
+}
+
+template<typename T>
+TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (CORBA::TypeCode_ptr tc)
+  : Any_Impl (0,
+              tc)
+{
+}
+
+template<typename T>
+TAO::Any_Dual_Impl_T<T>::~Any_Dual_Impl_T (void)
+{
+}
+
+template<typename T>
+void
+TAO::Any_Dual_Impl_T<T>::insert (CORBA::Any & any,
+                                 _tao_destructor destructor,
+                                 CORBA::TypeCode_ptr tc,
+                                 T * const value)
+{
+  Any_Dual_Impl_T<T> *new_impl = 0;
+  ACE_NEW (new_impl,
+           Any_Dual_Impl_T (destructor,
+                            tc,
+                            value));
+  any.replace (new_impl);
+}
+
+template<typename T>
+void
+TAO::Any_Dual_Impl_T<T>::insert_copy (CORBA::Any & any,
+                                      _tao_destructor destructor,
+                                      CORBA::TypeCode_ptr tc,
+                                      const T & value)
+{
+  Any_Dual_Impl_T<T> *new_impl = 0;
+  ACE_NEW (new_impl,
+           Any_Dual_Impl_T (destructor,
+                            tc,
+                            value));
+  any.replace (new_impl);
+}
+
+template<typename T>
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
+                                  _tao_destructor destructor,
+                                  CORBA::TypeCode_ptr tc,
+                                  const T *& _tao_elem)
+{
+  _tao_elem = 0;
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (_tao_equiv == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Impl *impl = any.impl ();
+
+      TAO::Any_Dual_Impl_T<T> *narrow_impl =
+        dynamic_cast <TAO::Any_Dual_Impl_T<T> *> (impl);
+
+      if (narrow_impl != 0)
+        {
+          _tao_elem = narrow_impl->value_;
+          return 1;
+        }
+
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
+
+      if (mb == 0)
+        {
+          return 0;
+        }
+
+      T *empty_value = 0;
+      ACE_NEW_RETURN (empty_value,
+                      T,
+                      0);
+      TAO::Any_Dual_Impl_T<T> *replacement = 0;
+      ACE_NEW_RETURN (replacement,
+                      TAO::Any_Dual_Impl_T<T> (destructor,
+                                               any_tc,
+                                               empty_value),
+                      0);
+                      
+      auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement);
+
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
+
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
+
+      if (result == 1)
+        {
+          _tao_elem = replacement->value_;
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return result;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+template<typename T> void
+TAO::Any_Dual_Impl_T<T>::free_value (void)
+{
+  if (this->value_destructor_ != 0)
+    {
+      (*this->value_destructor_) (this->value_);
+      this->value_destructor_ = 0;
+    }
+
+  this->value_ = 0;
+}
+
+#endif /* TAO_ANY_T_C */
+
diff --git a/TAO/tao/Any_T.h b/TAO/tao/Any_T.h
new file mode 100644
index 00000000000..ecbacd57dfc
--- /dev/null
+++ b/TAO/tao/Any_T.h
@@ -0,0 +1,287 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Any_T.h
+ *
+ *  $Id$
+ *
+ *  @author  Carlos O'Ryan and Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_ANY_T_H
+#define TAO_ANY_T_H
+
+#include "ace/pre.h"
+
+#include "tao/Any.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/AbstractBase.h"
+
+namespace TAO
+{
+  /**
+   * @class Any_Impl_T
+   *
+   * @brief Template Any class for pointer types.
+   *
+   * Used for interfaces and typecodes
+   */
+  template<typename T> 
+  class Any_Impl_T : public Any_Impl
+  {
+  public:
+    Any_Impl_T (_tao_destructor destructor,
+                CORBA::TypeCode_ptr,
+                T * const);
+    virtual ~Any_Impl_T (void);
+
+    static void insert (CORBA::Any &, 
+                        _tao_destructor destructor,
+                        CORBA::TypeCode_ptr,
+                        T * const);
+    static CORBA::Boolean extract (const CORBA::Any &,
+                                   _tao_destructor,
+                                   CORBA::TypeCode_ptr,
+                                   T *&);
+
+    virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
+    virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
+    virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
+
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
+
+    virtual const void *value (void) const;
+    virtual void free_value (void);
+
+  private:
+    T * value_;
+  };
+
+  /**
+   * @class Any_Array_Impl_T
+   *
+   * @brief Template Any class for array types.
+   *
+   * Used for arrays
+   */
+  template<typename T, typename T_forany> 
+  class Any_Array_Impl_T : public Any_Impl
+  {
+  public:
+    Any_Array_Impl_T (_tao_destructor destructor,
+                      CORBA::TypeCode_ptr,
+                      T * const);
+    virtual ~Any_Array_Impl_T (void);
+
+    static void insert (CORBA::Any &, 
+                        _tao_destructor destructor,
+                        CORBA::TypeCode_ptr,
+                        T * const);
+    static CORBA::Boolean extract (const CORBA::Any &,
+                                   _tao_destructor,
+                                   CORBA::TypeCode_ptr,
+                                   const T *&);
+
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
+
+    virtual const void *value (void) const;
+    virtual void free_value (void);
+
+  private:
+    T * value_;
+  };
+
+  /**
+   * @class Any_Basic_Impl_T
+   *
+   * @brief Template Any class for basic types.
+   *
+   * Used for all basic IDL types except bounded (w)strings.
+   */
+  template<typename T> 
+  class Any_Basic_Impl_T : public Any_Impl
+  {
+  public:
+    Any_Basic_Impl_T (CORBA::TypeCode_ptr,
+                      const T & val);
+    virtual ~Any_Basic_Impl_T (void);
+
+    static void insert (CORBA::Any &,
+                        CORBA::TypeCode_ptr,
+                        const T &);
+    static CORBA::Boolean extract (const CORBA::Any &, 
+                                   CORBA::TypeCode_ptr,
+                                   T &);
+
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
+
+    virtual const void *value (void) const;
+    static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr);
+
+  private:
+    T value_;
+  };
+
+  /**
+   * @class Any_Special_Impl_T
+   *
+   * @brief Template Any class for bounded IDL (w)strings.
+   */
+  template<typename T, typename from_T, typename to_T>
+  class Any_Special_Impl_T : public Any_Impl
+  {
+  public:
+    Any_Special_Impl_T (_tao_destructor destructor,
+                        CORBA::TypeCode_ptr,
+                        T * const,
+                        CORBA::ULong);
+    virtual ~Any_Special_Impl_T (void);
+
+    static void insert (CORBA::Any &,
+                        _tao_destructor destructor,
+                        CORBA::TCKind,
+                        T * const,
+                        CORBA::ULong);
+    static CORBA::Boolean extract (const CORBA::Any &,
+                                   _tao_destructor,
+                                   CORBA::TCKind,
+                                   CORBA::ULong,
+                                   const T *&);
+
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
+
+    virtual const void *value (void) const;
+    virtual void free_value (void);
+
+  private:
+    T * value_;
+    CORBA::ULong bound_;
+  };
+
+  /**
+   * @class Any_Special_Basic_Impl_T
+   *
+   * @brief Template Any class for special basic types.
+   *
+   * Used for the basic IDL types that usually map to unsigned char
+   * or unsigned short - boolean, char, wchar and octet.
+   */
+  template<typename T, typename from_T, typename to_T>
+  class Any_Special_Basic_Impl_T : public Any_Impl
+  {
+  public:
+    Any_Special_Basic_Impl_T (CORBA::TypeCode_ptr,
+                              const T & val);
+    virtual ~Any_Special_Basic_Impl_T (void);
+
+    static void insert (CORBA::Any &,
+                        CORBA::TypeCode_ptr,
+                        const T &);
+    static CORBA::Boolean extract (const CORBA::Any &, 
+                                   CORBA::TypeCode_ptr,
+                                   T &);
+
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
+
+    virtual const void *value (void) const;
+
+  private:
+    T value_;
+  };
+
+  /**
+   * @class Any_Dual_Impl_T
+   *
+   * @brief Template Any class for IDL types with 2 modes of insertion
+   *
+   * Used for the IDL types that have copying and non-copying insertion,
+   * but which are not (de)marshaled as pointers - struct, union, sequence,
+   * and exception.
+   */
+  template<typename T>
+  class Any_Dual_Impl_T : public Any_Impl
+  {
+  public:
+    Any_Dual_Impl_T (_tao_destructor destructor,
+                     CORBA::TypeCode_ptr,
+                     T * const);
+    Any_Dual_Impl_T (_tao_destructor destructor,
+                     CORBA::TypeCode_ptr,
+                     const T &);
+    Any_Dual_Impl_T (CORBA::TypeCode_ptr);
+    virtual ~Any_Dual_Impl_T (void);
+
+    static void insert (CORBA::Any &,
+                        _tao_destructor,
+                        CORBA::TypeCode_ptr,
+                        T * const);
+    static void insert_copy (CORBA::Any &, 
+                             _tao_destructor destructor,
+                             CORBA::TypeCode_ptr,
+                             const T &);
+    static CORBA::Boolean extract (const CORBA::Any &,
+                                   _tao_destructor,
+                                   CORBA::TypeCode_ptr,
+                                   const T *&);
+
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
+
+    virtual const void *value (void) const;
+    virtual void free_value (void);
+
+  protected:
+    T * value_;
+  };
+
+  class Any_Any_Impl : public Any_Dual_Impl_T<CORBA::Any>
+  {
+  public:
+    Any_Any_Impl (void);
+    Any_Any_Impl (const CORBA::Any &);
+    ~Any_Any_Impl (void);
+
+    static void insert_copy (CORBA::Any &,
+                             const CORBA::Any &);
+    static CORBA::Boolean extract_ref (const CORBA::Any &,
+                                       CORBA::Any &);
+    virtual void free_value (void);
+
+  private:
+    CORBA::Any any_holder_;
+  };
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/Any_T.inl"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Any_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Any_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_ANY_T_H */
+
diff --git a/TAO/tao/Any_T.inl b/TAO/tao/Any_T.inl
new file mode 100644
index 00000000000..b3bcb4eea39
--- /dev/null
+++ b/TAO/tao/Any_T.inl
@@ -0,0 +1,146 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
+
+// These three are overridden in generated code where appropriate.
+
+template<typename T> ACE_INLINE CORBA::Boolean
+TAO::Any_Impl_T<T>::to_object (CORBA::Object_ptr &) const
+{
+  return 0;
+}
+
+template<typename T> ACE_INLINE CORBA::Boolean
+TAO::Any_Impl_T<T>::to_value (CORBA::ValueBase *&) const
+{
+  return 0;
+}
+
+template<typename T> ACE_INLINE CORBA::Boolean
+TAO::Any_Impl_T<T>::to_abstract_base (CORBA::AbstractBase_ptr &) const
+{
+  return 0;
+}
+
+template<typename T> ACE_INLINE CORBA::Boolean
+TAO::Any_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
+{
+  return (cdr << this->value_);
+}
+
+template<typename T> ACE_INLINE CORBA::Boolean
+TAO::Any_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
+{
+  return (cdr >> this->value_);
+}
+
+template<typename T> ACE_INLINE const void *
+TAO::Any_Impl_T<T>::value (void) const
+{
+  return this->value_;
+}
+
+// ***********************************************************************
+
+template<typename T, typename T_forany> ACE_INLINE CORBA::Boolean
+TAO::Any_Array_Impl_T<T, T_forany>::marshal_value (TAO_OutputCDR &cdr)
+{
+  return (cdr << T_forany (this->value_));
+}
+
+template<typename T, typename T_forany> ACE_INLINE CORBA::Boolean
+TAO::Any_Array_Impl_T<T, T_forany>::demarshal_value (TAO_InputCDR &cdr)
+{
+  T_forany tmp (this->value_);
+  return (cdr >> tmp);
+}
+
+template<typename T, typename T_forany> ACE_INLINE const void *
+TAO::Any_Array_Impl_T<T, T_forany>::value (void) const
+{
+  return this->value_;
+}
+
+// ***********************************************************************
+
+template<typename T, typename from_T, typename to_T> ACE_INLINE CORBA::Boolean
+TAO::Any_Special_Impl_T<T, from_T, to_T>::marshal_value (TAO_OutputCDR &cdr)
+{
+  return (cdr << from_T (this->value_, this->bound_));
+}
+
+template<typename T, typename from_T, typename to_T> ACE_INLINE CORBA::Boolean
+TAO::Any_Special_Impl_T<T, from_T, to_T>::demarshal_value (TAO_InputCDR &cdr)
+{
+  return (cdr >> to_T (this->value_, this->bound_));
+}
+
+template<typename T, typename from_T, typename to_T> ACE_INLINE const void *
+TAO::Any_Special_Impl_T<T, from_T, to_T>::value (void) const
+{
+  return this->value_;
+}
+
+// ***********************************************************************
+
+template<typename T> ACE_INLINE CORBA::Boolean
+TAO::Any_Basic_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
+{
+  return (cdr << this->value_);
+}
+
+template<typename T> ACE_INLINE CORBA::Boolean
+TAO::Any_Basic_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
+{
+  return (cdr >> this->value_);
+}
+
+template<typename T> ACE_INLINE const void *
+TAO::Any_Basic_Impl_T<T>::value (void) const
+{
+  return &this->value_;
+}
+
+// ***********************************************************************
+
+template<typename T, typename from_T, typename to_T> ACE_INLINE CORBA::Boolean
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::marshal_value (
+    TAO_OutputCDR &cdr
+  )
+{
+  return (cdr << from_T (this->value_));
+}
+
+template<typename T, typename from_T, typename to_T> ACE_INLINE CORBA::Boolean
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::demarshal_value (
+    TAO_InputCDR &cdr
+  )
+{
+  return (cdr >> to_T (this->value_));
+}
+
+template<typename T, typename from_T, typename to_T> ACE_INLINE const void *
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::value (void) const
+{
+  return &this->value_;
+}
+
+// ***********************************************************************
+
+template<typename T> ACE_INLINE CORBA::Boolean
+TAO::Any_Dual_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
+{
+  return (cdr << *this->value_);
+}
+
+template<typename T> ACE_INLINE CORBA::Boolean
+TAO::Any_Dual_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
+{
+  return (cdr >> *this->value_);
+}
+
+template<typename T> ACE_INLINE const void *
+TAO::Any_Dual_Impl_T<T>::value (void) const
+{
+  return this->value_;
+}
+
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
index ae2742d05df..2d8b3b01aa3 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
@@ -5,9 +5,9 @@
 //   BiDirPolicy*.* The command used to generate code
 //   is:
 //
-//     tao_idl \
-//          -Wb,export_macro=TAO_Export \
-//          -Wb,export_include="tao/TAO_Export.h" \
+//     tao_idl -o orig -Ge 1 -Sa -St \
+//          -Wb,export_macro=TAO_BiDirGIOP_Export \
+//          -Wb,export_include="bidirgiop_export.h" \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
 //          BiDirPolicy.pidl
@@ -19,7 +19,7 @@
 
 #pragma prefix "omg.org"
 
-#include "tao/Policy.pidl"
+#include <Policy.pidl>
 
 // Self contained module for Bi-directional GIOP policy
 module BiDirPolicy
@@ -37,8 +37,4 @@ module BiDirPolicy
   };
 };
 
-
-
-#pragma prefix ""
-
 #endif  /* TAO_BIDIR_POLICY_PIDL*/
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
index 027209d88b8..72a6e214dfa 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
@@ -19,6 +19,10 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
 #include "BiDirGIOP.h"
 #include "tao/Typecode.h"
 
@@ -30,31 +34,36 @@
 #include "BiDirPolicyC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_BiDirPolicy_BidirectionalPolicyValue[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x42694469),
-  ACE_NTOHL (0x72506f6c),
-  ACE_NTOHL (0x6963792f),
-  ACE_NTOHL (0x42696469),
-  ACE_NTOHL (0x72656374),
-  ACE_NTOHL (0x696f6e61),
-  ACE_NTOHL (0x6c506f6c),
-  ACE_NTOHL (0x69637956),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:BiDirPolicy/BidirectionalPolicyValue:1.0
-  25,
-  ACE_NTOHL (0x42696469),
-  ACE_NTOHL (0x72656374),
-  ACE_NTOHL (0x696f6e61),
-  ACE_NTOHL (0x6c506f6c),
-  ACE_NTOHL (0x69637956),
-  ACE_NTOHL (0x616c7565),
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  53,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x42694469), 
+  ACE_NTOHL (0x72506f6c), 
+  ACE_NTOHL (0x6963792f), 
+  ACE_NTOHL (0x42696469), 
+  ACE_NTOHL (0x72656374), 
+  ACE_NTOHL (0x696f6e61), 
+  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/BiDirPolicy/BidirectionalPolicyValue:1.0
+    25,
+  ACE_NTOHL (0x42696469), 
+  ACE_NTOHL (0x72656374), 
+  ACE_NTOHL (0x696f6e61), 
+  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
   ACE_NTOHL (0x0),  // name = BidirectionalPolicyValue
-  CORBA::tk_ushort,
+    CORBA::tk_ushort,
 
 };
 
@@ -68,29 +77,78 @@ static CORBA::TypeCode _tc_TAO_tc_BiDirPolicy_BidirectionalPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (BiDirPolicy)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BidirectionalPolicyValue, &_tc_TAO_tc_BiDirPolicy_BidirectionalPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_BidirectionalPolicyValue,
+    &_tc_TAO_tc_BiDirPolicy_BidirectionalPolicyValue
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (BiDirPolicy)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, NORMAL, 0U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (BiDirPolicy)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, BOTH, 1U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (BiDirPolicy)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, BIDIRECTIONAL_POLICY_TYPE, 37U)
-TAO_NAMESPACE_END
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int BiDirPolicy::BidirectionalPolicy::_tao_class_id = 0;
 
+BiDirPolicy::BidirectionalPolicy_ptr
+tao_BiDirPolicy_BidirectionalPolicy_duplicate (
+    BiDirPolicy::BidirectionalPolicy_ptr p
+  )
+{
+  return BiDirPolicy::BidirectionalPolicy::_duplicate (p);
+}
+
+void
+tao_BiDirPolicy_BidirectionalPolicy_release (
+    BiDirPolicy::BidirectionalPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+BiDirPolicy::BidirectionalPolicy_ptr
+tao_BiDirPolicy_BidirectionalPolicy_nil (
+    void
+  )
+{
+  return BiDirPolicy::BidirectionalPolicy::_nil ();
+}
+
+BiDirPolicy::BidirectionalPolicy_ptr
+tao_BiDirPolicy_BidirectionalPolicy_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return BiDirPolicy::BidirectionalPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+tao_BiDirPolicy_BidirectionalPolicy_upcast (
+    void *src
+  )
+{
+  BiDirPolicy::BidirectionalPolicy **tmp =
+    ACE_static_cast (BiDirPolicy::BidirectionalPolicy **, src);
+  return *tmp;
+}
+
+CORBA::Boolean
+tao_BiDirPolicy_BidirectionalPolicy_marshal (
+    BiDirPolicy::BidirectionalPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
-// Operations for class BiDirPolicy::BidirectionalPolicy_var
+// BiDirPolicy::BidirectionalPolicy_var
 // *************************************************************
 
-BiDirPolicy::BidirectionalPolicy_var::BidirectionalPolicy_var (void) // default constructor
+BiDirPolicy::BidirectionalPolicy_var::BidirectionalPolicy_var (void)
   : ptr_ (BidirectionalPolicy::_nil ())
 {}
 
@@ -100,12 +158,12 @@ BiDirPolicy::BidirectionalPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-BiDirPolicy::BidirectionalPolicy_var::BidirectionalPolicy_var (const ::BiDirPolicy::BidirectionalPolicy_var &p) // copy constructor
+BiDirPolicy::BidirectionalPolicy_var::BidirectionalPolicy_var (const ::BiDirPolicy::BidirectionalPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (BidirectionalPolicy::_duplicate (p.ptr ()))
 {}
 
-BiDirPolicy::BidirectionalPolicy_var::~BidirectionalPolicy_var (void) // destructor
+BiDirPolicy::BidirectionalPolicy_var::~BidirectionalPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -134,7 +192,7 @@ BiDirPolicy::BidirectionalPolicy_var::operator const ::BiDirPolicy::Bidirectiona
   return this->ptr_;
 }
 
-BiDirPolicy::BidirectionalPolicy_var::operator ::BiDirPolicy::BidirectionalPolicy_ptr &() // cast
+BiDirPolicy::BidirectionalPolicy_var::operator ::BiDirPolicy::BidirectionalPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -209,8 +267,11 @@ BiDirPolicy::BidirectionalPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
-// Inline operations for class BiDirPolicy::BidirectionalPolicy_out
+// BiDirPolicy::BidirectionalPolicy_out
 // *************************************************************
 
 BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (BidirectionalPolicy_ptr &p)
@@ -219,14 +280,14 @@ BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (BidirectionalPoli
   this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
 }
 
-BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (BidirectionalPolicy_var &p) // constructor from _var
+BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (BidirectionalPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
 }
 
-BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (const ::BiDirPolicy::BidirectionalPolicy_out &p) // copy constructor
+BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (const ::BiDirPolicy::BidirectionalPolicy_out &p)
   : ptr_ (ACE_const_cast (BidirectionalPolicy_out &, p).ptr_)
 {}
 
@@ -257,7 +318,7 @@ BiDirPolicy::BidirectionalPolicy_out::operator ::BiDirPolicy::BidirectionalPolic
 }
 
 ::BiDirPolicy::BidirectionalPolicy_ptr &
-BiDirPolicy::BidirectionalPolicy_out::ptr (void) // ptr
+BiDirPolicy::BidirectionalPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -268,17 +329,17 @@ BiDirPolicy::BidirectionalPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
-// default constructor
-BiDirPolicy::BidirectionalPolicy::BidirectionalPolicy ()
-{
-  }
+BiDirPolicy::BidirectionalPolicy::BidirectionalPolicy (void)
+{}
 
-// destructor
 BiDirPolicy::BidirectionalPolicy::~BidirectionalPolicy (void)
 {}
 
-BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy::_narrow (
+BiDirPolicy::BidirectionalPolicy_ptr
+BiDirPolicy::BidirectionalPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -286,73 +347,87 @@ BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy::_narrow (
   return BidirectionalPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy::_unchecked_narrow (
+BiDirPolicy::BidirectionalPolicy_ptr 
+BiDirPolicy::BidirectionalPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return BidirectionalPolicy::_nil ();
+    {
+      return BidirectionalPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           BidirectionalPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &BidirectionalPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &BidirectionalPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 BiDirPolicy::BidirectionalPolicy_ptr
 BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *BiDirPolicy::BidirectionalPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::BiDirPolicy, BidirectionalPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::BiDirPolicy, BidirectionalPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* BiDirPolicy::BidirectionalPolicy::_interface_repository_id (void) const
 {
-  return "IDL:BiDirPolicy/BidirectionalPolicy:1.0";
+  return "IDL:omg.org/BiDirPolicy/BidirectionalPolicy:1.0";
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<BiDirPolicy::BidirectionalPolicy,BiDirPolicy::BidirectionalPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<BiDirPolicy::BidirectionalPolicy,BiDirPolicy::BidirectionalPolicy_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
index 09a3f992801..a7dfa71ee9c 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_BIDIRPOLICYC_H_
 #define _TAO_IDL_ORIG_BIDIRPOLICYC_H_
 
@@ -58,60 +61,87 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  BiDirPolicy
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::UShort BidirectionalPolicyValue;
   typedef CORBA::UShort_out BidirectionalPolicyValue_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BidirectionalPolicyValue;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort NORMAL;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BOTH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong BIDIRECTIONAL_POLICY_TYPE;
-
+  
+  // 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_BidirectionalPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::UShort NORMAL = 0U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::UShort BOTH = 1U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong BIDIRECTIONAL_POLICY_TYPE = 37U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___PTR_CH_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY___PTR_CH_
-
+  
   class BidirectionalPolicy;
   typedef BidirectionalPolicy *BidirectionalPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___VAR_CH_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_BiDirGIOP_Export BidirectionalPolicy_var : public TAO_Base_var
   {
   public:
     BidirectionalPolicy_var (void); // default constructor
-    BidirectionalPolicy_var (BidirectionalPolicy_ptr p) : ptr_ (p) {}
+    BidirectionalPolicy_var (BidirectionalPolicy_ptr p) : ptr_ (p) {} 
     BidirectionalPolicy_var (const BidirectionalPolicy_var &); // copy constructor
     ~BidirectionalPolicy_var (void); // destructor
-
+    
     BidirectionalPolicy_var &operator= (BidirectionalPolicy_ptr);
     BidirectionalPolicy_var &operator= (const BidirectionalPolicy_var &);
     BidirectionalPolicy_ptr operator-> (void) const;
-
+    
     operator const BidirectionalPolicy_ptr &() const;
     operator BidirectionalPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     BidirectionalPolicy_ptr in (void) const;
     BidirectionalPolicy_ptr &inout (void);
     BidirectionalPolicy_ptr &out (void);
     BidirectionalPolicy_ptr _retn (void);
     BidirectionalPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static BidirectionalPolicy_ptr tao_duplicate (BidirectionalPolicy_ptr);
     static void tao_release (BidirectionalPolicy_ptr);
     static BidirectionalPolicy_ptr tao_nil (void);
-    static BidirectionalPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
+    static BidirectionalPolicy_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     BidirectionalPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -119,13 +149,14 @@ TAO_NAMESPACE  BiDirPolicy
     BidirectionalPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___OUT_CH_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_BiDirGIOP_Export BidirectionalPolicy_out
   {
   public:
@@ -138,76 +169,95 @@ TAO_NAMESPACE  BiDirPolicy
     operator BidirectionalPolicy_ptr &();
     BidirectionalPolicy_ptr &ptr (void);
     BidirectionalPolicy_ptr operator-> (void);
-
+  
   private:
     BidirectionalPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_
-
-class TAO_BiDirGIOP_Export BidirectionalPolicy: public virtual CORBA::Policy
+  
+  class TAO_BiDirGIOP_Export BidirectionalPolicy
+    : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef BidirectionalPolicy_ptr _ptr_type;
     typedef BidirectionalPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  static int _tao_class_id;
-
-    // the static operations
+    static int _tao_class_id;
+    
+    // The static operations.
     static BidirectionalPolicy_ptr _duplicate (BidirectionalPolicy_ptr obj);
+    
     static BidirectionalPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     static BidirectionalPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     static BidirectionalPolicy_ptr _nil (void)
       {
         return (BidirectionalPolicy_ptr)0;
       }
-
+    
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual BiDirPolicy::BidirectionalPolicyValue value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
-    BidirectionalPolicy ();
-
+    BidirectionalPolicy (void);
     virtual ~BidirectionalPolicy (void);
+    
   private:
     BidirectionalPolicy (const BidirectionalPolicy &);
     void operator= (const BidirectionalPolicy &);
   };
 
-
 #endif /* end #if !defined */
+  
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module BiDirPolicy
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "BiDirPolicyC.i"
@@ -223,3 +273,4 @@ TAO_NAMESPACE_CLOSE // module BiDirPolicy
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
index 16eb07b83f2..dd83689b345 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
@@ -20,52 +20,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___CI_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY___CI_
 
-ACE_INLINE BiDirPolicy::BidirectionalPolicy_ptr
-tao_BiDirPolicy_BidirectionalPolicy_duplicate (
-    BiDirPolicy::BidirectionalPolicy_ptr p
-  )
-{
-  return BiDirPolicy::BidirectionalPolicy::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_BiDirPolicy_BidirectionalPolicy_release (
-    BiDirPolicy::BidirectionalPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE BiDirPolicy::BidirectionalPolicy_ptr
-tao_BiDirPolicy_BidirectionalPolicy_nil (
-    void
-  )
+ACE_INLINE
+CORBA::Boolean
+BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &)
 {
-  return BiDirPolicy::BidirectionalPolicy::_nil ();
+  return 0;
 }
 
-ACE_INLINE BiDirPolicy::BidirectionalPolicy_ptr
-tao_BiDirPolicy_BidirectionalPolicy_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return BiDirPolicy::BidirectionalPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Object *
-tao_BiDirPolicy_BidirectionalPolicy_upcast (
-    void *src
-  )
-{
-  BiDirPolicy::BidirectionalPolicy **tmp =
-    ACE_static_cast (BiDirPolicy::BidirectionalPolicy **, src);
-  return *tmp;
-}
-
-
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/BiDir_GIOP/Makefile b/TAO/tao/BiDir_GIOP/Makefile
index 77f9b70283b..9b5e2e498ce 100644
--- a/TAO/tao/BiDir_GIOP/Makefile
+++ b/TAO/tao/BiDir_GIOP/Makefile
@@ -131,7 +131,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -160,7 +161,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -209,6 +211,16 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -217,6 +229,8 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -226,16 +240,22 @@ endif
   BiDir_ORBInitializer.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -249,18 +269,21 @@ endif
   $(TAO_ROOT)/tao/Policy_Validator.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -291,14 +314,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -385,7 +400,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -414,7 +430,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -463,6 +480,16 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -471,14 +498,14 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i BiDirPolicyC.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i
+  $(TAO_ROOT)/tao/PolicyC.i BiDirPolicyC.i
 
 .obj/BiDir_ORBInitializer.o .obj/BiDir_ORBInitializer.so .shobj/BiDir_ORBInitializer.o .shobj/BiDir_ORBInitializer.so: BiDir_ORBInitializer.cpp BiDir_ORBInitializer.h \
   $(ACE_ROOT)/ace/pre.h bidirgiop_export.h \
@@ -536,12 +563,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -554,13 +578,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -570,6 +594,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -588,34 +630,58 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -635,27 +701,8 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h BiDirPolicyC.h \
+  $(ACE_ROOT)/ace/Service_Object.i BiDirPolicyC.h \
   BiDirPolicyC.i
 
 .obj/BiDir_PolicyFactory.o .obj/BiDir_PolicyFactory.so .shobj/BiDir_PolicyFactory.o .shobj/BiDir_PolicyFactory.so: BiDir_PolicyFactory.cpp BiDir_PolicyFactory.h \
@@ -714,12 +761,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -732,13 +776,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -748,6 +792,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -766,34 +828,58 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -813,27 +899,8 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h BiDirPolicyC.h \
+  $(ACE_ROOT)/ace/Service_Object.i BiDirPolicyC.h \
   BiDirPolicyC.i BiDir_Policy_i.h BiDir_Policy_i.inl
 
 .obj/BiDir_Policy_i.o .obj/BiDir_Policy_i.so .shobj/BiDir_Policy_i.o .shobj/BiDir_Policy_i.so: BiDir_Policy_i.cpp BiDir_Policy_i.h \
@@ -898,7 +965,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -927,7 +995,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -976,6 +1045,16 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -984,6 +1063,8 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -996,10 +1077,14 @@ endif
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -1009,6 +1094,8 @@ endif
   $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -1026,16 +1113,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1059,14 +1149,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1148,12 +1230,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -1166,13 +1245,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1182,6 +1261,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1200,32 +1297,11 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i BiDir_Policy_i.h \
-  BiDirGIOP.h $(TAO_ROOT)/tao/BiDir_Adapter.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -1239,10 +1315,30 @@ endif
   $(ACE_ROOT)/ace/Timer_Queue_T.i \
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h BiDirPolicyC.h \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i BiDir_Policy_i.h \
+  BiDirGIOP.h $(TAO_ROOT)/tao/BiDir_Adapter.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i BiDirPolicyC.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -1255,16 +1351,22 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -1282,16 +1384,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1315,14 +1420,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
diff --git a/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.dsp b/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.dsp
index 050915682ce..2d9a4126c85 100644
--- a/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.dsp
+++ b/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.dsp
@@ -177,6 +177,7 @@ SOURCE=.\BiDirPolicy_Validator.cpp
 # Begin Source File

 

 SOURCE=.\BiDirPolicyC.cpp

+# ADD CPP /GR

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/tao/Bounds.pidl b/TAO/tao/Bounds.pidl
index 7c61ef01bef..c8ccda63db3 100644
--- a/TAO/tao/Bounds.pidl
+++ b/TAO/tao/Bounds.pidl
@@ -10,7 +10,7 @@
  * following command:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include=TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
@@ -43,6 +43,4 @@ module CORBA
   exception Bounds {};
 };
 
-#pragma prefix ""
-
 #endif /* TAO_CORBA_BOUNDS_PIDL */
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index 41a7bc5bc69..6df29ade66f 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "BoundsC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "BoundsC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,26 +44,29 @@
 #include "BoundsC.i"
 #endif /* !defined INLINE */
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 CORBA::Bounds::Bounds (void)
-  : CORBA::UserException ("IDL:omg.org/CORBA/Bounds:1.0",
-                          "Bounds")
+  : CORBA::UserException (
+        "IDL:omg.org/CORBA/Bounds:1.0",
+        "Bounds"
+      )
 {
 }
 
-// Destructor - all members are of self managing types.
 CORBA::Bounds::~Bounds (void)
 {
 }
 
-// Copy constructor.
 CORBA::Bounds::Bounds (const ::CORBA::Bounds &_tao_excp)
-  : CORBA::UserException (_tao_excp._rep_id (),
-                          _tao_excp._name ())
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
-// Assignment operator.
 CORBA::Bounds&
 CORBA::Bounds::operator= (const ::CORBA::Bounds &_tao_excp)
 {
@@ -73,11 +81,11 @@ void CORBA::Bounds::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA::Bounds *
-CORBA::Bounds::_downcast (CORBA::Exception *exc)
+CORBA::Bounds::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/Bounds:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/Bounds:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (Bounds *, exc);
+      return ACE_dynamic_cast (Bounds *, _tao_excp);
     }
   else
     {
@@ -98,13 +106,13 @@ CORBA::Bounds::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      CORBA::Bounds (*this),
+      ::CORBA::Bounds (*this),
       0
     );
   return result;
 }
 
-void CORBA::Bounds::_raise ()
+void CORBA::Bounds::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -118,7 +126,7 @@ void CORBA::Bounds::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -131,27 +139,36 @@ void CORBA::Bounds::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr CORBA::Bounds::_type (void) const
+{
+  return ::CORBA::_tc_Bounds;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_Bounds[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f426f),
-  ACE_NTOHL (0x756e6473),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f426f), 
+  ACE_NTOHL (0x756e6473), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Bounds:1.0
-  7,
-  ACE_NTOHL (0x426f756e),
+    7,
+  ACE_NTOHL (0x426f756e), 
   ACE_NTOHL (0x64730000),  // name = Bounds
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_Bounds (
     CORBA::tk_except,
@@ -163,102 +180,75 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Bounds (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Bounds, &_tc_TAO_tc_CORBA_Bounds)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Bounds,
+    &_tc_TAO_tc_CORBA_Bounds
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::Bounds::_type (void) const
-{
-  return ::CORBA::_tc_Bounds;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::Bounds &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::Bounds &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::Bounds>::insert_copy (
+      _tao_any,
+      CORBA::Bounds::_tao_any_destructor,
       CORBA::_tc_Bounds,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::Bounds *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Bounds *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::Bounds>::insert (
+      _tao_any,
+      CORBA::Bounds::_tao_any_destructor,
       CORBA::_tc_Bounds,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::Bounds::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Bounds *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Bounds *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::Bounds*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::Bounds *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Bounds *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::Bounds *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Bounds ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Bounds>::extract (
+        _tao_any,
+        CORBA::Bounds::_tao_any_destructor,
+        CORBA::_tc_Bounds,
+        _tao_elem
+      );
+}
 
-    if (!result)
-      return 0; // not equivalent
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::Bounds>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Bounds>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::Bounds *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      CORBA::Bounds *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::Bounds, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:omg.org/CORBA/Bounds:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_Bounds,
-            1,
-            tmp,
-            CORBA::Bounds::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h
index db2b97ea744..e45cf7a4e6f 100644
--- a/TAO/tao/BoundsC.h
+++ b/TAO/tao/BoundsC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_BOUNDSC_H_
 #define _TAO_IDL_ORIG_BOUNDSC_H_
 
@@ -56,9 +59,15 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  CORBA
 {
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_CORBA_BOUNDS_CH_)
 #define _CORBA_BOUNDS_CH_
   
@@ -71,9 +80,9 @@ TAO_NAMESPACE  CORBA
     ~Bounds (void);
 
     Bounds &operator= (const Bounds &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static Bounds *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -91,32 +100,51 @@ TAO_NAMESPACE  CORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Bounds;
   
+  // 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_Bounds;
+
 #endif /* end #if !defined */
-  
-  
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::Bounds &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::Bounds*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Bounds *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Bounds *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Bounds &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "BoundsC.i"
@@ -132,3 +160,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &);
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/BoundsC.i b/TAO/tao/BoundsC.i
index 0f43cefabd4..2e83c822e08 100644
--- a/TAO/tao/BoundsC.i
+++ b/TAO/tao/BoundsC.i
@@ -1,6 +1,7 @@
 // -*- 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
@@ -18,20 +19,33 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// *************************************************************
-// Inline operations for exception CORBA::Bounds
-// *************************************************************
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Bounds &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::Bounds &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,CORBA::Bounds&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::Bounds&
+  )
 {
   return 1;
 }
+
diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp
index d452631980a..163a92334b4 100644
--- a/TAO/tao/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CDR_Encaps_Codec.cpp
@@ -135,7 +135,8 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
         return safe_any._retn ();
     }
 
-  ACE_THROW_RETURN (IOP::Codec::FormatMismatch (), 0);
+  ACE_THROW_RETURN (IOP::Codec::FormatMismatch (), 
+                    0);
 }
 
 CORBA::OctetSeq *
@@ -145,7 +146,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
                    IOP::Codec::InvalidTypeForEncoding))
 {
   this->check_type_for_encoding (data
-                                  ACE_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // ----------------------------------------------------------------
@@ -181,10 +182,12 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
       ACE_NEW_THROW_EX (octet_seq,
                         CORBA::OctetSeq,
                         CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
+                            CORBA::SystemException::_tao_minor_code (
+                                TAO_DEFAULT_MINOR_CODE,
+                                ENOMEM
+                              ),
+                            CORBA::COMPLETED_NO
+                          ));
       ACE_CHECK_RETURN (0);
 
       CORBA::OctetSeq_var safe_octet_seq = octet_seq;
@@ -197,14 +200,17 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
            i = i->cont ())
         {
           size_t len = i->length ();
-          ACE_OS_String::memcpy (buf, i->rd_ptr (), len);
+          ACE_OS_String::memcpy (buf, 
+                                 i->rd_ptr (), 
+                                 len);
           buf += len;
         }
 
       return safe_octet_seq._retn ();
     }
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
+  ACE_THROW_RETURN (CORBA::MARSHAL (), 
+                    0);
 }
 
 CORBA::Any *
@@ -224,7 +230,9 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
   ACE_Message_Block mb (data.length () + 2 * ACE_CDR::MAX_ALIGNMENT);
   ACE_CDR::mb_align (&mb);
 
-  ACE_OS::memcpy (mb.rd_ptr (), data.get_buffer (), data.length ());
+  ACE_OS::memcpy (mb.rd_ptr (), 
+                  data.get_buffer (), 
+                  data.length ());
 
   // @todo How do we check for a type mismatch so that we can
   //       throw a IOP::Codec::TypeMismatch exception?
@@ -254,6 +262,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
                     this->orb_core_);
 
   CORBA::Boolean byte_order;
+
   if (cdr >> TAO_InputCDR::to_boolean (byte_order))
     {
       cdr.reset_byte_order (ACE_static_cast (int, byte_order));
@@ -279,7 +288,6 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
         {
           // This will be the end of the new message block.
           char *end = cdr.rd_ptr ();
-
           size_t size = end - begin;
 
           // @@ I added the following check, but I'm not sure if it is
@@ -295,7 +303,10 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
           // possible to determine if the TypeCode does *not* match
           // the data, not if it does match.
           if (size != sequence_length - 1)
-            ACE_THROW_RETURN (IOP::Codec::TypeMismatch (), 0);
+            {
+              ACE_THROW_RETURN (IOP::Codec::TypeMismatch (), 
+                                0);
+            }
 
           ptr_arith_t offset =
             ptr_arith_t (begin) % ACE_CDR::MAX_ALIGNMENT;
@@ -306,31 +317,42 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
           ACE_NEW_THROW_EX (any,
                             CORBA::Any,
                             CORBA::NO_MEMORY (
-                              CORBA::SystemException::_tao_minor_code (
-                                TAO_DEFAULT_MINOR_CODE,
-                                ENOMEM),
-                              CORBA::COMPLETED_NO));
+                                CORBA::SystemException::_tao_minor_code (
+                                    TAO_DEFAULT_MINOR_CODE,
+                                    ENOMEM
+                                  ),
+                                CORBA::COMPLETED_NO
+                              ));
           ACE_CHECK_RETURN (0);
 
           CORBA::Any_var safe_any = any;
 
-          // Stick it into the Any.  It gets duplicated there.
-          any->_tao_replace (tc,
-                             cdr.byte_order (),
-                             &mb);
+          // Stick it into the Any.
+          TAO::Unknown_IDL_Type *unk = 0;
+          ACE_NEW_RETURN (unk,
+                          TAO::Unknown_IDL_Type (tc,
+                                                 &mb,
+                                                 cdr.byte_order ()),
+                          0);
+          any->replace (unk);
           return safe_any._retn ();
         }
       else
-        ACE_THROW_RETURN (IOP::Codec::TypeMismatch (), 0);
+        {
+          ACE_THROW_RETURN (IOP::Codec::TypeMismatch (), 
+                            0);
+        }
     }
 
-  ACE_THROW_RETURN (IOP::Codec::FormatMismatch (), 0);
+  ACE_THROW_RETURN (IOP::Codec::FormatMismatch (), 
+                    0);
 }
 
 void
 TAO_CDR_Encaps_Codec::check_type_for_encoding (
-  const CORBA::Any & data
-  ACE_ENV_ARG_DECL)
+    const CORBA::Any & data
+    ACE_ENV_ARG_DECL
+  )
 {
   // @@ TODO: Are there any other conditions we need to check?
 
diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl
index 64ef31c26b4..a26ed5325bb 100644
--- a/TAO/tao/CONV_FRAME.pidl
+++ b/TAO/tao/CONV_FRAME.pidl
@@ -21,4 +21,3 @@ module CONV_FRAME {
   };
 };
 
-#pragma prefix ""
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index e4b780a43ff..c353e9d5f13 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -1,708 +1,722 @@
+// -*- 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/
 //
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAME.cpp
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
 #include "tao/CONV_FRAMEC.h"
-#include "tao/Any.h"
-#include "tao/Typecode.h"
+#include "tao/Any_T.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/CONV_FRAMEC.i"
+#include "CONV_FRAMEC.i"
 #endif /* !defined INLINE */
 
-void
-CONV_FRAME::CodeSetComponent::_tao_any_destructor (void* x)
-{
-  CONV_FRAME::CodeSetComponent *tmp = ACE_static_cast(CONV_FRAME::CodeSetComponent*,x);
-  delete tmp;
-}
-
-void
-CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (void* x)
-{
-  CONV_FRAME::CodeSetComponentInfo *tmp = ACE_static_cast(CONV_FRAME::CodeSetComponentInfo*,x);
-  delete tmp;
-}
-
-void
-CONV_FRAME::CodeSetContext::_tao_any_destructor (void* x)
-{
-  CONV_FRAME::CodeSetContext *tmp = ACE_static_cast(CONV_FRAME::CodeSetContext*,x);
-  delete tmp;
-}
+// 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_CodeSetId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-  10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-  CORBA::tk_ulong,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x65744964), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
+    10,
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657449), 
+  ACE_NTOHL (0x64000000),  // name = CodeSetId
+    CORBA::tk_ulong,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId (CORBA::tk_alias, sizeof (_oc_CONV_FRAME_CodeSetId), (char *) &_oc_CONV_FRAME_CodeSetId, 0, sizeof (CONV_FRAME::CodeSetId));
+
+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId (
+    CORBA::tk_alias,
+    sizeof (_oc_CONV_FRAME_CodeSetId),
+    (char *) &_oc_CONV_FRAME_CodeSetId,
+    0,
+    sizeof (CONV_FRAME::CodeSetId)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetId, &_tc_TAO_tc_CONV_FRAME_CodeSetId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_CodeSetId,
+    &_tc_TAO_tc_CONV_FRAME_CodeSetId
+  )
 TAO_NAMESPACE_END
+
+// 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_CodeSetComponent[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-  17, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0),  // name = CodeSetComponent
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x6574436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
+    17,
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657443), 
+  ACE_NTOHL (0x6f6d706f), 
+  ACE_NTOHL (0x6e656e74), 
+  ACE_NTOHL (0x0),  // name = CodeSetComponent
   2, // member count
-  16, ACE_NTOHL (0x6e617469), ACE_NTOHL (0x76655f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400),  // name = native_code_set
-  CORBA::tk_alias, // typecode kind for typedefs
+    16,
+  ACE_NTOHL (0x6e617469), 
+  ACE_NTOHL (0x76655f63), 
+  ACE_NTOHL (0x6f64655f), 
+  ACE_NTOHL (0x73657400),  // name = native_code_set
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
+    37,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f4e56), 
+    ACE_NTOHL (0x5f465241), 
+    ACE_NTOHL (0x4d452f43), 
+    ACE_NTOHL (0x6f646553), 
+    ACE_NTOHL (0x65744964), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
+        10,
+    ACE_NTOHL (0x436f6465), 
+    ACE_NTOHL (0x53657449), 
+    ACE_NTOHL (0x64000000),  // name = CodeSetId
+        CORBA::tk_ulong,
 
 
-  21, ACE_NTOHL (0x636f6e76), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657473), ACE_NTOHL (0x0),  // name = conversion_code_sets
-  CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
+  21,
+  ACE_NTOHL (0x636f6e76), 
+  ACE_NTOHL (0x65727369), 
+  ACE_NTOHL (0x6f6e5f63), 
+  ACE_NTOHL (0x6f64655f), 
+  ACE_NTOHL (0x73657473), 
+  ACE_NTOHL (0x0),  // name = conversion_code_sets
+    CORBA::tk_sequence, // typecode kind
+  16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-      10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-      CORBA::tk_ulong,
+    0xffffffff, // indirection
+    0xffffff88, // negative offset (-120)
+    0U,
 
+};
 
+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent (
+    CORBA::tk_struct,
+    sizeof (_oc_CONV_FRAME_CodeSetComponent),
+    (char *) &_oc_CONV_FRAME_CodeSetComponent,
     0,
+    sizeof (CONV_FRAME::CodeSetComponent)
+  );
 
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent (CORBA::tk_struct, sizeof (_oc_CONV_FRAME_CodeSetComponent), (char *) &_oc_CONV_FRAME_CodeSetComponent, 0, sizeof (CONV_FRAME::CodeSetComponent));
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetComponent, &_tc_TAO_tc_CONV_FRAME_CodeSetComponent)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_CodeSetComponent,
+    &_tc_TAO_tc_CONV_FRAME_CodeSetComponent
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void CONV_FRAME::CodeSetComponent::_tao_any_destructor (void *_tao_void_pointer)
+{
+  CodeSetComponent *tmp = ACE_static_cast (CodeSetComponent*, _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_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_
 
-  void
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ULong* tmp = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (length);
-
-    if (this->buffer_ != 0)
+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_);
-
+      CORBA::ULong *old =
+        ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
+        {
+          tmp[i] = old[i];
+        }
+      
       if (this->release_)
-        CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (old);
-
+        {
+          _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (old);
+        }
     }
-    this->buffer_ = tmp;
-  }
+  
+  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)
+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_);
-
-    CONV_FRAME::CodeSetComponent::_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) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-
+    }
+  
+  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 */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_)
 #define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_
 
+// 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) // uses max size
-  :
+
+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
+_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release)
-  :
+
+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
+_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (const _tao_seq_CodeSetId &seq) // copy ctor
-  :
+
+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
+_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::~_tao_seq_CodeSetId (void) // dtor
 {}
 
+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 */
 
+// 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_CodeSetComponentInfo[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7449), ACE_NTOHL (0x6e666f3a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0
-  21, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x496e666f), ACE_NTOHL (0x0),  // name = CodeSetComponentInfo
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x6574436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x6e666f3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0
+    21,
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657443), 
+  ACE_NTOHL (0x6f6d706f), 
+  ACE_NTOHL (0x6e656e74), 
+  ACE_NTOHL (0x496e666f), 
+  ACE_NTOHL (0x0),  // name = CodeSetComponentInfo
   2, // member count
-  12, ACE_NTOHL (0x466f7243), ACE_NTOHL (0x68617244), ACE_NTOHL (0x61746100),  // name = ForCharData
-  CORBA::tk_struct, // typecode kind
-  296, // encapsulation length
+    12,
+  ACE_NTOHL (0x466f7243), 
+  ACE_NTOHL (0x68617244), 
+  ACE_NTOHL (0x61746100),  // name = ForCharData
+    CORBA::tk_struct, // typecode kind
+  228, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-    17, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0),  // name = CodeSetComponent
+    44,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f4e56), 
+    ACE_NTOHL (0x5f465241), 
+    ACE_NTOHL (0x4d452f43), 
+    ACE_NTOHL (0x6f646553), 
+    ACE_NTOHL (0x6574436f), 
+    ACE_NTOHL (0x6d706f6e), 
+    ACE_NTOHL (0x656e743a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
+        17,
+    ACE_NTOHL (0x436f6465), 
+    ACE_NTOHL (0x53657443), 
+    ACE_NTOHL (0x6f6d706f), 
+    ACE_NTOHL (0x6e656e74), 
+    ACE_NTOHL (0x0),  // name = CodeSetComponent
     2, // member count
-    16, ACE_NTOHL (0x6e617469), ACE_NTOHL (0x76655f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400),  // name = native_code_set
-    CORBA::tk_alias, // typecode kind for typedefs
+        16,
+    ACE_NTOHL (0x6e617469), 
+    ACE_NTOHL (0x76655f63), 
+    ACE_NTOHL (0x6f64655f), 
+    ACE_NTOHL (0x73657400),  // name = native_code_set
+        CORBA::tk_alias, // typecode kind for typedefs
     68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-      10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-      CORBA::tk_ulong,
-
-
-    21, ACE_NTOHL (0x636f6e76), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657473), ACE_NTOHL (0x0),  // name = conversion_code_sets
-    CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-        10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-        CORBA::tk_ulong,
-
-
-      0,
-
-
-  13, ACE_NTOHL (0x466f7257), ACE_NTOHL (0x63686172), ACE_NTOHL (0x44617461), ACE_NTOHL (0x0),  // name = ForWcharData
-  CORBA::tk_struct, // typecode kind
-  296, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-    17, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0),  // name = CodeSetComponent
-    2, // member count
-    16, ACE_NTOHL (0x6e617469), ACE_NTOHL (0x76655f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400),  // name = native_code_set
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
+      37,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f4e56), 
+      ACE_NTOHL (0x5f465241), 
+      ACE_NTOHL (0x4d452f43), 
+      ACE_NTOHL (0x6f646553), 
+      ACE_NTOHL (0x65744964), 
+      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
+            10,
+      ACE_NTOHL (0x436f6465), 
+      ACE_NTOHL (0x53657449), 
+      ACE_NTOHL (0x64000000),  // name = CodeSetId
+            CORBA::tk_ulong,
+
+
+    21,
+    ACE_NTOHL (0x636f6e76), 
+    ACE_NTOHL (0x65727369), 
+    ACE_NTOHL (0x6f6e5f63), 
+    ACE_NTOHL (0x6f64655f), 
+    ACE_NTOHL (0x73657473), 
+    ACE_NTOHL (0x0),  // name = conversion_code_sets
+        CORBA::tk_sequence, // typecode kind
+    16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-      10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-      CORBA::tk_ulong,
+      0xffffffff, // indirection
+      0xffffff88, // negative offset (-120)
+      0U,
+
+
+  13,
+  ACE_NTOHL (0x466f7257), 
+  ACE_NTOHL (0x63686172), 
+  ACE_NTOHL (0x44617461), 
+  ACE_NTOHL (0x0),  // name = ForWcharData
+    0xffffffff, // indirection
+  0xfffffefc, // negative offset (-260)
+};
 
+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo (
+    CORBA::tk_struct,
+    sizeof (_oc_CONV_FRAME_CodeSetComponentInfo),
+    (char *) &_oc_CONV_FRAME_CodeSetComponentInfo,
+    0,
+    sizeof (CONV_FRAME::CodeSetComponentInfo)
+  );
 
-    21, ACE_NTOHL (0x636f6e76), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657473), ACE_NTOHL (0x0),  // name = conversion_code_sets
-    CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-        10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-        CORBA::tk_ulong,
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CONV_FRAME)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_CodeSetComponentInfo,
+    &_tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo
+  )
+TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
 
-      0,
+void CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  CodeSetComponentInfo *tmp = ACE_static_cast (CodeSetComponentInfo*, _tao_void_pointer);
+  delete tmp;
+}
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo (CORBA::tk_struct, sizeof (_oc_CONV_FRAME_CodeSetComponentInfo), (char *) &_oc_CONV_FRAME_CodeSetComponentInfo, 0, sizeof (CONV_FRAME::CodeSetComponentInfo));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetComponentInfo, &_tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo)
-TAO_NAMESPACE_END
 static const CORBA::Long _oc_CONV_FRAME_CodeSetContext[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetContext:1.0
-  15, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000),  // name = CodeSetContext
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  42,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x6574436f), 
+  ACE_NTOHL (0x6e746578), 
+  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetContext:1.0
+    15,
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657443), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78740000),  // name = CodeSetContext
   2, // member count
-  10, ACE_NTOHL (0x63686172), ACE_NTOHL (0x5f646174), ACE_NTOHL (0x61000000),  // name = char_data
-  CORBA::tk_alias, // typecode kind for typedefs
+    10,
+  ACE_NTOHL (0x63686172), 
+  ACE_NTOHL (0x5f646174), 
+  ACE_NTOHL (0x61000000),  // name = char_data
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
+    37,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f4e56), 
+    ACE_NTOHL (0x5f465241), 
+    ACE_NTOHL (0x4d452f43), 
+    ACE_NTOHL (0x6f646553), 
+    ACE_NTOHL (0x65744964), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
+        10,
+    ACE_NTOHL (0x436f6465), 
+    ACE_NTOHL (0x53657449), 
+    ACE_NTOHL (0x64000000),  // name = CodeSetId
+        CORBA::tk_ulong,
 
 
-  11, ACE_NTOHL (0x77636861), ACE_NTOHL (0x725f6461), ACE_NTOHL (0x74610000),  // name = wchar_data
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
+  11,
+  ACE_NTOHL (0x77636861), 
+  ACE_NTOHL (0x725f6461), 
+  ACE_NTOHL (0x74610000),  // name = wchar_data
+    0xffffffff, // indirection
+  0xffffffa0, // negative offset (-96)
+};
 
+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext (
+    CORBA::tk_struct,
+    sizeof (_oc_CONV_FRAME_CodeSetContext),
+    (char *) &_oc_CONV_FRAME_CodeSetContext,
+    0,
+    sizeof (CONV_FRAME::CodeSetContext)
+  );
 
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext (CORBA::tk_struct, sizeof (_oc_CONV_FRAME_CodeSetContext), (char *) &_oc_CONV_FRAME_CodeSetContext, 0, sizeof (CONV_FRAME::CodeSetContext));
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetContext, &_tc_TAO_tc_CONV_FRAME_CodeSetContext)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_CodeSetContext,
+    &_tc_TAO_tc_CONV_FRAME_CodeSetContext
+  )
 TAO_NAMESPACE_END
 
-void operator<<= (CORBA::Any &_tao_any, const CONV_FRAME::CodeSetComponent &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void CONV_FRAME::CodeSetContext::_tao_any_destructor (void *_tao_void_pointer)
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  CodeSetContext *tmp = ACE_static_cast (CodeSetContext*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetComponent &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::insert_copy (
+      _tao_any,
+      CONV_FRAME::CodeSetComponent::_tao_any_destructor,
       CONV_FRAME::_tc_CodeSetComponent,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponent *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetComponent *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::insert (
+      _tao_any,
+      CONV_FRAME::CodeSetComponent::_tao_any_destructor,
       CONV_FRAME::_tc_CodeSetComponent,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CONV_FRAME::CodeSetComponent::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponent *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetComponent *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetComponent
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetComponent *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponent, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CONV_FRAME::_tc_CodeSetComponent,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            CONV_FRAME::CodeSetComponent::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return _tao_any >>= ACE_const_cast (
+      const CONV_FRAME::CodeSetComponent *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSetComponent *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetComponent *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetComponent
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetComponent *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponent, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *(CONV_FRAME::CodeSetComponent *)_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CONV_FRAME::_tc_CodeSetComponent,
-            1,
-            ACE_const_cast (CONV_FRAME::CodeSetComponent *&, _tao_elem),
-            CONV_FRAME::CodeSetComponent::_tao_any_destructor
-           );
-        return 1;
-      }
-      else
-      {
-        delete ACE_const_cast (CONV_FRAME::CodeSetComponent *&, _tao_elem);
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete ACE_const_cast (CONV_FRAME::CodeSetComponent *&, _tao_elem);
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::extract (
+        _tao_any,
+        CONV_FRAME::CodeSetComponent::_tao_any_destructor,
+        CONV_FRAME::_tc_CodeSetComponent,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, const CONV_FRAME::CodeSetComponentInfo &_tao_elem) // copying
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>
+#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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetComponentInfo &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::insert_copy (
+      _tao_any,
+      CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
       CONV_FRAME::_tc_CodeSetComponentInfo,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponentInfo *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetComponentInfo *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::insert (
+      _tao_any,
+      CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
       CONV_FRAME::_tc_CodeSetComponentInfo,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponentInfo *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetComponentInfo *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetComponentInfo
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetComponentInfo *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponentInfo, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CONV_FRAME::_tc_CodeSetComponentInfo,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return _tao_any >>= ACE_const_cast (
+      const CONV_FRAME::CodeSetComponentInfo *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSetComponentInfo *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetComponentInfo *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetComponentInfo
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetComponentInfo *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponentInfo, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *(CONV_FRAME::CodeSetComponentInfo *)_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CONV_FRAME::_tc_CodeSetComponentInfo,
-            1,
-            ACE_reinterpret_cast (void *, ACE_const_cast (CONV_FRAME::CodeSetComponentInfo *&, _tao_elem)),
-            CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete ACE_const_cast (CONV_FRAME::CodeSetComponentInfo *&, _tao_elem);
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete ACE_const_cast (CONV_FRAME::CodeSetComponentInfo *&, _tao_elem);
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::extract (
+        _tao_any,
+        CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
+        CONV_FRAME::_tc_CodeSetComponentInfo,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, const CONV_FRAME::CodeSetContext &_tao_elem) // copying
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>
+#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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetContext &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::insert_copy (
+      _tao_any,
+      CONV_FRAME::CodeSetContext::_tao_any_destructor,
       CONV_FRAME::_tc_CodeSetContext,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CONV_FRAME::CodeSetContext *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetContext *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::insert (
+      _tao_any,
+      CONV_FRAME::CodeSetContext::_tao_any_destructor,
       CONV_FRAME::_tc_CodeSetContext,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CONV_FRAME::CodeSetContext::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetContext *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetContext *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetContext ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetContext *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetContext, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CONV_FRAME::_tc_CodeSetContext,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            CONV_FRAME::CodeSetContext::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return _tao_any >>= ACE_const_cast (
+      const CONV_FRAME::CodeSetContext *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSetContext *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetContext *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetContext ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetContext *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetContext, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *(CONV_FRAME::CodeSetContext *)_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CONV_FRAME::_tc_CodeSetContext,
-            1,
-            ACE_reinterpret_cast (void *, ACE_const_cast (CONV_FRAME::CodeSetContext *&, _tao_elem)),
-            CONV_FRAME::CodeSetContext::_tao_any_destructor
-            );
-        return 1;
-      }
-      else
-      {
-        delete ACE_const_cast (CONV_FRAME::CodeSetContext *&, _tao_elem);
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete ACE_const_cast (CONV_FRAME::CodeSetContext *&, _tao_elem);
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::extract (
+        _tao_any,
+        CONV_FRAME::CodeSetContext::_tao_any_destructor,
+        CONV_FRAME::_tc_CodeSetContext,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>
+#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
+
+#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_
+#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -711,12 +725,32 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
 }
+
+#endif /* _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 0846ca891f8..345c281055d 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -1,24 +1,31 @@
+// -*- 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
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_CONV_FRAMEC_H_
+#define _TAO_IDL_ORIG_CONV_FRAMEC_H_
 
-//=============================================================================
-/**
- *  @file   CONV_FRAMEC.h
- *
- *  $Id$
- *
- * Generated from CONV_FRAME.pidl, that contains the OMG standarized
- * CONV_FRAME module.
- * The code was generated by the IDL compiler and then hand-crafted
- * to reduce the includes interdependencies.
- *
- *
- */
-//=============================================================================
-
-
-#ifndef TAO_CONV_FRAMEC_H
-#define TAO_CONV_FRAMEC_H
 #include "ace/pre.h"
-
 #include "tao/CDR.h"
 #include "tao/Sequence.h"
 
@@ -31,6 +38,14 @@
 #undef TAO_EXPORT_MACRO
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -38,185 +53,180 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  CONV_FRAME
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::ULong CodeSetId;
   typedef CORBA::ULong_out CodeSetId_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetId;
-
+  
+  // 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_CodeSetId;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class CodeSetComponent_var;
+  
   struct TAO_Export CodeSetComponent
   {
-    static void _tao_any_destructor (void*);
-
-    CodeSetId native_code_set;
+    typedef CodeSetComponent_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    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_MACRO _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId : public TAO_Unbounded_Base_Sequence
-      {
-      public:
-        // = Initialization and termination methods.
-
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void); // Default constructor.
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum);
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum,
+    
+    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); // Dtor.
-        // = 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);
-        virtual void _allocate_buffer (CORBA::ULong length);
-        virtual void _deallocate_buffer (void);
-        // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-        CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
-        const CORBA::ULong *get_buffer (void) const;
-        void replace (CORBA::ULong max,
+          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);
-      };
+          CORBA::Boolean release
+        );
+    };
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#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
+    
+    class _tao_seq_CodeSetId;
+    
     // *************************************************************
-    // _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
 
-    class TAO_Export _tao_seq_CodeSetId : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
+    _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); // default ctor
-      _tao_seq_CodeSetId (CORBA::ULong max); // uses max size
-      _tao_seq_CodeSetId (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::ULong *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_CodeSetId (const _tao_seq_CodeSetId &); // copy ctor
-      ~_tao_seq_CodeSetId (void); // dtor
-    };
-    typedef _tao_seq_CodeSetId *_tao_seq_CodeSetId_ptr;
-
-#endif /* end #if !defined */
-
+    TAO_Unbounded_Sequence<CORBA::ULong>
 
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___VAR_CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___VAR_CH_
-
-// *************************************************************
-    // class CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var
-    // *************************************************************
-
-    class TAO_Export _tao_seq_CodeSetId_var
-    {
-    public:
-      _tao_seq_CodeSetId_var (void); // default constructor
-      _tao_seq_CodeSetId_var (_tao_seq_CodeSetId *);
-      _tao_seq_CodeSetId_var (const _tao_seq_CodeSetId_var &); // copy constructor
-      ~_tao_seq_CodeSetId_var (void); // destructor
-
-      _tao_seq_CodeSetId_var &operator= (_tao_seq_CodeSetId *);
-      _tao_seq_CodeSetId_var &operator= (const _tao_seq_CodeSetId_var &);
-      _tao_seq_CodeSetId *operator-> (void);
-      const _tao_seq_CodeSetId *operator-> (void) const;
-
-      operator const _tao_seq_CodeSetId &() const;
-      operator _tao_seq_CodeSetId &();
-      operator _tao_seq_CodeSetId &() const;
-      CodeSetId &operator[] (CORBA::ULong index);
-      // in, inout, out, _retn
-      const _tao_seq_CodeSetId &in (void) const;
-      _tao_seq_CodeSetId &inout (void);
-      _tao_seq_CodeSetId *&out (void);
-      _tao_seq_CodeSetId *_retn (void);
-      _tao_seq_CodeSetId *ptr (void) const;
-
-    private:
-      _tao_seq_CodeSetId *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___OUT_CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___OUT_CH_
-
-    class TAO_Export _tao_seq_CodeSetId_out
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
-      _tao_seq_CodeSetId_out (_tao_seq_CodeSetId *&);
-      _tao_seq_CodeSetId_out (_tao_seq_CodeSetId_var &);
-      _tao_seq_CodeSetId_out (const _tao_seq_CodeSetId_out &);
-      _tao_seq_CodeSetId_out &operator= (const _tao_seq_CodeSetId_out &);
-      _tao_seq_CodeSetId_out &operator= (_tao_seq_CodeSetId *);
-      operator _tao_seq_CodeSetId *&();
-      _tao_seq_CodeSetId *&ptr (void);
-      _tao_seq_CodeSetId *operator-> (void);
-      CodeSetId &operator[] (CORBA::ULong index);
-
-    private:
-      _tao_seq_CodeSetId *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_CodeSetId_var &);
+      _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 */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
+    
+    typedef _tao_seq_CodeSetId _conversion_code_sets_seq;
     _tao_seq_CodeSetId conversion_code_sets;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export CodeSetComponent_var
   {
   public:
-    CodeSetComponent_var (void); // default constructor
+    CodeSetComponent_var (void);
     CodeSetComponent_var (CodeSetComponent *);
-    CodeSetComponent_var (const CodeSetComponent_var &); // copy constructor
-    ~CodeSetComponent_var (void); // destructor
-
+    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;
-    // in, inout, out, _retn
+    
+    // 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;
-
+  
   private:
     CodeSetComponent *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export CodeSetComponent_out
   {
   public:
@@ -228,50 +238,69 @@ TAO_NAMESPACE  CONV_FRAME
     operator CodeSetComponent *&();
     CodeSetComponent *&ptr (void);
     CodeSetComponent *operator-> (void);
-
+    
   private:
     CodeSetComponent *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const CodeSetComponent_var &);
   };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetComponent;
-
+  
+  // 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_CodeSetComponent;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class CodeSetComponentInfo_var;
+  
   struct TAO_Export CodeSetComponentInfo
   {
-    static void _tao_any_destructor (void*);
-
-    CodeSetComponent ForCharData;
-    CodeSetComponent ForWcharData;
+    typedef CodeSetComponentInfo_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    CONV_FRAME::CodeSetComponent ForCharData;
+    CONV_FRAME::CodeSetComponent ForWcharData;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export CodeSetComponentInfo_var
   {
   public:
-    CodeSetComponentInfo_var (void); // default constructor
+    CodeSetComponentInfo_var (void);
     CodeSetComponentInfo_var (CodeSetComponentInfo *);
-    CodeSetComponentInfo_var (const CodeSetComponentInfo_var &); // copy constructor
-    ~CodeSetComponentInfo_var (void); // destructor
-
+    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;
-    // in, inout, out, _retn
+    
+    // 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;
-
+  
   private:
     CodeSetComponentInfo *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export CodeSetComponentInfo_out
   {
   public:
@@ -283,108 +312,169 @@ TAO_NAMESPACE  CONV_FRAME
     operator CodeSetComponentInfo *&();
     CodeSetComponentInfo *&ptr (void);
     CodeSetComponentInfo *operator-> (void);
-
+    
   private:
     CodeSetComponentInfo *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const CodeSetComponentInfo_var &);
   };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
-
+  
+  // 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_CodeSetComponentInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class CodeSetContext_var;
+  
   struct TAO_Export CodeSetContext
   {
-    static void _tao_any_destructor (void*);
-
-    CodeSetId char_data;
-    CodeSetId wchar_data;
+    typedef CodeSetContext_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    CONV_FRAME::CodeSetId char_data;
+    CONV_FRAME::CodeSetId wchar_data;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export CodeSetContext_var
   {
   public:
-    CodeSetContext_var (void); // default constructor
+    CodeSetContext_var (void);
     CodeSetContext_var (CodeSetContext *);
-    CodeSetContext_var (const CodeSetContext_var &); // copy constructor
-    ~CodeSetContext_var (void); // destructor
-
+    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
+    
+    // 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;
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetContext;
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module CONV_FRAME
 
-TAO_Export void operator<<= (CORBA::Any &,
-                             const CONV_FRAME::CodeSetComponent &); // copying version
-TAO_Export void operator<<= (CORBA::Any &,
-                             CONV_FRAME::CodeSetComponent*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CONV_FRAME::CodeSetComponent *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CONV_FRAME::CodeSetComponent *&);
-TAO_Export void operator<<= (CORBA::Any &,
-                             const CONV_FRAME::CodeSetComponentInfo &); // copying version
-TAO_Export void operator<<= (CORBA::Any &,
-                             CONV_FRAME::CodeSetComponentInfo*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CONV_FRAME::CodeSetComponentInfo *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CONV_FRAME::CodeSetComponentInfo *&);
-TAO_Export void operator<<= (CORBA::Any &,
-                             const CONV_FRAME::CodeSetContext &); // copying version
-TAO_Export void operator<<= (CORBA::Any &,
-                             CONV_FRAME::CodeSetContext*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CONV_FRAME::CodeSetContext *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CONV_FRAME::CodeSetContext *&);
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponent &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponent*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponent *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponent *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponentInfo*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponentInfo *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetContext &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContext*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetContext *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponent &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponent &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &,
-                                      const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_
+#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
+  );
 TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
   );
 
+#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponentInfo &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponentInfo &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetContext &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
-#include "tao/CONV_FRAMEC.i"
+#include "CONV_FRAMEC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
-#endif /* TAO_CONV_FRAMEC_H */
+#endif /* ifndef */
+
diff --git a/TAO/tao/CONV_FRAMEC.i b/TAO/tao/CONV_FRAMEC.i
index ca01549ce64..bb3d8ef82c6 100644
--- a/TAO/tao/CONV_FRAMEC.i
+++ b/TAO/tao/CONV_FRAMEC.i
@@ -1,60 +1,93 @@
+// -*- 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
+
+
+// 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) // default constructor
+CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (CONV_FRAME::CodeSetComponent *p)
+CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (CodeSetComponent *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (const CONV_FRAME::CodeSetComponent_var &p) // copy constructor
+CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (const ::CONV_FRAME::CodeSetComponent_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, CONV_FRAME::CodeSetComponent(*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetComponent (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::~CodeSetComponent_var (void) // destructor
+CONV_FRAME::CodeSetComponent_var::~CodeSetComponent_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent_var &
-CONV_FRAME::CodeSetComponent_var::operator= (CONV_FRAME::CodeSetComponent *p)
+ACE_INLINE
+CONV_FRAME::CodeSetComponent_var &
+CONV_FRAME::CodeSetComponent_var::operator= (CodeSetComponent *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent_var &
-CONV_FRAME::CodeSetComponent_var::operator= (const CONV_FRAME::CodeSetComponent_var &p)
+ACE_INLINE
+::CONV_FRAME::CodeSetComponent_var &
+CONV_FRAME::CodeSetComponent_var::operator= (const ::CONV_FRAME::CodeSetComponent_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
         {
-          CONV_FRAME::CodeSetComponent *deep_copy = 
-                new CONV_FRAME::CodeSetComponent (*p.ptr_);
+          CodeSetComponent *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              CodeSetComponent (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              CONV_FRAME::CodeSetComponent *tmp = deep_copy;
+              CodeSetComponent *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -65,50 +98,57 @@ CONV_FRAME::CodeSetComponent_var::operator= (const CONV_FRAME::CodeSetComponent_
   return *this;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetComponent *
+ACE_INLINE const ::CONV_FRAME::CodeSetComponent *
 CONV_FRAME::CodeSetComponent_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent *
+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
+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
+CONV_FRAME::CodeSetComponent_var::operator ::CONV_FRAME::CodeSetComponent &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator CONV_FRAME::CodeSetComponent &() const// cast
+CONV_FRAME::CodeSetComponent_var::operator ::CONV_FRAME::CodeSetComponent &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetComponent &
+// 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 &
+ACE_INLINE ::CONV_FRAME::CodeSetComponent &
 CONV_FRAME::CodeSetComponent_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE CONV_FRAME::CodeSetComponent *&
+// Mapping for variable size.
+ACE_INLINE ::CONV_FRAME::CodeSetComponent *&
 CONV_FRAME::CodeSetComponent_var::out (void)
 {
   delete this->ptr_;
@@ -116,33 +156,36 @@ CONV_FRAME::CodeSetComponent_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent *
+ACE_INLINE ::CONV_FRAME::CodeSetComponent *
 CONV_FRAME::CodeSetComponent_var::_retn (void)
 {
-  CONV_FRAME::CodeSetComponent *tmp = this->ptr_;
+  ::CONV_FRAME::CodeSetComponent *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent *
+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)
+CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (::CONV_FRAME::CodeSetComponent *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CONV_FRAME::CodeSetComponent_var &p) // constructor from _var
+CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CodeSetComponent_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -150,472 +193,325 @@ CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CONV_FRAME::CodeSetCompo
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (const CONV_FRAME::CodeSetComponent_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CONV_FRAME::CodeSetComponent_out&,p).ptr_)
+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)
+ACE_INLINE
+CONV_FRAME::CodeSetComponent_out &
+CONV_FRAME::CodeSetComponent_out::operator= (const ::CONV_FRAME::CodeSetComponent_out &p)
 {
-  this->ptr_ = ACE_const_cast (CONV_FRAME::CodeSetComponent_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (CodeSetComponent_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent_out &
-CONV_FRAME::CodeSetComponent_out::operator= (CONV_FRAME::CodeSetComponent *p)
+ACE_INLINE
+CONV_FRAME::CodeSetComponent_out &
+CONV_FRAME::CodeSetComponent_out::operator= (CodeSetComponent *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::operator CONV_FRAME::CodeSetComponent *&() // cast
+ACE_INLINE 
+CONV_FRAME::CodeSetComponent_out::operator ::CONV_FRAME::CodeSetComponent *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent *&
+ACE_INLINE ::CONV_FRAME::CodeSetComponent *&
 CONV_FRAME::CodeSetComponent_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent *
+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_
 
-  // = Static operations.
-  ACE_INLINE CORBA::ULong *
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    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)
-  // Free the sequence.
-  {
-    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) // Default constructor.
-  {
-  }
-
-  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) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, CONV_FRAME::CodeSetComponent::_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 CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::ULong *tmp1 = CONV_FRAME::CodeSetComponent::_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;
-  }
-
-  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 CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs)
-  // Assignment operator.
-  {
-    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_);
-        CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-        this->buffer_ = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = CONV_FRAME::CodeSetComponent::_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)
-  // operator []
-  {
-    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
-  // operator []
-  {
-    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 = CONV_FRAME::CodeSetComponent::_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_);
-      CONV_FRAME::CodeSetComponent::_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 */
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var
-// *************************************************************
-
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_tao_seq_CodeSetId_var (void) // default constructor
-  : ptr_ (0)
-{}
+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
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_tao_seq_CodeSetId_var (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *p)
-  : ptr_ (p)
-{}
+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_seq_CodeSetId_var::_tao_seq_CodeSetId_var (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // copy constructor
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void)
 {
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId(*p.ptr_));
-  else
-    this->ptr_ = 0;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::~_tao_seq_CodeSetId_var (void) // destructor
+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))
 {
-  delete this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator= (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *p)
+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)
 {
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator= (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // deep copy
+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 (this != &p)
+  if (rhs.buffer_ != 0)
     {
-      if (p.ptr_ == 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)
         {
-          delete this->ptr_;
-          this->ptr_ = 0;
+          tmp1[i] = tmp2[i];
         }
-      else
+      
+      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_)
         {
-          CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *deep_copy = 
-            new CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId (*p.ptr_);
+          // Free the old buffer.
+          CORBA::ULong *tmp =
+            ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
           
-          if (deep_copy != 0)
-            {
-              CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *tmp = 
-                deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
+          _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;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &() const // cast
-{
-  return *this->ptr_;
-}
-
+// = Accessors.
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &() // cast
+CORBA::ULong &
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i)
 {
-  return *this->ptr_;
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ULong* tmp =
+    ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
+  return tmp[i];
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::inout (void)
+const CORBA::ULong &
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i) const
 {
-  return *this->ptr_;
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ULong * const tmp =
+    ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
 }
 
-// mapping for variable size
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_retn (void)
-{
-  CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out
-// *************************************************************
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::_tao_seq_CodeSetId_out (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&p)
-  : ptr_ (p)
+CORBA::ULong *
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (CORBA::Boolean orphan)
 {
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::_tao_seq_CodeSetId_out (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
+  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
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::_tao_seq_CodeSetId_out (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out&,p).ptr_)
-{}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator= (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &p)
+const CORBA::ULong *
+CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (void) const
 {
-  this->ptr_ = ACE_const_cast (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator= (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *p)
-{
-  this->ptr_ = p;
-  return *this;
+  return ACE_reinterpret_cast (const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator-> (void)
+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
+  )
 {
-  return this->ptr_;
+  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;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
+#endif /* end #if !defined */
 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
-#endif /* end #if !defined */
+// 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) // default constructor
+CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (CONV_FRAME::CodeSetComponentInfo *p)
+CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (CodeSetComponentInfo *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (const CONV_FRAME::CodeSetComponentInfo_var &p) // copy constructor
+CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (const ::CONV_FRAME::CodeSetComponentInfo_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, CONV_FRAME::CodeSetComponentInfo(*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetComponentInfo (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::~CodeSetComponentInfo_var (void) // destructor
+CONV_FRAME::CodeSetComponentInfo_var::~CodeSetComponentInfo_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_var &
-CONV_FRAME::CodeSetComponentInfo_var::operator= (CONV_FRAME::CodeSetComponentInfo *p)
+ACE_INLINE
+CONV_FRAME::CodeSetComponentInfo_var &
+CONV_FRAME::CodeSetComponentInfo_var::operator= (CodeSetComponentInfo *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_var &
-CONV_FRAME::CodeSetComponentInfo_var::operator= (const CONV_FRAME::CodeSetComponentInfo_var &p)
+ACE_INLINE
+::CONV_FRAME::CodeSetComponentInfo_var &
+CONV_FRAME::CodeSetComponentInfo_var::operator= (const ::CONV_FRAME::CodeSetComponentInfo_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
         {
-          CONV_FRAME::CodeSetComponentInfo *deep_copy = 
-            new CONV_FRAME::CodeSetComponentInfo (*p.ptr_);
+          CodeSetComponentInfo *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              CodeSetComponentInfo (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              CONV_FRAME::CodeSetComponentInfo *tmp = deep_copy;
+              CodeSetComponentInfo *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -626,50 +522,57 @@ CONV_FRAME::CodeSetComponentInfo_var::operator= (const CONV_FRAME::CodeSetCompon
   return *this;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetComponentInfo *
+ACE_INLINE const ::CONV_FRAME::CodeSetComponentInfo *
 CONV_FRAME::CodeSetComponentInfo_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
+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
+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
+CONV_FRAME::CodeSetComponentInfo_var::operator ::CONV_FRAME::CodeSetComponentInfo &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator CONV_FRAME::CodeSetComponentInfo &() const// cast
+CONV_FRAME::CodeSetComponentInfo_var::operator ::CONV_FRAME::CodeSetComponentInfo &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetComponentInfo &
+// 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 &
+ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo &
 CONV_FRAME::CodeSetComponentInfo_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *&
+// Mapping for variable size.
+ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *&
 CONV_FRAME::CodeSetComponentInfo_var::out (void)
 {
   delete this->ptr_;
@@ -677,33 +580,36 @@ CONV_FRAME::CodeSetComponentInfo_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
+ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
 CONV_FRAME::CodeSetComponentInfo_var::_retn (void)
 {
-  CONV_FRAME::CodeSetComponentInfo *tmp = this->ptr_;
+  ::CONV_FRAME::CodeSetComponentInfo *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
+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)
+CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (::CONV_FRAME::CodeSetComponentInfo *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CONV_FRAME::CodeSetComponentInfo_var &p) // constructor from _var
+CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CodeSetComponentInfo_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -711,97 +617,119 @@ CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CONV_FRAME::Code
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (const CONV_FRAME::CodeSetComponentInfo_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CONV_FRAME::CodeSetComponentInfo_out&,p).ptr_)
+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)
+ACE_INLINE
+CONV_FRAME::CodeSetComponentInfo_out &
+CONV_FRAME::CodeSetComponentInfo_out::operator= (const ::CONV_FRAME::CodeSetComponentInfo_out &p)
 {
-  this->ptr_ = ACE_const_cast (CONV_FRAME::CodeSetComponentInfo_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (CodeSetComponentInfo_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_out &
-CONV_FRAME::CodeSetComponentInfo_out::operator= (CONV_FRAME::CodeSetComponentInfo *p)
+ACE_INLINE
+CONV_FRAME::CodeSetComponentInfo_out &
+CONV_FRAME::CodeSetComponentInfo_out::operator= (CodeSetComponentInfo *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::operator CONV_FRAME::CodeSetComponentInfo *&() // cast
+ACE_INLINE 
+CONV_FRAME::CodeSetComponentInfo_out::operator ::CONV_FRAME::CodeSetComponentInfo *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *&
+ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *&
 CONV_FRAME::CodeSetComponentInfo_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
+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) // default constructor
+CONV_FRAME::CodeSetContext_var::CodeSetContext_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (CONV_FRAME::CodeSetContext *p)
+CONV_FRAME::CodeSetContext_var::CodeSetContext_var (CodeSetContext *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (const CONV_FRAME::CodeSetContext_var &p) // copy constructor
+CONV_FRAME::CodeSetContext_var::CodeSetContext_var (const ::CONV_FRAME::CodeSetContext_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, CONV_FRAME::CodeSetContext(*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetContext (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
+// Fixed-size types only.
 ACE_INLINE
-CONV_FRAME::CodeSetContext_var::~CodeSetContext_var (void) // destructor
+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= (CONV_FRAME::CodeSetContext *p)
+ACE_INLINE
+CONV_FRAME::CodeSetContext_var &
+CONV_FRAME::CodeSetContext_var::operator= (CodeSetContext *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (const CONV_FRAME::CodeSetContext_var &p)
+ACE_INLINE
+::CONV_FRAME::CodeSetContext_var &
+CONV_FRAME::CodeSetContext_var::operator= (const ::CONV_FRAME::CodeSetContext_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
         {
-          CONV_FRAME::CodeSetContext *deep_copy = 
-            new CONV_FRAME::CodeSetContext (*p.ptr_);
+          CodeSetContext *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              CodeSetContext (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              CONV_FRAME::CodeSetContext *tmp = deep_copy;
+              CodeSetContext *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -812,144 +740,222 @@ CONV_FRAME::CodeSetContext_var::operator= (const CONV_FRAME::CodeSetContext_var
   return *this;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetContext *
+// 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 *
+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
+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
+CONV_FRAME::CodeSetContext_var::operator ::CONV_FRAME::CodeSetContext &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator CONV_FRAME::CodeSetContext &() const// cast
+CONV_FRAME::CodeSetContext_var::operator ::CONV_FRAME::CodeSetContext &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE const CONV_FRAME::CodeSetContext &
+ACE_INLINE const ::CONV_FRAME::CodeSetContext &
 CONV_FRAME::CodeSetContext_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetContext &
+ACE_INLINE ::CONV_FRAME::CodeSetContext &
 CONV_FRAME::CodeSetContext_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for fixed size
-ACE_INLINE CONV_FRAME::CodeSetContext &
+// mapping for fixed size 
+ACE_INLINE ::CONV_FRAME::CodeSetContext &
 CONV_FRAME::CodeSetContext_var::out (void)
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetContext
+ACE_INLINE ::CONV_FRAME::CodeSetContext
 CONV_FRAME::CodeSetContext_var::_retn (void)
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CONV_FRAME::CodeSetContext *
+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_
+#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_I_
+
 CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
   );
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CONV_FRAME::CodeSetComponent &_tao_aggregate)
+#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
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CONV_FRAME::CodeSetComponent &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.native_code_set) &&
     (strm << _tao_aggregate.conversion_code_sets)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CONV_FRAME::CodeSetComponent &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CONV_FRAME::CodeSetComponent &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.native_code_set) &&
     (strm >> _tao_aggregate.conversion_code_sets)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CONV_FRAME::CodeSetComponentInfo &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CONV_FRAME::CodeSetComponentInfo &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.ForCharData) &&
     (strm << _tao_aggregate.ForWcharData)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CONV_FRAME::CodeSetComponentInfo &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CONV_FRAME::CodeSetComponentInfo &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.ForCharData) &&
     (strm >> _tao_aggregate.ForWcharData)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CONV_FRAME::CodeSetContext &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CONV_FRAME::CodeSetContext &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.char_data) &&
     (strm << _tao_aggregate.wchar_data)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CONV_FRAME::CodeSetContext &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CONV_FRAME::CodeSetContext &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.char_data) &&
     (strm >> _tao_aggregate.wchar_data)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-
+    {
+      return 0;
+    }
 }
+
diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl
index 85b0a40de2b..408a7a41f80 100644
--- a/TAO/tao/Current.pidl
+++ b/TAO/tao/Current.pidl
@@ -27,7 +27,7 @@
 //   command used for this is:
 //
 //     tao_idl.exe
-//        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+//        -o orig -Gp -Gd -Ge 1
 //          -Wb,export_macro=TAO_Export
 //          -Wb,export_include="tao/corbafwd.h"
 //          -Wb,pre_include="ace/pre.h"
@@ -63,4 +63,4 @@ module CORBA
   local interface Current {};
 };
 
-#pragma prefix ""
+
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 4edd00a402b..b7fb298d3f1 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -19,17 +19,25 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/CurrentC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
+#include "CurrentC.h"
 #include "tao/Sequence_T.h"
+#include "tao/Any_T.h"
 
 #if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/CurrentC.i"
+#include "CurrentC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int CORBA::Current::_tao_class_id = 0;
 
 CORBA::Current_ptr
@@ -75,12 +83,24 @@ tao_CORBA_Current_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_Current_marshal (
+    CORBA::Current_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
-// Operations for class CORBA::Current_var
+// CORBA::Current_var
 // *************************************************************
 
-CORBA::Current_var::Current_var (void) // default constructor
-  : ptr_ (CORBA::Current::_nil ())
+CORBA::Current_var::Current_var (void)
+  : ptr_ (Current::_nil ())
 {}
 
 ::CORBA::Current_ptr
@@ -89,18 +109,18 @@ CORBA::Current_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::Current_var::Current_var (const ::CORBA::Current_var &p) // copy constructor
+CORBA::Current_var::Current_var (const ::CORBA::Current_var &p)
   : TAO_Base_var (),
-    ptr_ (CORBA::Current::_duplicate (p.ptr ()))
+    ptr_ (Current::_duplicate (p.ptr ()))
 {}
 
-CORBA::Current_var::~Current_var (void) // destructor
+CORBA::Current_var::~Current_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
 CORBA::Current_var &
-CORBA::Current_var::operator= (CORBA::Current_ptr p)
+CORBA::Current_var::operator= (Current_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
@@ -123,7 +143,7 @@ CORBA::Current_var::operator const ::CORBA::Current_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA::Current_var::operator ::CORBA::Current_ptr &() // cast
+CORBA::Current_var::operator ::CORBA::Current_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -164,13 +184,13 @@ CORBA::Current_var::_retn (void)
 }
 
 ::CORBA::Current_ptr
-CORBA::Current_var::tao_duplicate (CORBA::Current_ptr p)
+CORBA::Current_var::tao_duplicate (Current_ptr p)
 {
   return ::CORBA::Current::_duplicate (p);
 }
 
 void
-CORBA::Current_var::tao_release (CORBA::Current_ptr p)
+CORBA::Current_var::tao_release (Current_ptr p)
 {
   CORBA::release (p);
 }
@@ -193,36 +213,39 @@ CORBA::Current_var::tao_narrow (
 CORBA::Object *
 CORBA::Current_var::tao_upcast (void *src)
 {
-  CORBA::Current **tmp =
-    ACE_static_cast (CORBA::Current **, src);
+  Current **tmp =
+    ACE_static_cast (Current **, src);
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
-// Operations for class CORBA::Current_out
+// CORBA::Current_out
 // *************************************************************
 
-CORBA::Current_out::Current_out (CORBA::Current_ptr &p)
+CORBA::Current_out::Current_out (Current_ptr &p)
   : ptr_ (p)
 {
   this->ptr_ = ::CORBA::Current::_nil ();
 }
 
-CORBA::Current_out::Current_out (CORBA::Current_var &p) // constructor from _var
+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) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::Current_out &, p).ptr_)
+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 (CORBA::Current_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
   return *this;
 }
 
@@ -234,7 +257,7 @@ CORBA::Current_out::operator= (const ::CORBA::Current_var &p)
 }
 
 CORBA::Current_out &
-CORBA::Current_out::operator= (CORBA::Current_ptr p)
+CORBA::Current_out::operator= (Current_ptr p)
 {
   this->ptr_ = p;
   return *this;
@@ -246,7 +269,7 @@ CORBA::Current_out::operator ::CORBA::Current_ptr &() // cast
 }
 
 ::CORBA::Current_ptr &
-CORBA::Current_out::ptr (void) // ptr
+CORBA::Current_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -257,66 +280,93 @@ CORBA::Current_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
-// default constructor
 CORBA::Current::Current (void)
 {}
 
-  // destructor
-  CORBA::Current::~Current (void)
-  {}
+CORBA::Current::~Current (void)
+{}
 
-  CORBA::Current_ptr CORBA::Current::_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-  {
-    return CORBA::Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-  }
+void 
+CORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
 
-  CORBA::Current_ptr CORBA::Current::_unchecked_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_NOT_USED
-    )
-  {
-    if (CORBA::is_nil (obj))
-      return CORBA::Current::_nil ();
-    return
-        ACE_reinterpret_cast
-          (
-            CORBA::Current_ptr,
-              obj->_tao_QueryInterface
-                (
-                  ACE_reinterpret_cast
-                    (
-                      ptr_arith_t,
-                      &CORBA::Current::_tao_class_id
-                    )
+CORBA::Current_ptr
+CORBA::Current::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Current_ptr 
+CORBA::Current::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return Current::_nil ();
+    }
+  
+  return
+      ACE_reinterpret_cast (
+          Current_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Current::_tao_class_id
                 )
-          );
+            )
+        );
 }
 
 CORBA::Current_ptr
-CORBA::Current::_duplicate (CORBA::Current_ptr obj)
+CORBA::Current::_duplicate (Current_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *CORBA::Current::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &CORBA::Current::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, Current)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -325,9 +375,118 @@ const char* CORBA::Current::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Current:1.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_Current[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  30,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4375), 
+  ACE_NTOHL (0x7272656e), 
+  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Current:1.0
+    8,
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_Current),
+    (char *) &_oc_CORBA_Current,
+    0,
+    sizeof (CORBA::Current)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Current,
+    &_tc_TAO_tc_CORBA_Current
+  )
+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::Current_ptr _tao_elem
+  )
+{
+  CORBA::Current_ptr _tao_objptr =
+    CORBA::Current::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Current_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::Current>::insert (
+      _tao_any,
+      CORBA::Current::_tao_any_destructor,
+      CORBA::_tc_Current,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Current_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::Current>::extract (
+        _tao_any,
+        CORBA::Current::_tao_any_destructor,
+        CORBA::_tc_Current,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::Current>::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::Current,CORBA::Current_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::Current,CORBA::Current_var>
+  template class TAO_Object_Manager<CORBA::Current,CORBA::Current_var>;
+  template class TAO::Any_Impl_T<CORBA::Current>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::Current, CORBA::Current_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::Current>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::Current>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::Current>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index b259236cc94..bb7416ffd9b 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_CORBA_CURRENTC_H_
-#define _TAO_IDL_CORBA_CURRENTC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_CURRENTC_H_
+#define _TAO_IDL_ORIG_CURRENTC_H_
 
 #include "ace/pre.h"
 #include "tao/Object.h"
@@ -29,6 +32,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
 #include "tao/corbafwd.h"
 #include "tao/varbase.h"
 
@@ -65,7 +69,6 @@ namespace CORBA
 
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_CURRENT___VAR_CH_)
 #define _CORBA_CURRENT___VAR_CH_
 
@@ -91,7 +94,7 @@ namespace CORBA
     Current_ptr ptr (void) const;
 
     // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
+    // 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);
@@ -111,7 +114,6 @@ namespace CORBA
 
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_CURRENT___OUT_CH_)
 #define _CORBA_CURRENT___OUT_CH_
 
@@ -134,7 +136,9 @@ namespace CORBA
 
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_CURRENT_CH_)
 #define _CORBA_CURRENT_CH_
@@ -143,37 +147,40 @@ namespace CORBA
     : public virtual CORBA::Object
   {
   public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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);
+        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);
-
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
 
     static Current_ptr _nil (void)
-    {
-      return (Current_ptr)0;
-    }
-
+      {
+        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
+    
     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:
@@ -185,14 +192,28 @@ namespace CORBA
 #endif /* end #if !defined */
 }  // End namespace CORBA 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
-#include "tao/CurrentC.i"
+#include "CurrentC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -205,3 +226,4 @@ namespace CORBA
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/CurrentC.i b/TAO/tao/CurrentC.i
index 715f8a9322c..9cb6f83b66b 100644
--- a/TAO/tao/CurrentC.i
+++ b/TAO/tao/CurrentC.i
@@ -20,9 +20,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
 #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/Domain.pidl b/TAO/tao/Domain.pidl
index ea5489673c1..df8f168b268 100644
--- a/TAO/tao/Domain.pidl
+++ b/TAO/tao/Domain.pidl
@@ -14,7 +14,7 @@
  *   command used for this is:
  *
  *     tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/corbafwd.h"
  *          -Wb,pre_include="ace/pre.h"
@@ -73,6 +73,4 @@ module CORBA
   typedef sequence <DomainManager> DomainManagerList;
 };
 
-#pragma prefix ""
-
 #endif /* TAO_CORBA_DOMAIN_IDL */
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index 039dc208e8c..08e219655e6 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -19,11 +19,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_DOMAINS_CPP_
-#define _TAO_IDL_DOMAINS_CPP_
 
-#include "DomainS.h"
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:670
+
+#ifndef _TAO_IDL_ORIG_DOMAINS_CPP_
+#define _TAO_IDL_ORIG_DOMAINS_CPP_
+
 
+#include "DomainS.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
@@ -31,7 +35,6 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/PortableInterceptor.h"
-
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #include "tao/PICurrent.h"
@@ -50,6 +53,11 @@
 #include "DomainS.i"
 #endif /* !defined INLINE */
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
+
 class TAO_CORBA_DomainManager_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -57,9 +65,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:13:07 */
+
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/beguine/bala/patches/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_DomainManager_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_DomainManager_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_DomainManager_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -79,7 +87,7 @@ TAO_CORBA_DomainManager_Perfect_Hash_OpTable::hash (const char *str, unsigned in
      18, 18, 18, 18, 18, 18, 18, 18, 18,  0,
      18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
      18, 18, 18, 18, 18, 18, 18, 18, 18,  0,
-     18, 18, 18,  0, 18,  0, 18, 18, 18, 18,
+     18, 18, 18,  5, 18,  0, 18, 18, 18, 18,
      18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
      18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
      18, 18, 18,  0, 18, 18, 18, 18,  0, 18,
@@ -103,7 +111,7 @@ TAO_CORBA_DomainManager_Perfect_Hash_OpTable::hash (const char *str, unsigned in
      18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
      18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
      18, 18, 18, 18, 18,  0, 18,  0, 18, 18,
-     18,  0, 18,  0, 18, 18, 18, 18, 18, 18,
+     18,  5, 18,  0, 18, 18, 18, 18, 18, 18,
      18, 18, 18, 18, 18, 18,  0, 18, 18, 18,
      18,  0, 18, 18, 18, 18, 18, 18,
 #endif /* ACE_MVS */
@@ -116,14 +124,14 @@ TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned
 {
   enum
     {
-      TOTAL_KEYWORDS = 4,
+      TOTAL_KEYWORDS = 5,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 17,
       MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 17,
       HASH_VALUE_RANGE = 13,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 9
+      WORDLIST_SIZE = 10
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
@@ -131,11 +139,13 @@ TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned
       {"",0},{"",0},{"",0},{"",0},{"",0},
       {"_is_a",  &POA_CORBA::DomainManager::_is_a_skel},
       {"",0},{"",0},{"",0},{"",0},
-      {"_interface",  &POA_CORBA::DomainManager::_interface_skel},
+      {"_component",  &POA_CORBA::DomainManager::_component_skel},
       {"",0},{"",0},
       {"_non_existent",  &POA_CORBA::DomainManager::_non_existent_skel},
-      {"",0},{"",0},{"",0},
-      {"get_domain_policy",     &POA_CORBA::DomainManager::get_domain_policy_skel},
+      {"",0},
+      {"_interface",  &POA_CORBA::DomainManager::_interface_skel},
+      {"",0},
+      {"get_domain_policy", 	&POA_CORBA::DomainManager::get_domain_policy_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -152,61 +162,79 @@ TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned
     }
   return 0;
 }
-/* ending time is 11:13:07 */
 static TAO_CORBA_DomainManager_Perfect_Hash_OpTable tao_CORBA_DomainManager_optable;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
+
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::DomainManager *tao_impl
-    ,
-    const CORBA::PolicyType & policy_type ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_CORBA::DomainManager *tao_impl,
+      const CORBA::PolicyType & policy_type
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::Policy_ptr result);
 
 private:
-  TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy (const TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy &);
-  void operator= (const TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy &);
-
+  TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy (
+      const TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy &
+    );
+  
 private:
   POA_CORBA::DomainManager *_tao_impl;
-  const CORBA::PolicyType & policy_type_;
-  ::CORBA::Policy_ptr _result;
+  
+  const CORBA::PolicyType & policy_type_;::CORBA::Policy_ptr _result;
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::DomainManager *tao_impl,
-    const CORBA::PolicyType & policy_type ACE_ENV_ARG_DECL_NOT_USED
+    const CORBA::PolicyType & policy_type
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -214,41 +242,45 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestIn
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
-    (*parameter_list)[len].argument <<= policy_type_;
+  
+  (*parameter_list)[len].argument <<= policy_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -256,17 +288,18 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SIN
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
 char *
 TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -276,13 +309,14 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_most_derived
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (::CORBA::Policy_ptr result)
 {
   // Update the result.
@@ -295,6 +329,9 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (::CORBA::Po
 //            Strategized Proxy Broker Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+
 // Factory function Implementation.
 POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker *POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::the_TAO_DomainManager_Strategized_Proxy_Broker (void)
 {
@@ -305,15 +342,21 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker *POA_CORBA::_TAO_DomainMa
 POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::_TAO_DomainManager_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    this->proxy_cache_[i] = 0;
-
+    {
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    delete this->proxy_cache_[i];
-
+    {
+      delete this->proxy_cache_[i];
+      
+      // Hack to prevent bug mentioned in 1204. Refer to 1204
+      // for details..
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 CORBA::_TAO_DomainManager_Proxy_Impl&
@@ -324,26 +367,27 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::select_proxy (
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
+  
   if (this->proxy_cache_[strategy] != 0)
-    return *this->proxy_cache_[strategy];
-
+    {
+      return *this->proxy_cache_[strategy];
+    }
+  
   this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   return *this->proxy_cache_[strategy];
-
 }
 
-void
+void 
 POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::create_proxy (
     int strategy
     ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
+  
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -356,7 +400,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
@@ -365,7 +409,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
@@ -375,17 +419,16 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
-      }
-
-  }
+        }
+    }
 }
 
-
 //
 //        End Strategized Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 CORBA::_TAO_DomainManager_Proxy_Broker *
 CORBA__TAO_DomainManager_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -397,13 +440,13 @@ CORBA__TAO_DomainManager_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 int
 CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (long)
 {
-  CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer =
+  CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer = 
     CORBA__TAO_DomainManager_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int CORBA__TAO_DomainManager_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+static int CORBA__TAO_DomainManager_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
   CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer));
 
 
@@ -411,11 +454,17 @@ static int CORBA__TAO_DomainManager_Proxy_Broker_Stub_Factory_Initializer_Scarec
 //                 ThruPOA Proxy  Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+
 POA_CORBA::_TAO_DomainManager_ThruPOA_Proxy_Impl::_TAO_DomainManager_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 ::CORBA::Policy_ptr POA_CORBA::_TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy (
     CORBA::Object *_collocated_tao_target_,
     CORBA::PolicyType policy_type
@@ -438,23 +487,25 @@ POA_CORBA::_TAO_DomainManager_ThruPOA_Proxy_Impl::_TAO_DomainManager_ThruPOA_Pro
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK_RETURN (_tao_retval._retn ());
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
   ACE_CHECK_RETURN (_tao_retval._retn ());
+  
   return ACE_reinterpret_cast (
       POA_CORBA::DomainManager_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:omg.org/CORBA/DomainManager:1.0"
         )
     )->get_domain_policy (
-        policy_type ACE_ENV_ARG_PARAMETER
+        
+        policy_type
+        ACE_ENV_ARG_PARAMETER
       );
-}
-
-//
+}//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -469,23 +520,27 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::_TAO_DomainManager_Direct_Proxy
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   return ACE_reinterpret_cast (
       POA_CORBA::DomainManager_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/DomainManager:1.0")
     )->get_domain_policy (
-          policy_type ACE_ENV_ARG_PARAMETER
+          
+          policy_type
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:100
+
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
+
 POA_CORBA::DomainManager::DomainManager (void)
 {
   this->optable_ = &tao_CORBA_DomainManager_optable;
@@ -499,9 +554,12 @@ POA_CORBA::DomainManager::~DomainManager (void)
 {
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+
 void POA_CORBA::DomainManager::get_domain_policy_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -510,57 +568,69 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
   POA_CORBA::DomainManager *_tao_impl =
     ACE_static_cast (
         POA_CORBA::DomainManager *,
-        _tao_object_reference
+        _tao_servant
       );
   ::CORBA::Policy_var _tao_retval;
   CORBA::PolicyType policy_type;
+  
   if (!(
-    (_tao_in >> policy_type)
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> policy_type)
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      policy_type ACE_ENV_ARG_PARAMETER
+      
+      policy_type
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-        _tao_retval =
-        _tao_impl->get_domain_policy (
-            policy_type ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            _tao_retval = 
+            _tao_impl->get_domain_policy (
+                
+                policy_type
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
+          _tao_ri.result (_tao_retval_info);
+          _tao_retval = _tao_retval_info;
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
-      _tao_ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -570,105 +640,135 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
-        ACE_RE_THROW;
+        {
+          ACE_RE_THROW;
+        }
     }
+  
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << _tao_retval.in ())
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_CORBA::DomainManager::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference;
+  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_servant;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
+  
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_CORBA::DomainManager::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference;
+  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_servant;
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_CORBA::DomainManager::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference;
+  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_servant;
   CORBA::InterfaceDef_ptr _tao_retval = 0;
   CORBA::Boolean _tao_result = 0;
-
+  
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   ACE_TRY
     {
-      _tao_retval =
+      _tao_retval = 
         _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       _tao_server_request.init_reply ();
-
+      
       TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+      
       _tao_result =
         _tao_adapter->interfacedef_cdr_insert (
             _tao_out,
@@ -680,35 +780,72 @@ void POA_CORBA::DomainManager::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
 }
 
+void POA_CORBA::DomainManager::_component_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* Servant_Upcall */
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference;
+  CORBA::Object_var _tao_retval =
+    _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  _tao_server_request.init_reply ();
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
+  if (!(_tao_out << _tao_retval._retn ()))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
 CORBA::Boolean POA_CORBA::DomainManager::_is_a (
     const char* value
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  const char *base_id = "IDL:org.omg/CORBA/Object:1.0";
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, base_id)))
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/DomainManager:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:org.omg/CORBA/Object:1.0"
+        )
+     )
+    {
       return 1;
-    else
+    }
+  else
+    {
       return 0;
+    }
 }
 
 void* POA_CORBA::DomainManager::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/DomainManager:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::DomainManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:omg.org/CORBA/DomainManager:1.0") == 0)
+    {
+      return ACE_static_cast (POA_CORBA::DomainManager_ptr, this);
+    }
+  
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:omg.org/CORBA/Object:1.0") == 0)
+    {
+      return ACE_static_cast(PortableServer::Servant, this);
+    }
+  
   return 0;
 }
 
@@ -717,6 +854,9 @@ const char* POA_CORBA::DomainManager::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/DomainManager:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
+
 void POA_CORBA::DomainManager::_dispatch (
     TAO_ServerRequest &req,
     void *servant_upcall
@@ -729,29 +869,50 @@ void POA_CORBA::DomainManager::_dispatch (
                                      ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
-CORBA::DomainManager*
+CORBA::DomainManager *
 POA_CORBA::DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
-
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              1,
+              this
+            ),
+          0
+        );
+    }
   else
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              0,
+              this
+            ),
+          0
+        );
+    }
+  
   CORBA::Object_var obj = tmp;
-
   (void) safe_stub.release ();
-
   return ::CORBA::DomainManager::_unchecked_narrow (obj.in ());
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
 
 class TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -760,55 +921,55 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:13:07 */
+
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/beguine/bala/patches/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20,  0,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20,  0,
-     20,  0,  0,  0, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,  0, 20,
-     20, 20, 20,  0, 20, 20, 20, 20, 20, 20,
-     20, 20, 20,  0, 20, 20, 20, 20,  0, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
+     22,  0,  0,  5, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22,  0, 22,
+     22, 22, 22,  0, 22, 22, 22, 22, 22, 22,
+     22, 22, 22,  0, 22, 22, 22, 22,  0, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22,
 #else
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20,  0, 20,  0, 20,  0,
-      0,  0, 20, 20, 20, 20, 20, 20, 20,  0,
-     20, 20, 20, 20,  0, 20,  0, 20, 20, 20,
-     20,  0, 20, 20, 20, 20, 20, 20,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22,  0, 22,  0, 22,  0,
+      0,  5, 22, 22, 22, 22, 22, 22, 22,  0,
+     22, 22, 22, 22,  0, 22,  0, 22, 22, 22,
+     22,  0, 22, 22, 22, 22, 22, 22,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -819,31 +980,33 @@ TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsi
 {
   enum
     {
-      TOTAL_KEYWORDS = 7,
+      TOTAL_KEYWORDS = 8,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 19,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 19,
-      HASH_VALUE_RANGE = 16,
+      MAX_HASH_VALUE = 21,
+      HASH_VALUE_RANGE = 18,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 11
+      WORDLIST_SIZE = 12
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"copy",  &POA_CORBA::ConstructionPolicy::copy_skel},
+      {"copy", 	&POA_CORBA::ConstructionPolicy::copy_skel},
       {"_is_a",  &POA_CORBA::ConstructionPolicy::_is_a_skel},
       {"",0},
-      {"destroy",       &POA_CORBA::ConstructionPolicy::destroy_skel},
+      {"destroy", 	&POA_CORBA::ConstructionPolicy::destroy_skel},
       {"",0},{"",0},
-      {"_interface",  &POA_CORBA::ConstructionPolicy::_interface_skel},
+      {"_component",  &POA_CORBA::ConstructionPolicy::_component_skel},
       {"",0},{"",0},
       {"_non_existent",  &POA_CORBA::ConstructionPolicy::_non_existent_skel},
-      {"",0},{"",0},
-      {"_get_policy_type",      &POA_CORBA::ConstructionPolicy::_get_policy_type_skel},
-      {"",0},{"",0},
-      {"make_domain_manager",   &POA_CORBA::ConstructionPolicy::make_domain_manager_skel},
+      {"",0},
+      {"_interface",  &POA_CORBA::ConstructionPolicy::_interface_skel},
+      {"",0},{"",0},{"",0},
+      {"make_domain_manager", 	&POA_CORBA::ConstructionPolicy::make_domain_manager_skel},
+      {"",0},
+      {"_get_policy_type", 	&POA_CORBA::ConstructionPolicy::_get_policy_type_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -860,63 +1023,80 @@ TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsi
     }
   return 0;
 }
-/* ending time is 11:13:07 */
 static TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable tao_CORBA_ConstructionPolicy_optable;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
+
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::ConstructionPolicy *tao_impl
-    ,
-    CORBA::InterfaceDef_ptr object_type,
-    const CORBA::Boolean & constr_policy ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_CORBA::ConstructionPolicy *tao_impl,
+      CORBA::InterfaceDef_ptr object_type,
+      const CORBA::Boolean & constr_policy
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (const TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
-  void operator= (const TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
-
+  TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
+      const TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &
+    );
+  
 private:
   POA_CORBA::ConstructionPolicy *_tao_impl;
+  
   CORBA::InterfaceDef_ptr object_type_;
   const CORBA::Boolean & constr_policy_;
-
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ConstructionPolicy *tao_impl,
     CORBA::InterfaceDef_ptr object_type,
-    const CORBA::Boolean & constr_policy ACE_ENV_ARG_DECL_NOT_USED
+    const CORBA::Boolean & constr_policy
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -925,44 +1105,49 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
-    (*parameter_list)[len].argument <<=  this->object_type_;
+  
+  (*parameter_list)[len].argument <<=  this->object_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
+  
+  (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -970,13 +1155,14 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -986,7 +1172,8 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_most_
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
@@ -998,6 +1185,9 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_is_a
 //            Strategized Proxy Broker Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+
 // Factory function Implementation.
 POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker *POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void)
 {
@@ -1008,15 +1198,21 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker *POA_CORBA::_TAO_Con
 POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    this->proxy_cache_[i] = 0;
-
+    {
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    delete this->proxy_cache_[i];
-
+    {
+      delete this->proxy_cache_[i];
+      
+      // Hack to prevent bug mentioned in 1204. Refer to 1204
+      // for details..
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 CORBA::_TAO_ConstructionPolicy_Proxy_Impl&
@@ -1027,26 +1223,27 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy (
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
+  
   if (this->proxy_cache_[strategy] != 0)
-    return *this->proxy_cache_[strategy];
-
+    {
+      return *this->proxy_cache_[strategy];
+    }
+  
   this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   return *this->proxy_cache_[strategy];
-
 }
 
-void
+void 
 POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
     int strategy
     ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
+  
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -1059,7 +1256,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
@@ -1068,7 +1265,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
@@ -1078,17 +1275,16 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
-      }
-
-  }
+        }
+    }
 }
 
-
 //
 //        End Strategized Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 CORBA::_TAO_ConstructionPolicy_Proxy_Broker *
 CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -1100,13 +1296,13 @@ CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function (CORBA::Object_ptr o
 int
 CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (long)
 {
-  CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer =
+  CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer = 
     CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int CORBA__TAO_ConstructionPolicy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+static int CORBA__TAO_ConstructionPolicy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
   CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer));
 
 
@@ -1114,11 +1310,17 @@ static int CORBA__TAO_ConstructionPolicy_Proxy_Broker_Stub_Factory_Initializer_S
 //                 ThruPOA Proxy  Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+
 POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager (
     CORBA::Object *_collocated_tao_target_,
     CORBA::InterfaceDef_ptr object_type,
@@ -1129,6 +1331,7 @@ void POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager
     CORBA::SystemException
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -1140,25 +1343,26 @@ void POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
   ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_CORBA::ConstructionPolicy_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
         )
     )->make_domain_manager (
+        
         object_type,
-        constr_policy ACE_ENV_ARG_PARAMETER
+        constr_policy
+        ACE_ENV_ARG_PARAMETER
       );
-  return;
-}
-
-//
+}//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -1174,24 +1378,28 @@ void POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_CORBA::ConstructionPolicy_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/ConstructionPolicy:1.0")
     )->make_domain_manager (
+          
           object_type,
-          constr_policy ACE_ENV_ARG_PARAMETER
+          constr_policy
+          ACE_ENV_ARG_PARAMETER
         );
-
+  
 }
 
 
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:100
+
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
+
 POA_CORBA::ConstructionPolicy::ConstructionPolicy (void)
 {
   this->optable_ = &tao_CORBA_ConstructionPolicy_optable;
@@ -1206,9 +1414,12 @@ POA_CORBA::ConstructionPolicy::~ConstructionPolicy (void)
 {
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+
 void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -1217,58 +1428,73 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
   POA_CORBA::ConstructionPolicy *_tao_impl =
     ACE_static_cast (
         POA_CORBA::ConstructionPolicy *,
-        _tao_object_reference
+        _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::InterfaceDef_var object_type;
+  
+  CORBA::InterfaceDef_var object_type;
   CORBA::Boolean constr_policy;
+  
   if (!(
-    (_tao_in >> object_type.out ()) &&
-    (_tao_in >> CORBA::Any::to_boolean (constr_policy))
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> object_type.out ()) &&
+      (_tao_in >> CORBA::Any::to_boolean (constr_policy))
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       object_type.in (),
-      constr_policy ACE_ENV_ARG_PARAMETER
+      
+      constr_policy
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->make_domain_manager (
-            object_type.in (),
-            constr_policy ACE_ENV_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->make_domain_manager (
+                
+                object_type.in (),
+                
+                constr_policy
+                ACE_ENV_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -1278,98 +1504,128 @@ ACE_THROW (CORBA::MARSHAL ());
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
-        ACE_RE_THROW;
+        {
+          ACE_RE_THROW;
+        }
     }
+  
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_CORBA::ConstructionPolicy::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference;
+  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_servant;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
+  
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_CORBA::ConstructionPolicy::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference;
+  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_servant;
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_CORBA::ConstructionPolicy::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference;
+  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_servant;
   CORBA::InterfaceDef_ptr _tao_retval = 0;
   CORBA::Boolean _tao_result = 0;
-
+  
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   ACE_TRY
     {
-      _tao_retval =
+      _tao_retval = 
         _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       _tao_server_request.init_reply ();
-
+      
       TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+      
       _tao_result =
         _tao_adapter->interfacedef_cdr_insert (
             _tao_out,
@@ -1381,38 +1637,82 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
 }
 
+void POA_CORBA::ConstructionPolicy::_component_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* Servant_Upcall */
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference;
+  CORBA::Object_var _tao_retval =
+    _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  _tao_server_request.init_reply ();
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
+  if (!(_tao_out << _tao_retval._retn ()))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
 CORBA::Boolean POA_CORBA::ConstructionPolicy::_is_a (
     const char* value
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  const char *base_id = "IDL:org.omg/CORBA/Object:1.0";
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, base_id)))
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:org.omg/CORBA/Object:1.0"
+        )
+     )
+    {
       return 1;
-    else
+    }
+  else
+    {
       return 0;
+    }
 }
 
 void* POA_CORBA::ConstructionPolicy::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstructionPolicy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::ConstructionPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:omg.org/CORBA/ConstructionPolicy:1.0") == 0)
+    {
+      return ACE_static_cast (POA_CORBA::ConstructionPolicy_ptr, this);
+    }
+  
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:omg.org/CORBA/Policy:1.0") == 0)
+    {
+      return ACE_static_cast (POA_CORBA::Policy_ptr, this);
+    }
+  
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:omg.org/CORBA/Object:1.0") == 0)
+    {
+      return ACE_static_cast(PortableServer::Servant, this);
+    }
+  
   return 0;
 }
 
@@ -1421,6 +1721,9 @@ const char* POA_CORBA::ConstructionPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
+
 void POA_CORBA::ConstructionPolicy::_dispatch (
     TAO_ServerRequest &req,
     void *servant_upcall
@@ -1433,29 +1736,45 @@ void POA_CORBA::ConstructionPolicy::_dispatch (
                                      ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
-CORBA::ConstructionPolicy*
+CORBA::ConstructionPolicy *
 POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
-
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              1,
+              this
+            ),
+          0
+        );
+    }
   else
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              0,
+              this
+            ),
+          0
+        );
+    }
+  
   CORBA::Object_var obj = tmp;
-
   (void) safe_stub.release ();
-
   return ::CORBA::ConstructionPolicy::_unchecked_narrow (obj.in ());
 }
-
-
-
 #endif /* ifndef */
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index 88673a1c054..f0d49a089ed 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -19,16 +19,17 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_DOMAINS_H_
-#define _TAO_IDL_DOMAINS_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:443
 
-#include "ace/pre.h"
+#ifndef _TAO_IDL_ORIG_DOMAINS_H_
+#define _TAO_IDL_ORIG_DOMAINS_H_
 
+#include "ace/pre.h"
 #include "domain_export.h"
 #include "tao/PortableServer/PolicyS.h"
 #include "tao/DomainC.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -50,11 +51,17 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
+
 TAO_NAMESPACE  POA_CORBA
 {
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
+  
   class DomainManager;
   typedef DomainManager *DomainManager_ptr;
-  // Forward Classes Declaration
+  
   class _TAO_DomainManager_ThruPOA_Proxy_Impl;
   class _TAO_DomainManager_Direct_Proxy_Impl;
   class _TAO_DomainManager_Strategized_Proxy_Broker;
@@ -64,54 +71,63 @@ TAO_NAMESPACE  POA_CORBA
   {
   protected:
     DomainManager (void);
-
+  
   public:
     DomainManager (const DomainManager& rhs);
     virtual ~DomainManager (void);
-
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
-        void *obj,
+        void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
-        void *obj,
+        void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::CORBA::DomainManager *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual ::CORBA::Policy_ptr get_domain_policy (
         CORBA::PolicyType policy_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -119,22 +135,22 @@ TAO_NAMESPACE  POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-        static void get_domain_policy_skel (
+    
+    static void get_domain_policy_skel (
         TAO_ServerRequest &_tao_req,
-        void *_tao_obj,
+        void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
-
-  };
-
-
+  };  
+  
   ///////////////////////////////////////////////////////////////////////
   //               Strategized Proxy Broker Declaration
   //
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+  
   class TAO_Domain_Export _TAO_DomainManager_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_DomainManager_Proxy_Broker
   {
   public:
@@ -169,8 +185,7 @@ TAO_NAMESPACE  POA_CORBA
   public:
     static _TAO_DomainManager_Strategized_Proxy_Broker *the_TAO_DomainManager_Strategized_Proxy_Broker (void);
   };
-
-
+  
   //
   //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
@@ -179,16 +194,22 @@ TAO_NAMESPACE  POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-
-  class TAO_Domain_Export _TAO_DomainManager_ThruPOA_Proxy_Impl :
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  
+  class TAO_Domain_Export _TAO_DomainManager_ThruPOA_Proxy_Impl : 
     public virtual ::CORBA::_TAO_DomainManager_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl
   {
   public:
     _TAO_DomainManager_ThruPOA_Proxy_Impl (void);
-
-    virtual ~_TAO_DomainManager_ThruPOA_Proxy_Impl (void) { }
-
+    
+    virtual ~_TAO_DomainManager_ThruPOA_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::Policy_ptr get_domain_policy (
         CORBA::Object *_collocated_tao_target_,
         CORBA::PolicyType policy_type
@@ -197,260 +218,282 @@ TAO_NAMESPACE  POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-
   };
 
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////
+  //                    Direct  Impl. Declaration
+  //
 
-
-///////////////////////////////////////////////////////////////////////
-//                    Direct  Impl. Declaration
-//
-
-class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl :
-  public virtual CORBA::_TAO_DomainManager_Proxy_Impl,
-  public virtual TAO_Direct_Object_Proxy_Impl
-{
-public:
-  _TAO_DomainManager_Direct_Proxy_Impl (void);
-
-  virtual ~_TAO_DomainManager_Direct_Proxy_Impl (void) { }
-
-  virtual ::CORBA::Policy_ptr get_domain_policy (
-      CORBA::Object *_collocated_tao_target_,
-      CORBA::PolicyType policy_type
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
+  class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl : 
+    public virtual CORBA::_TAO_DomainManager_Proxy_Impl,
+    public virtual TAO_Direct_Object_Proxy_Impl
+  {
+  public:
+    _TAO_DomainManager_Direct_Proxy_Impl (void);
+  
+    virtual ~_TAO_DomainManager_Direct_Proxy_Impl (void) {}
+  
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
+    virtual ::CORBA::Policy_ptr get_domain_policy (
+        CORBA::Object *_collocated_tao_target_,
+        CORBA::PolicyType policy_type
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
   };
 
 
-//
-//                Direct  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  //
+  //                Direct  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
 
-class ConstructionPolicy;
-typedef ConstructionPolicy *ConstructionPolicy_ptr;
-// Forward Classes Declaration
-class _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl;
-class _TAO_ConstructionPolicy_Direct_Proxy_Impl;
-class _TAO_ConstructionPolicy_Strategized_Proxy_Broker;
+  class ConstructionPolicy;
+  typedef ConstructionPolicy *ConstructionPolicy_ptr;
 
-class TAO_Domain_Export ConstructionPolicy
-  : public virtual POA_CORBA::Policy
-{
-protected:
-  ConstructionPolicy (void);
-
-public:
-  ConstructionPolicy (const ConstructionPolicy& rhs);
-  virtual ~ConstructionPolicy (void);
+  class _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl;
+  class _TAO_ConstructionPolicy_Direct_Proxy_Impl;
+  class _TAO_ConstructionPolicy_Strategized_Proxy_Broker;
 
+  class TAO_Domain_Export ConstructionPolicy
+    : public virtual POA_CORBA::Policy
+  {
+  protected:
+    ConstructionPolicy (void);
 
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  public:
+    ConstructionPolicy (const ConstructionPolicy& rhs);
+    virtual ~ConstructionPolicy (void);
+  
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+  
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+  
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+  
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+  
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+  
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+  
+    ::CORBA::ConstructionPolicy *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+  
+    virtual const char* _interface_repository_id (void) const;
+  
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+  
+    virtual void make_domain_manager (
+        CORBA::InterfaceDef_ptr object_type,
+        CORBA::Boolean constr_policy
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+  
+    static void make_domain_manager_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );  static void _get_policy_type_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+  
+    static void copy_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+  
+    static void destroy_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
 
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration
+  //
 
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
 
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Broker
+  {
+  public:
+    _TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
 
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+    virtual ~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
 
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
+    virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl &select_proxy (
+      ::CORBA::ConstructionPolicy *object
       ACE_ENV_ARG_DECL
     );
 
-  ::CORBA::ConstructionPolicy *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-
-  virtual const char* _interface_repository_id (void) const;
-
-  virtual void make_domain_manager (
-      CORBA::InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-    static void make_domain_manager_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_obj,
-      void *_tao_servant_upcall
+  private:
+    // Helper methods that takes care to create the proxy
+    // as soon as their use is necessary.
+    void create_proxy (
+      int collocation_strategy
       ACE_ENV_ARG_DECL
     );
 
-  static void _get_policy_type_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-  static void copy_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-  static void destroy_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-
-};
-
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
-//
-
-class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Broker
-{
-public:
-  _TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
-
-  virtual ~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
-
-  virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl &select_proxy (
-    ::CORBA::ConstructionPolicy *object
-    ACE_ENV_ARG_DECL
-  );
-
-private:
-  // Helper methods that takes care to create the proxy
-  // as soon as their use is necessary.
-  void create_proxy (
-    int collocation_strategy
-    ACE_ENV_ARG_DECL
-  );
-
-  // Caches the proxy implementations. The proxy implementation
-  // are totally stateless, and those can be shared by all the
-  // instances of a given IDL interface type.
-  ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl
-  *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
-  TAO_SYNCH_MUTEX mutex_;
-  // This funxtion is used to get an handle to the unique instance
-  // of the Strategized Proxy Broker that is available for a given
-  // interface.
-
-public:
-  static _TAO_ConstructionPolicy_Strategized_Proxy_Broker *the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
-};
-
-
-//
-//            End Strategized Proxy Broker Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA  Impl. Declaration
-//
-
-class TAO_Domain_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl :
-  public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl,
-  public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl
-
-{
-public:
-  _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void);
+    // Caches the proxy implementations. The proxy implementation
+    // are totally stateless, and those can be shared by all the
+    // instances of a given IDL interface type.
+    ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl
+    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
 
-  virtual ~_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void) { }
+    TAO_SYNCH_MUTEX mutex_;
+    // This funxtion is used to get an handle to the unique instance
+    // of the Strategized Proxy Broker that is available for a given
+    // interface.
 
-  virtual void make_domain_manager (
-      CORBA::Object *_collocated_tao_target_,
-      CORBA::InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  public:
+    static _TAO_ConstructionPolicy_Strategized_Proxy_Broker *the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
+  };
 
+  //
+  //            End Strategized Proxy Broker Declaration
+  ///////////////////////////////////////////////////////////////////////
 
-};
 
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA  Impl. Declaration
+  //
 
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
 
-///////////////////////////////////////////////////////////////////////
-//                    Direct  Impl. Declaration
-//
+  class TAO_Domain_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl : 
+    public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl,
+    public virtual TAO_ThruPOA_Object_Proxy_Impl,
+    public virtual ::POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void);
+  
+    virtual ~_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl (void) {}
+  
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
+    virtual void make_domain_manager (
+        CORBA::Object *_collocated_tao_target_,
+        CORBA::InterfaceDef_ptr object_type,
+        CORBA::Boolean constr_policy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
 
-class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl :
-  public virtual CORBA::_TAO_ConstructionPolicy_Proxy_Impl,
-  public virtual TAO_Direct_Object_Proxy_Impl,
-  public virtual POA_CORBA::_TAO_Policy_Direct_Proxy_Impl
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////
+  //                    Direct  Impl. Declaration
+  //
 
-{
-public:
-  _TAO_ConstructionPolicy_Direct_Proxy_Impl (void);
+  class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl : 
+    public virtual CORBA::_TAO_ConstructionPolicy_Proxy_Impl,
+    public virtual TAO_Direct_Object_Proxy_Impl,
+    public virtual POA_CORBA::_TAO_Policy_Direct_Proxy_Impl
 
-  virtual ~_TAO_ConstructionPolicy_Direct_Proxy_Impl (void) { }
+  {
+  public:
+    _TAO_ConstructionPolicy_Direct_Proxy_Impl (void);
+  
+    virtual ~_TAO_ConstructionPolicy_Direct_Proxy_Impl (void) {}
+  
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
+    virtual void make_domain_manager (
+        CORBA::Object *_collocated_tao_target_,
+        CORBA::InterfaceDef_ptr object_type,
+        CORBA::Boolean constr_policy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
 
-  virtual void make_domain_manager (
-      CORBA::Object *_collocated_tao_target_,
-      CORBA::InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
 
-  };
+  //
+  //                Direct  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 
-//
-//                Direct  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
+
 #include "DomainS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Domain/DomainS.i b/TAO/tao/Domain/DomainS.i
index b7ba296aa77..c1c63172d4b 100644
--- a/TAO/tao/Domain/DomainS.i
+++ b/TAO/tao/Domain/DomainS.i
@@ -18,7 +18,6 @@
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
-
 ACE_INLINE void POA_CORBA::ConstructionPolicy::_get_policy_type_skel (
     TAO_ServerRequest &req,
     void *obj,
@@ -34,6 +33,10 @@ ACE_INLINE void POA_CORBA::ConstructionPolicy::_get_policy_type_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+
 ACE_INLINE void POA_CORBA::ConstructionPolicy::copy_skel (
     TAO_ServerRequest &req,
     void *obj,
@@ -49,6 +52,10 @@ ACE_INLINE void POA_CORBA::ConstructionPolicy::copy_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+
 ACE_INLINE void POA_CORBA::ConstructionPolicy::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
@@ -64,3 +71,4 @@ ACE_INLINE void POA_CORBA::ConstructionPolicy::destroy_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
diff --git a/TAO/tao/Domain/DomainS_T.cpp b/TAO/tao/Domain/DomainS_T.cpp
index 9fcddd72ad1..90e0a078278 100644
--- a/TAO/tao/Domain/DomainS_T.cpp
+++ b/TAO/tao/Domain/DomainS_T.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_DOMAINS_T_CPP_
-#define _TAO_IDL_DOMAINS_T_CPP_
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:777
+
+#ifndef _TAO_IDL_ORIG_DOMAINS_T_CPP_
+#define _TAO_IDL_ORIG_DOMAINS_T_CPP_
 
 #include "DomainS_T.h"
 
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
index 7917bd69268..ad0fa630cc1 100644
--- a/TAO/tao/Domain/DomainS_T.h
+++ b/TAO/tao/Domain/DomainS_T.h
@@ -19,10 +19,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_DOMAINS_T_H_
-#define _TAO_IDL_DOMAINS_T_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:604
+
+#ifndef _TAO_IDL_ORIG_DOMAINS_T_H_
+#define _TAO_IDL_ORIG_DOMAINS_T_H_
 
 #include "ace/pre.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -30,9 +34,17 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+
 #if defined (ACE_HAS_USING_KEYWORD)
 TAO_NAMESPACE  POA_CORBA
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  DomainManager_tie : public DomainManager
@@ -42,9 +54,13 @@ TAO_NAMESPACE  POA_CORBA
     // the T& ctor
     DomainManager_tie (T &t, PortableServer::POA_ptr poa);
     // ctor taking a POA
-    DomainManager_tie (T *tp, CORBA::Boolean release=1);
+    DomainManager_tie (T *tp, CORBA::Boolean release = 1);
     // ctor taking pointer and an ownership flag
-    DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    DomainManager_tie (
+        T *tp,
+        PortableServer::POA_ptr poa,
+        CORBA::Boolean release = 1
+      );
     // ctor with T*, ownership flag and a POA
     ~DomainManager_tie (void);
     // dtor
@@ -54,7 +70,7 @@ TAO_NAMESPACE  POA_CORBA
     // return the underlying object
     void _tied_object (T &obj);
     // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
+    void _tied_object (T *obj, CORBA::Boolean release = 1);
     // set the underlying object and the ownership flag
     CORBA::Boolean _is_owner (void);
     // do we own it
@@ -65,6 +81,10 @@ TAO_NAMESPACE  POA_CORBA
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
     ::CORBA::Policy_ptr get_domain_policy (
         CORBA::PolicyType policy_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -72,8 +92,8 @@ TAO_NAMESPACE  POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-      private:
+  
+  private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
@@ -82,7 +102,10 @@ TAO_NAMESPACE  POA_CORBA
     DomainManager_tie (const DomainManager_tie &);
     void operator= (const DomainManager_tie &);
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  ConstructionPolicy_tie : public ConstructionPolicy
@@ -92,9 +115,13 @@ TAO_NAMESPACE  POA_CORBA
     // the T& ctor
     ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa);
     // ctor taking a POA
-    ConstructionPolicy_tie (T *tp, CORBA::Boolean release=1);
+    ConstructionPolicy_tie (T *tp, CORBA::Boolean release = 1);
     // ctor taking pointer and an ownership flag
-    ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    ConstructionPolicy_tie (
+        T *tp,
+        PortableServer::POA_ptr poa,
+        CORBA::Boolean release = 1
+      );
     // ctor with T*, ownership flag and a POA
     ~ConstructionPolicy_tie (void);
     // dtor
@@ -104,7 +131,7 @@ TAO_NAMESPACE  POA_CORBA
     // return the underlying object
     void _tied_object (T &obj);
     // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
+    void _tied_object (T *obj, CORBA::Boolean release = 1);
     // set the underlying object and the ownership flag
     CORBA::Boolean _is_owner (void);
     // do we own it
@@ -115,6 +142,10 @@ TAO_NAMESPACE  POA_CORBA
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
     void make_domain_manager (
         CORBA::InterfaceDef_ptr object_type,
         CORBA::Boolean constr_policy
@@ -124,31 +155,37 @@ TAO_NAMESPACE  POA_CORBA
         CORBA::SystemException
       ));
     
-        CORBA::PolicyType policy_type (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
     
-        ::CORBA::Policy_ptr copy (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
     
-        void destroy (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-      private:
+  
+  private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
@@ -157,21 +194,21 @@ TAO_NAMESPACE  POA_CORBA
     ConstructionPolicy_tie (const ConstructionPolicy_tie &);
     void operator= (const ConstructionPolicy_tie &);
   };
-
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 #endif /* ACE_HAS_USING_KEYWORD */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
+
 #if defined (__ACE_INLINE__)
 #include "DomainS_T.i"
 #endif /* defined INLINE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "DomainS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #pragma implementation ("DomainS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
diff --git a/TAO/tao/Domain/DomainS_T.i b/TAO/tao/Domain/DomainS_T.i
index 48d19cf6f72..5757bfa23d1 100644
--- a/TAO/tao/Domain/DomainS_T.i
+++ b/TAO/tao/Domain/DomainS_T.i
@@ -19,6 +19,10 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
+
 #if defined (ACE_HAS_USING_KEYWORD)
 
 template <class T> ACE_INLINE
@@ -52,7 +56,10 @@ POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T *tp, PortableServer::POA_p
 template <class T> ACE_INLINE
 POA_CORBA::DomainManager_tie<T>::~DomainManager_tie (void)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
 }
 
 template <class T> ACE_INLINE T *
@@ -64,7 +71,11 @@ POA_CORBA::DomainManager_tie<T>::_tied_object (void)
 template <class T> ACE_INLINE void
 POA_CORBA::DomainManager_tie<T>::_tied_object (T &obj)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -72,7 +83,11 @@ POA_CORBA::DomainManager_tie<T>::_tied_object (T &obj)
 template <class T> ACE_INLINE void
 POA_CORBA::DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -93,11 +108,16 @@ template <class T> ACE_INLINE PortableServer::POA_ptr
 POA_CORBA::DomainManager_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
+    {
+      return PortableServer::POA::_duplicate (this->poa_.in ());
+    }
+  
   return this->DomainManager::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::DomainManager_tie<T>::get_domain_policy  (
     CORBA::PolicyType policy_type
@@ -108,12 +128,16 @@ template <class T> ACE_INLINE
   ))
 {
   return this->ptr_->get_domain_policy (
-policy_type ACE_ENV_ARG_PARAMETER
+    policy_type
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
+
 #if defined (ACE_HAS_USING_KEYWORD)
 
 template <class T> ACE_INLINE
@@ -147,7 +171,10 @@ POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T *tp, PortableSer
 template <class T> ACE_INLINE
 POA_CORBA::ConstructionPolicy_tie<T>::~ConstructionPolicy_tie (void)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
 }
 
 template <class T> ACE_INLINE T *
@@ -159,7 +186,11 @@ POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (void)
 template <class T> ACE_INLINE void
 POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T &obj)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -167,7 +198,11 @@ POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T &obj)
 template <class T> ACE_INLINE void
 POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -188,11 +223,16 @@ template <class T> ACE_INLINE PortableServer::POA_ptr
 POA_CORBA::ConstructionPolicy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
+    {
+      return PortableServer::POA::_duplicate (this->poa_.in ());
+    }
+  
   return this->ConstructionPolicy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
     CORBA::InterfaceDef_ptr object_type,
@@ -204,14 +244,17 @@ void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
   ))
 {
   this->ptr_->make_domain_manager (
-object_type,
-    constr_policy ACE_ENV_ARG_PARAMETER
+    object_type,
+    constr_policy
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA::ConstructionPolicy_tie<T>::policy_type  (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -219,13 +262,15 @@ CORBA::PolicyType POA_CORBA::ConstructionPolicy_tie<T>::policy_type  (
   ))
 {
   return this->ptr_->policy_type (
-ACE_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::ConstructionPolicy_tie<T>::copy  (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -233,13 +278,15 @@ template <class T> ACE_INLINE
   ))
 {
   return this->ptr_->copy (
-ACE_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_CORBA::ConstructionPolicy_tie<T>::destroy  (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -247,7 +294,7 @@ void POA_CORBA::ConstructionPolicy_tie<T>::destroy  (
   ))
 {
   this->ptr_->destroy (
-ACE_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/tao/Domain/Makefile b/TAO/tao/Domain/Makefile
index 7daee1a0515..3fb7d5c03c6 100644
--- a/TAO/tao/Domain/Makefile
+++ b/TAO/tao/Domain/Makefile
@@ -61,359 +61,364 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainS.h \
- $(ACE_ROOT)/ace/pre.h \
- domain_export.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(TAO_ROOT)/tao/PortableServer/PolicyS.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Time_Value.inl \
- $(ACE_ROOT)/ace/Default_Constants.h \
- $(ACE_ROOT)/ace/Global_Macros.h \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(ACE_ROOT)/ace/Exception_Macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Policy_ForwardC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/String_Base.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/String_Base_Const.h \
- $(ACE_ROOT)/ace/String_Base.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/String_Base.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Policy_ForwardC.i \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(ACE_ROOT)/ace/Atomic_Op.h \
- $(ACE_ROOT)/ace/Atomic_Op_T.h \
- $(ACE_ROOT)/ace/Atomic_Op_T.i \
- $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/PolicyS_T.h \
- $(TAO_ROOT)/tao/PortableServer/PolicyS_T.i \
- $(TAO_ROOT)/tao/PortableServer/PolicyS_T.cpp \
- $(TAO_ROOT)/tao/PortableServer/PolicyS.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/objectid.h \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/AbstractBase.h \
- $(TAO_ROOT)/tao/AbstractBase.inl \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
- $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(TAO_ROOT)/tao/DomainC.i \
- DomainS_T.h DomainS_T.i DomainS_T.cpp DomainS.i \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
- $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/DLL.h \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/XML_Svc_Conf.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
- $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
- $(TAO_ROOT)/tao/Policy_Validator.h \
- $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
- $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
- $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
- $(TAO_ROOT)/tao/Policy_Set.h \
- $(TAO_ROOT)/tao/Policy_Set.i \
- $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
- $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/PICurrent.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(TAO_ROOT)/tao/PICurrent.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Framework_Component.h \
- $(ACE_ROOT)/ace/Framework_Component.inl \
- $(ACE_ROOT)/ace/Framework_Component_T.h \
- $(ACE_ROOT)/ace/Framework_Component_T.inl \
- $(ACE_ROOT)/ace/Framework_Component_T.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/RequestInfo_Util.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
- $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
- $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \
- $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
- $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
- $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
- $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
- $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
- $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
- $(ACE_ROOT)/ace/Dynamic_Service.i \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
+.obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainS.h $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(TAO_ROOT)/tao/PortableServer/PolicyS.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/PolicyS_T.h \
+  $(TAO_ROOT)/tao/PortableServer/PolicyS_T.i \
+  $(TAO_ROOT)/tao/PortableServer/PolicyS_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/PolicyS.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/DomainC.i DomainS_T.h DomainS_T.i \
+  DomainS_T.cpp DomainS.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+  $(ACE_ROOT)/ace/Map_T.h \
+  $(ACE_ROOT)/ace/Pair_T.h \
+  $(ACE_ROOT)/ace/Pair_T.i \
+  $(ACE_ROOT)/ace/Pair_T.cpp \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Active_Map_Manager.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Map_T.i \
+  $(ACE_ROOT)/ace/Map_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
+  $(TAO_ROOT)/tao/Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Server_Request.h \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/PICurrent.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/PICurrent.inl \
+  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
+  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \
+  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index de85cbcd4a1..dd328c053a0 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "DomainC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "DomainC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -42,9 +45,8 @@
 #include "DomainC.i"
 #endif /* !defined INLINE */
 
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::DomainManager::_tao_class_id = 0;
 
@@ -91,13 +93,23 @@ tao_CORBA_DomainManager_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_DomainManager_marshal (
+    CORBA::DomainManager_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::DomainManager_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::DomainManager_var::DomainManager_var (void) // default constructor
+CORBA::DomainManager_var::DomainManager_var (void)
   : ptr_ (DomainManager::_nil ())
 {}
 
@@ -107,12 +119,12 @@ CORBA::DomainManager_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::DomainManager_var::DomainManager_var (const ::CORBA::DomainManager_var &p) // copy constructor
+CORBA::DomainManager_var::DomainManager_var (const ::CORBA::DomainManager_var &p)
   : TAO_Base_var (),
     ptr_ (DomainManager::_duplicate (p.ptr ()))
 {}
 
-CORBA::DomainManager_var::~DomainManager_var (void) // destructor
+CORBA::DomainManager_var::~DomainManager_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -216,10 +228,11 @@ CORBA::DomainManager_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::DomainManager_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::DomainManager_out::DomainManager_out (DomainManager_ptr &p)
@@ -228,14 +241,14 @@ CORBA::DomainManager_out::DomainManager_out (DomainManager_ptr &p)
   this->ptr_ = ::CORBA::DomainManager::_nil ();
 }
 
-CORBA::DomainManager_out::DomainManager_out (DomainManager_var &p) // constructor from _var
+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) // copy constructor
+CORBA::DomainManager_out::DomainManager_out (const ::CORBA::DomainManager_out &p)
   : ptr_ (ACE_const_cast (DomainManager_out &, p).ptr_)
 {}
 
@@ -266,7 +279,7 @@ CORBA::DomainManager_out::operator ::CORBA::DomainManager_ptr &() // cast
 }
 
 ::CORBA::DomainManager_ptr &
-CORBA::DomainManager_out::ptr (void) // ptr
+CORBA::DomainManager_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -277,43 +290,53 @@ CORBA::DomainManager_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::PolicyType & policy_type ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+      const CORBA::PolicyType & policy_type
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::Policy_ptr result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &);
+    const CORBA::PolicyType & policy_type_;
+    
+    ::CORBA::Policy_ptr _result;
+  };
   
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
   
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void result (CORBA::Policy_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &);
-
-  const CORBA::PolicyType & policy_type_;
-  CORBA::Policy_ptr _result;
-};
-
-TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::PolicyType & policy_type ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    policy_type_ (policy_type)
+  TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const CORBA::PolicyType & policy_type
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      policy_type_ (policy_type)
 {}
 
 Dynamic::ParameterList *
@@ -329,8 +352,7 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (ACE_ENV_
   
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
-    (*parameter_list)[len].argument <<= policy_type_;
+  (*parameter_list)[len].argument <<= policy_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -368,12 +390,15 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SIN
 void 
 TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (::CORBA::Policy_ptr result)
 {
-  // update the result 
+  // Update the result. 
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
@@ -386,6 +411,9 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
 
 // Remote Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 ::CORBA::Policy_ptr CORBA::_TAO_DomainManager_Remote_Proxy_Impl::get_domain_policy (
     CORBA::Object *_collocated_tao_target_,
     CORBA::PolicyType policy_type
@@ -395,16 +423,14 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
     CORBA::SystemException
   ))
 {
-  
   CORBA::Policy_var _tao_retval (CORBA::Policy::_nil ());
-
-
-  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
-
   
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "get_domain_policy",
@@ -430,14 +456,14 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy _tao_ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        policy_type ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK_RETURN (_tao_retval._retn ());
-
-#endif /* TAO_HAS_INTERCEPTORS */
+          &_tao_call,
+          _collocated_tao_target_,
+          policy_type
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
       
+#endif /* TAO_HAS_INTERCEPTORS */
       
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
@@ -447,9 +473,9 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
           
           if (_invoke_status == TAO_INVOKE_RESTART)
@@ -461,114 +487,151 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
 #endif /* TAO_HAS_INTERCEPTORS */
           
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          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_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_out << policy_type)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
+                );
+            }
+          
           _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
-              );
-              
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  0
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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_in >> _tao_retval.inout ())
               ))
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  0
+                );
             }
           
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
+          ::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
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-        
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-        
-        PortableInterceptor::ReplyStatus _tao_status =
-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        
-        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-            || _tao_status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK_RETURN (_tao_retval._retn ());
-
-    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;
-    
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
-    break;
-  }
-return _tao_retval._retn ();
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
 }
 
-
 //
 //            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -604,30 +667,25 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Broker::~_TAO_DomainManager_Remote_Proxy_
 
 CORBA::_TAO_DomainManager_Proxy_Impl&
 CORBA::_TAO_DomainManager_Remote_Proxy_Broker::select_proxy (
-  ::CORBA::DomainManager *
-  ACE_ENV_ARG_DECL_NOT_USED
-)
+    ::CORBA::DomainManager *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
   return this->remote_proxy_impl_;
 }
 
-
 //
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:198
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::DomainManager::DomainManager (int collocated)
 {
   this->CORBA_DomainManager_setup_collocation (collocated);
 }
 
-CORBA::DomainManager::~DomainManager (void)
-{}
-
 void
 CORBA::DomainManager::CORBA_DomainManager_setup_collocation (int collocated)
 {
@@ -639,26 +697,42 @@ CORBA::DomainManager::CORBA_DomainManager_setup_collocation (int collocated)
       ::CORBA::_TAO_DomainManager_Remote_Proxy_Broker::the_TAO_DomainManager_Remote_Proxy_Broker ();
 }
 
-void CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::DomainManager::~DomainManager (void)
+{}
+
+void 
+CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
 {
-  DomainManager *tmp = ACE_static_cast (DomainManager*, _tao_void_pointer);
+  DomainManager *tmp = ACE_static_cast (DomainManager *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-CORBA::DomainManager_ptr CORBA::DomainManager::_narrow (
+CORBA::DomainManager_ptr
+CORBA::DomainManager::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
-    return DomainManager::_nil ();
+    {
+      return DomainManager::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0" ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/DomainManager:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
       ACE_CHECK_RETURN (DomainManager::_nil ());
+      
       if (is_a == 0)
-        return DomainManager::_nil ();
+        {
+          return DomainManager::_nil ();
+        }
     }
+  
   return DomainManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
@@ -669,14 +743,21 @@ CORBA::DomainManager::_unchecked_narrow (
   )
 {
   if (CORBA::is_nil (obj))
-    return DomainManager::_nil ();
+    {
+      return DomainManager::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      if (stub)
-        stub->_incr_refcnt ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
       DomainManager_ptr default_proxy = DomainManager::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -712,51 +793,84 @@ CORBA::DomainManager::_unchecked_narrow (
     }
   else 
     return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DomainManager_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DomainManager::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DomainManager::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::DomainManager_ptr
 CORBA::DomainManager::_duplicate (DomainManager_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
-CORBA::Boolean CORBA::DomainManager::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
+CORBA::Boolean
+CORBA::DomainManager::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/DomainManager:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
   else
-    return this->Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+    {
+      return this->Object::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
 }
 
 void *CORBA::DomainManager::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, DomainManager)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-    
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, DomainManager)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -765,6 +879,9 @@ const char* CORBA::DomainManager::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/DomainManager:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 ::CORBA::Policy_ptr CORBA::DomainManager::get_domain_policy (
     CORBA::PolicyType policy_type
     ACE_ENV_ARG_DECL
@@ -779,13 +896,17 @@ const char* CORBA::DomainManager::_interface_repository_id (void) const
   
   return proxy.get_domain_policy (
       this,
-      policy_type ACE_ENV_ARG_PARAMETER
+      policy_type
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_DomainManager[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   36,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -796,12 +917,12 @@ static const CORBA::Long _oc_CORBA_DomainManager[] =
   ACE_NTOHL (0x4d616e61), 
   ACE_NTOHL (0x6765723a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
-  14,
+    14,
   ACE_NTOHL (0x446f6d61), 
   ACE_NTOHL (0x696e4d61), 
   ACE_NTOHL (0x6e616765), 
   ACE_NTOHL (0x72000000),  // name = DomainManager
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager (
     CORBA::tk_objref,
@@ -813,16 +934,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_DomainManager, &_tc_TAO_tc_CORBA_DomainManager)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SecConstruction, 11U)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_DomainManager,
+    &_tc_TAO_tc_CORBA_DomainManager
+  )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ConstructionPolicy::_tao_class_id = 0;
 
@@ -869,13 +989,23 @@ tao_CORBA_ConstructionPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ConstructionPolicy_marshal (
+    CORBA::ConstructionPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::ConstructionPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::ConstructionPolicy_var::ConstructionPolicy_var (void) // default constructor
+CORBA::ConstructionPolicy_var::ConstructionPolicy_var (void)
   : ptr_ (ConstructionPolicy::_nil ())
 {}
 
@@ -885,12 +1015,12 @@ CORBA::ConstructionPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::ConstructionPolicy_var::ConstructionPolicy_var (const ::CORBA::ConstructionPolicy_var &p) // copy constructor
+CORBA::ConstructionPolicy_var::ConstructionPolicy_var (const ::CORBA::ConstructionPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ConstructionPolicy::_duplicate (p.ptr ()))
 {}
 
-CORBA::ConstructionPolicy_var::~ConstructionPolicy_var (void) // destructor
+CORBA::ConstructionPolicy_var::~ConstructionPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -994,10 +1124,11 @@ CORBA::ConstructionPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::ConstructionPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_ptr &p)
@@ -1006,14 +1137,14 @@ CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_ptr &p
   this->ptr_ = ::CORBA::ConstructionPolicy::_nil ();
 }
 
-CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_var &p) // constructor from _var
+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) // copy constructor
+CORBA::ConstructionPolicy_out::ConstructionPolicy_out (const ::CORBA::ConstructionPolicy_out &p)
   : ptr_ (ACE_const_cast (ConstructionPolicy_out &, p).ptr_)
 {}
 
@@ -1044,7 +1175,7 @@ CORBA::ConstructionPolicy_out::operator ::CORBA::ConstructionPolicy_ptr &() // c
 }
 
 ::CORBA::ConstructionPolicy_ptr &
-CORBA::ConstructionPolicy_out::ptr (void) // ptr
+CORBA::ConstructionPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1055,8 +1186,14 @@ CORBA::ConstructionPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager : public TAO_ClientRequestInfo_i
 {
 public:
@@ -1064,36 +1201,38 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::InterfaceDef_ptr object_type,
-      const CORBA::Boolean & constr_policy ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+      const CORBA::Boolean & constr_policy
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
+    CORBA::InterfaceDef_ptr object_type_;
+    const CORBA::Boolean & constr_policy_;
+  };
   
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
   
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
-
-  CORBA::InterfaceDef_ptr object_type_;
-  const CORBA::Boolean & constr_policy_;
-  
-};
-
-TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::InterfaceDef_ptr object_type,
-    const CORBA::Boolean & constr_policy ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    object_type_ (object_type),
-    constr_policy_ (constr_policy)
+  TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      CORBA::InterfaceDef_ptr object_type,
+      const CORBA::Boolean & constr_policy
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      object_type_ (object_type),
+      constr_policy_ (constr_policy)
 {}
 
 Dynamic::ParameterList *
@@ -1109,7 +1248,7 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A
   
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
@@ -1119,9 +1258,11 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A
       (*parameter_list)[len].argument,
       this->object_type_
     );
+
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
+  
+  (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -1153,8 +1294,13 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_
   return result_any;
 }
 
+
+
 #endif /* TAO_HAS_INTERCEPTORS */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
@@ -1167,6 +1313,9 @@ CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::_TAO_ConstructionPolicy_Remote
 
 // Remote Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
     CORBA::Object *_collocated_tao_target_,
     CORBA::InterfaceDef_ptr object_type,
@@ -1177,15 +1326,13 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
     CORBA::SystemException
   ))
 {
-  
-  
-  
-  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
   
+  if (istub == 0)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "make_domain_manager",
@@ -1216,15 +1363,15 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager _tao_ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        object_type,
-        constr_policy ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
-#endif /* TAO_HAS_INTERCEPTORS */
+          &_tao_call,
+          _collocated_tao_target_,
+          object_type,
+          constr_policy
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
       
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
@@ -1234,9 +1381,9 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
           
           if (_invoke_status == TAO_INVOKE_RESTART)
@@ -1248,99 +1395,129 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
 #endif /* TAO_HAS_INTERCEPTORS */
           
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          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_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
+            }
+          
           _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)
-              );
-              
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
               
               continue;
             }
-          
-          
 #if TAO_HAS_INTERCEPTORS == 1
           
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-        
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-        
-        PortableInterceptor::ReplyStatus _tao_status =
-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        
-        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-            || _tao_status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-    
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK;
+      
+      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;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
-    break;
-  }
-
+      
+      break;
+    }
 }
 
-
 //
 //            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -1376,30 +1553,25 @@ CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::~_TAO_ConstructionPolicy_Rem
 
 CORBA::_TAO_ConstructionPolicy_Proxy_Impl&
 CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::select_proxy (
-  ::CORBA::ConstructionPolicy *
-  ACE_ENV_ARG_DECL_NOT_USED
-)
+    ::CORBA::ConstructionPolicy *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
   return this->remote_proxy_impl_;
 }
 
-
 //
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:198
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::ConstructionPolicy::ConstructionPolicy (int collocated)
 {
   this->CORBA_ConstructionPolicy_setup_collocation (collocated);
 }
 
-CORBA::ConstructionPolicy::~ConstructionPolicy (void)
-{}
-
 void
 CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation (int collocated)
 {
@@ -1413,26 +1585,42 @@ CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation (int collo
   this->CORBA_Policy_setup_collocation (collocated);
 }
 
-void CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ConstructionPolicy::~ConstructionPolicy (void)
+{}
+
+void 
+CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ConstructionPolicy *tmp = ACE_static_cast (ConstructionPolicy*, _tao_void_pointer);
+  ConstructionPolicy *tmp = ACE_static_cast (ConstructionPolicy *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_narrow (
+CORBA::ConstructionPolicy_ptr
+CORBA::ConstructionPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
-    return ConstructionPolicy::_nil ();
+    {
+      return ConstructionPolicy::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0" ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
       ACE_CHECK_RETURN (ConstructionPolicy::_nil ());
+      
       if (is_a == 0)
-        return ConstructionPolicy::_nil ();
+        {
+          return ConstructionPolicy::_nil ();
+        }
     }
+  
   return ConstructionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
@@ -1443,14 +1631,21 @@ CORBA::ConstructionPolicy::_unchecked_narrow (
   )
 {
   if (CORBA::is_nil (obj))
-    return ConstructionPolicy::_nil ();
+    {
+      return ConstructionPolicy::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      if (stub)
-        stub->_incr_refcnt ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
       ConstructionPolicy_ptr default_proxy = ConstructionPolicy::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -1486,64 +1681,102 @@ CORBA::ConstructionPolicy::_unchecked_narrow (
     }
   else 
     return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ConstructionPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ConstructionPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ConstructionPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::ConstructionPolicy_ptr
 CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
-CORBA::Boolean CORBA::ConstructionPolicy::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
+CORBA::Boolean
+CORBA::ConstructionPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
   else
-    return this->Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+    {
+      return this->Object::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
 }
 
 void *CORBA::ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, ConstructionPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-    
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, ConstructionPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1552,6 +1785,9 @@ const char* CORBA::ConstructionPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void CORBA::ConstructionPolicy::make_domain_manager (
     CORBA::InterfaceDef_ptr object_type,
     CORBA::Boolean constr_policy
@@ -1568,13 +1804,17 @@ void CORBA::ConstructionPolicy::make_domain_manager (
   proxy.make_domain_manager (
       this,
       object_type,
-      constr_policy ACE_ENV_ARG_PARAMETER
+      constr_policy
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   41,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -1587,13 +1827,13 @@ static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
   ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ConstructionPolicy:1.0
-  19,
+    19,
   ACE_NTOHL (0x436f6e73), 
   ACE_NTOHL (0x74727563), 
   ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = ConstructionPolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy (
     CORBA::tk_objref,
@@ -1605,9 +1845,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ConstructionPolicy, &_tc_TAO_tc_CORBA_ConstructionPolicy)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ConstructionPolicy,
+    &_tc_TAO_tc_CORBA_ConstructionPolicy
+  )
 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)
 
@@ -1622,25 +1868,27 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_allocate_buffer
   tmp = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (length);
   
   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;
-      }
-  }
+    {
+      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;
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -1648,7 +1896,10 @@ void
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   CORBA::DomainManager **tmp = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
@@ -1699,59 +1950,79 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_upcast (void *sr
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_DOMAINMANAGERLIST_CS_)
 #define _CORBA_DOMAINMANAGERLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::DomainManagerList
 // *************************************************************
 
 CORBA::DomainManagerList::DomainManagerList (void)
 {}
-CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max) // uses max size
+
+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)
+
+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) // copy ctor
+
+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 /* end #if !defined */
 
+// 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
+    TAO_ENCAP_BYTE_ORDER, // byte order
   40,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -1763,13 +2034,13 @@ static const CORBA::Long _oc_CORBA_DomainManagerList[] =
   ACE_NTOHL (0x6765724c), 
   ACE_NTOHL (0x6973743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManagerList:1.0
-  18,
+    18,
   ACE_NTOHL (0x446f6d61), 
   ACE_NTOHL (0x696e4d61), 
   ACE_NTOHL (0x6e616765), 
   ACE_NTOHL (0x724c6973), 
   ACE_NTOHL (0x74000000),  // name = DomainManagerList
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_objref, // typecode kind
@@ -1785,12 +2056,12 @@ static const CORBA::Long _oc_CORBA_DomainManagerList[] =
       ACE_NTOHL (0x4d616e61), 
       ACE_NTOHL (0x6765723a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
-      14,
+            14,
       ACE_NTOHL (0x446f6d61), 
       ACE_NTOHL (0x696e4d61), 
       ACE_NTOHL (0x6e616765), 
       ACE_NTOHL (0x72000000),  // name = DomainManager
-
+      
     0U,
 
 };
@@ -1805,210 +2076,141 @@ static CORBA::TypeCode _tc_TAO_tc_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_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
 
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/any_op_cs.cpp:60
-
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::DomainManager_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_DomainManager, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          CORBA::DomainManager::_duplicate (_tao_elem),
-          CORBA::DomainManager::_tao_any_destructor
-        );
-    }
+  CORBA::DomainManager_ptr _tao_objptr =
+    CORBA::DomainManager::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::DomainManager_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_DomainManager, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::DomainManager::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::DomainManager>::insert (
+      _tao_any,
+      CORBA::DomainManager::_tao_any_destructor,
+      CORBA::_tc_DomainManager,
+      *_tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     CORBA::DomainManager_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::DomainManager::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_DomainManager
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::DomainManager>::extract (
+        _tao_any,
+        CORBA::DomainManager::_tao_any_destructor,
+        CORBA::_tc_DomainManager,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_DomainManager,
-            1,
-            _tao_elem,
-            CORBA::DomainManager::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::DomainManager::_nil ();
-  return 0;
+}
+
+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_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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/any_op_cs.cpp:60
-
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::ConstructionPolicy_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ConstructionPolicy, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          CORBA::ConstructionPolicy::_duplicate (_tao_elem),
-          CORBA::ConstructionPolicy::_tao_any_destructor
-        );
-    }
+  CORBA::ConstructionPolicy_ptr _tao_objptr =
+    CORBA::ConstructionPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::ConstructionPolicy_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ConstructionPolicy, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::ConstructionPolicy::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ConstructionPolicy>::insert (
+      _tao_any,
+      CORBA::ConstructionPolicy::_tao_any_destructor,
+      CORBA::_tc_ConstructionPolicy,
+      *_tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     CORBA::ConstructionPolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ConstructionPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_ConstructionPolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ConstructionPolicy>::extract (
+        _tao_any,
+        CORBA::ConstructionPolicy::_tao_any_destructor,
+        CORBA::_tc_ConstructionPolicy,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ConstructionPolicy,
-            1,
-            _tao_elem,
-            CORBA::ConstructionPolicy::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::ConstructionPolicy::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ConstructionPolicy>::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::ConstructionPolicy,CORBA::ConstructionPolicy_var>;
+  template class TAO::Any_Impl_T<CORBA::ConstructionPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Manager<CORBA::ConstructionPolicy,CORBA::ConstructionPolicy_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ConstructionPolicy, CORBA::ConstructionPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ConstructionPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -2016,16 +2218,12 @@ void operator<<= (
     const CORBA::DomainManagerList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_DomainManagerList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert_copy (
+      _tao_any,
+      CORBA::DomainManagerList::_tao_any_destructor,
+      CORBA::_tc_DomainManagerList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -2034,19 +2232,12 @@ void operator<<= (
     CORBA::DomainManagerList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_DomainManagerList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::DomainManagerList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert (
+      _tao_any,
+      CORBA::DomainManagerList::_tao_any_destructor,
+      CORBA::_tc_DomainManagerList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -2055,8 +2246,8 @@ CORBA::Boolean operator>>= (
     CORBA::DomainManagerList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::DomainManagerList*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::DomainManagerList *&,
       _tao_elem
     );
 }
@@ -2067,73 +2258,18 @@ CORBA::Boolean operator>>= (
     const CORBA::DomainManagerList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_DomainManagerList
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::DomainManagerList*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::DomainManagerList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::DomainManagerList,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_DomainManagerList,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::DomainManagerList::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::extract (
+        _tao_any,
+        CORBA::DomainManagerList::_tao_any_destructor,
+        CORBA::_tc_DomainManagerList,
+        _tao_elem
+      );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::DomainManager_ptr _tao_objref
@@ -2151,9 +2287,13 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
+    
     if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
     _tao_objref =
       CORBA::DomainManager::_unchecked_narrow (
           obj.in ()
@@ -2170,6 +2310,9 @@ CORBA::Boolean operator>> (
   return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::ConstructionPolicy_ptr _tao_objref
@@ -2187,9 +2330,13 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
+    
     if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
     _tao_objref =
       CORBA::ConstructionPolicy::_unchecked_narrow (
           obj.in ()
@@ -2206,22 +2353,31 @@ CORBA::Boolean operator>> (
   return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::DomainManagerList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag =
+            _tao_sequence[i].in ()->marshal (strm);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -2230,26 +2386,37 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 9bb231c11fd..5d1139f9fde 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_DOMAINC_H_
-#define _TAO_IDL_DOMAINC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_DOMAINC_H_
+#define _TAO_IDL_ORIG_DOMAINC_H_
 
 #include "ace/pre.h"
 #include "tao/corba.h"
@@ -29,9 +32,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/corbafwd.h"
 #include "PolicyC.h"
-#include "Sequence.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -56,21 +57,29 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  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_
   
   class DomainManager;
   typedef DomainManager *DomainManager_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #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
   {
   public:
@@ -110,13 +119,14 @@ TAO_NAMESPACE  CORBA
     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
   {
   public:
@@ -133,21 +143,15 @@ TAO_NAMESPACE  CORBA
   private:
     DomainManager_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  // *************************************************************
-  // CORBA::DomainManager
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-  
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_DOMAINMANAGER_CH_)
 #define _CORBA_DOMAINMANAGER_CH_
   
-  // Forward Classes Declaration.
   class _TAO_DomainManager_Proxy_Impl;
   class _TAO_DomainManager_Remote_Proxy_Impl;
   class _TAO_DomainManager_Proxy_Broker;
@@ -157,11 +161,8 @@ TAO_NAMESPACE  CORBA
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DomainManager_ptr _ptr_type;
     typedef DomainManager_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -182,7 +183,10 @@ TAO_NAMESPACE  CORBA
         return (DomainManager_ptr)0;
       }
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr get_domain_policy (
         CORBA::PolicyType policy_type
@@ -192,23 +196,26 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id
+        const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_DomainManager_Proxy_Broker *the_TAO_DomainManager_Proxy_Broker_;
-    
+  
   protected:
     DomainManager (int collocated = 0);
     
     // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
+    // parents piece of the given class in the right mode.
     virtual void CORBA_DomainManager_setup_collocation (int collocated);
     
     DomainManager (
@@ -216,12 +223,11 @@ TAO_NAMESPACE  CORBA
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
+    virtual ~DomainManager (void);
     
     friend class _TAO_DomainManager_Remote_Proxy_Impl;
     friend class _TAO_DomainManager_ThruPOA_Proxy_Impl;
     friend class _TAO_DomainManager_Direct_Proxy_Impl;
-    
-    virtual ~DomainManager (void);
   
   private:
     DomainManager (const DomainManager &);
@@ -229,19 +235,26 @@ TAO_NAMESPACE  CORBA
   };
   
   // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulate
-  // an invocation logics.
+  // perform a call. Each different implementation encapsulates
+  // an invocation logic.
   
   
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_Export _TAO_DomainManager_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
-    virtual ~_TAO_DomainManager_Proxy_Impl (void) { }
+    virtual ~_TAO_DomainManager_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::Policy_ptr get_domain_policy (
         CORBA::Object *_collocated_tao_target_,
         CORBA::PolicyType policy_type
@@ -250,8 +263,7 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
-    
+  
   protected:
     _TAO_DomainManager_Proxy_Impl (void);
   };
@@ -265,6 +277,9 @@ TAO_NAMESPACE  CORBA
   //                Remote Proxy Impl. Declaration
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_Export _TAO_DomainManager_Remote_Proxy_Impl
     : public virtual _TAO_DomainManager_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
@@ -272,7 +287,11 @@ TAO_NAMESPACE  CORBA
   public:
     _TAO_DomainManager_Remote_Proxy_Impl (void);
     
-    virtual ~_TAO_DomainManager_Remote_Proxy_Impl (void) { }
+    virtual ~_TAO_DomainManager_Remote_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::Policy_ptr get_domain_policy (
         CORBA::Object *_collocated_tao_target_,
         CORBA::PolicyType policy_type
@@ -281,8 +300,6 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
   };
   
   //
@@ -294,12 +311,14 @@ TAO_NAMESPACE  CORBA
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
   
-  
   ///////////////////////////////////////////////////////////////////////
   //                 Base Proxy Broker Declaration 
   //
   
-    class TAO_Export _TAO_DomainManager_Proxy_Broker
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
+  class TAO_Export _TAO_DomainManager_Proxy_Broker
   {
   public:
     virtual ~_TAO_DomainManager_Proxy_Broker (void);
@@ -322,6 +341,9 @@ TAO_NAMESPACE  CORBA
   //                 Remote Proxy Broker Declaration 
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_Export _TAO_DomainManager_Remote_Proxy_Broker
     : public virtual _TAO_DomainManager_Proxy_Broker
   {
@@ -348,27 +370,36 @@ TAO_NAMESPACE  CORBA
   //
   //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
 #endif /* end #if !defined */
   
+  // 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_DomainManager;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SecConstruction;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
+  const CORBA::ULong 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_
   
   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
+  
   class TAO_Export ConstructionPolicy_var : public TAO_Base_var
   {
   public:
@@ -408,13 +439,14 @@ TAO_NAMESPACE  CORBA
     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
   {
   public:
@@ -431,21 +463,15 @@ TAO_NAMESPACE  CORBA
   private:
     ConstructionPolicy_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  // *************************************************************
-  // CORBA::ConstructionPolicy
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-  
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_CONSTRUCTIONPOLICY_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY_CH_
   
-  // Forward Classes Declaration.
   class _TAO_ConstructionPolicy_Proxy_Impl;
   class _TAO_ConstructionPolicy_Remote_Proxy_Impl;
   class _TAO_ConstructionPolicy_Proxy_Broker;
@@ -455,11 +481,8 @@ TAO_NAMESPACE  CORBA
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ConstructionPolicy_ptr _ptr_type;
     typedef ConstructionPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -480,7 +503,10 @@ TAO_NAMESPACE  CORBA
         return (ConstructionPolicy_ptr)0;
       }
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void make_domain_manager (
         CORBA::InterfaceDef_ptr object_type,
@@ -491,23 +517,26 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id
+        const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ConstructionPolicy_Proxy_Broker *the_TAO_ConstructionPolicy_Proxy_Broker_;
-    
+  
   protected:
     ConstructionPolicy (int collocated = 0);
     
     // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
+    // parents piece of the given class in the right mode.
     virtual void CORBA_ConstructionPolicy_setup_collocation (int collocated);
     
     ConstructionPolicy (
@@ -515,12 +544,11 @@ TAO_NAMESPACE  CORBA
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
+    virtual ~ConstructionPolicy (void);
     
     friend class _TAO_ConstructionPolicy_Remote_Proxy_Impl;
     friend class _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_ConstructionPolicy_Direct_Proxy_Impl;
-    
-    virtual ~ConstructionPolicy (void);
   
   private:
     ConstructionPolicy (const ConstructionPolicy &);
@@ -528,19 +556,26 @@ TAO_NAMESPACE  CORBA
   };
   
   // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulate
-  // an invocation logics.
+  // perform a call. Each different implementation encapsulates
+  // an invocation logic.
   
   
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_Export _TAO_ConstructionPolicy_Proxy_Impl
     : public virtual CORBA::_TAO_Policy_Proxy_Impl
   {
   public:
-    virtual ~_TAO_ConstructionPolicy_Proxy_Impl (void) { }
+    virtual ~_TAO_ConstructionPolicy_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void make_domain_manager (
         CORBA::Object *_collocated_tao_target_,
         CORBA::InterfaceDef_ptr object_type,
@@ -550,8 +585,7 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
-    
+  
   protected:
     _TAO_ConstructionPolicy_Proxy_Impl (void);
   };
@@ -565,6 +599,9 @@ TAO_NAMESPACE  CORBA
   //                Remote Proxy Impl. Declaration
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_Export _TAO_ConstructionPolicy_Remote_Proxy_Impl
     : public virtual _TAO_ConstructionPolicy_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -573,7 +610,11 @@ TAO_NAMESPACE  CORBA
   public:
     _TAO_ConstructionPolicy_Remote_Proxy_Impl (void);
     
-    virtual ~_TAO_ConstructionPolicy_Remote_Proxy_Impl (void) { }
+    virtual ~_TAO_ConstructionPolicy_Remote_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void make_domain_manager (
         CORBA::Object *_collocated_tao_target_,
         CORBA::InterfaceDef_ptr object_type,
@@ -583,8 +624,6 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
   };
   
   //
@@ -596,12 +635,14 @@ TAO_NAMESPACE  CORBA
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
   
-  
   ///////////////////////////////////////////////////////////////////////
   //                 Base Proxy Broker Declaration 
   //
   
-    class TAO_Export _TAO_ConstructionPolicy_Proxy_Broker
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
+  class TAO_Export _TAO_ConstructionPolicy_Proxy_Broker
   {
   public:
     virtual ~_TAO_ConstructionPolicy_Proxy_Broker (void);
@@ -624,6 +665,9 @@ TAO_NAMESPACE  CORBA
   //                 Remote Proxy Broker Declaration 
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_Export _TAO_ConstructionPolicy_Remote_Proxy_Broker
     : public virtual _TAO_ConstructionPolicy_Proxy_Broker
   {
@@ -650,23 +694,26 @@ TAO_NAMESPACE  CORBA
   //
   //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstructionPolicy;
+  // 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_ConstructionPolicy;
   
+  // 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_CORBA_DOMAINMANAGERLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
+  class TAO_Export _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void);
     _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (
@@ -707,55 +754,61 @@ TAO_NAMESPACE  CORBA
       );
     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;
   
   // *************************************************************
-  // DomainManagerList
+  // 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>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    DomainManagerList (void); // default ctor
-    DomainManagerList (CORBA::ULong max); // uses max size
+    DomainManagerList (void);
+    DomainManagerList (CORBA::ULong max);
     DomainManagerList (
         CORBA::ULong max, 
         CORBA::ULong length, 
         DomainManager_ptr *buffer, 
         CORBA::Boolean release = 0
       );
-    DomainManagerList (const DomainManagerList &); // copy ctor
+    DomainManagerList (const DomainManagerList &);
     ~DomainManagerList (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DomainManagerList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #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
   // *************************************************************
@@ -776,7 +829,9 @@ TAO_NAMESPACE  CORBA
     operator const DomainManagerList &() const;
     operator DomainManagerList &();
     operator DomainManagerList &() const;
-    operator DomainManagerList *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator DomainManagerList *&();
     
     TAO_Object_Manager<DomainManager, DomainManager_var> operator[] (CORBA::ULong index);
     
@@ -790,14 +845,15 @@ TAO_NAMESPACE  CORBA
   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:
@@ -816,18 +872,25 @@ TAO_NAMESPACE  CORBA
     // Assignment from T_var not allowed.
     void operator= (const DomainManagerList_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DomainManagerList;
-  
+  // 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_DomainManagerList;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
 // Proxy Broker Factory function pointer declarations.
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80
+
 extern TAO_Export
 CORBA::_TAO_DomainManager_Proxy_Broker *
 (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) (
@@ -840,26 +903,48 @@ CORBA::_TAO_ConstructionPolicy_Proxy_Broker *
     CORBA::Object_ptr obj
   );
 
-// Any operators for interface CORBA::DomainManager
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManager_ptr &);
-// Any operators for interface CORBA::ConstructionPolicy
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstructionPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::DomainManagerList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManagerList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManagerList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::DomainManagerList *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::DomainManager_ptr );
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::DomainManager_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ConstructionPolicy_ptr );
 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
+
 #if !defined _TAO_CDR_OP_CORBA_DomainManagerList_H_
 #define _TAO_CDR_OP_CORBA_DomainManagerList_H_
 
@@ -874,9 +959,13 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "DomainC.i"
@@ -892,3 +981,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
index 12b934c2f68..2ceb3142a7d 100644
--- a/TAO/tao/DomainC.i
+++ b/TAO/tao/DomainC.i
@@ -20,6 +20,9 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
 #if !defined (_CORBA_DOMAINMANAGER___CI_)
 #define _CORBA_DOMAINMANAGER___CI_
 
@@ -34,9 +37,17 @@ CORBA::DomainManager::DomainManager (
   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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_CONSTRUCTIONPOLICY___CI_)
 #define _CORBA_CONSTRUCTIONPOLICY___CI_
@@ -52,16 +63,25 @@ CORBA::ConstructionPolicy::ConstructionPolicy (
   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 **
+ACE_INLINE
+CORBA::DomainManager **
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (CORBA::ULong nelems)
 {
   CORBA::DomainManager **buf = 0;
@@ -76,11 +96,15 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (CORBA::
   return buf;
 }
 
-ACE_INLINE void 
+ACE_INLINE
+void 
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (CORBA::DomainManager **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -96,64 +120,83 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Ob
 }
 
 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)
+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)
+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;
-  }
+    {
+      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;
-  }
+    {
+      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)
+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;
+    {
+      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 ();
+      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_);
+        }
     }
-    if (this->maximum_ < rhs.maximum_)
+  else
     {
-      _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (rhs.maximum_);
+      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_);
+  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)
     {
@@ -163,70 +206,78 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator= (const
   return *this;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  CORBA::DomainManager ** const tmp = ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, this->buffer_);
+  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* *
+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_);
+      // 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;
+      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* *
+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_);
+  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) // default constructor
+CORBA::DomainManagerList_var::DomainManagerList_var (void)
   : ptr_ (0)
 {}
 
@@ -236,21 +287,26 @@ CORBA::DomainManagerList_var::DomainManagerList_var (DomainManagerList *p)
 {}
 
 ACE_INLINE
-CORBA::DomainManagerList_var::DomainManagerList_var (const ::CORBA::DomainManagerList_var &p) // copy constructor
+CORBA::DomainManagerList_var::DomainManagerList_var (const ::CORBA::DomainManagerList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::DomainManagerList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CORBA::DomainManagerList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-CORBA::DomainManagerList_var::~DomainManagerList_var (void) // destructor
+CORBA::DomainManagerList_var::~DomainManagerList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::DomainManagerList_var &
+ACE_INLINE
+CORBA::DomainManagerList_var &
 CORBA::DomainManagerList_var::operator= (DomainManagerList *p)
 {
   delete this->ptr_;
@@ -258,7 +314,8 @@ CORBA::DomainManagerList_var::operator= (DomainManagerList *p)
   return *this;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList_var &
+ACE_INLINE
+::CORBA::DomainManagerList_var &
 CORBA::DomainManagerList_var::operator= (const ::CORBA::DomainManagerList_var &p)
 {
   if (this != &p)
@@ -270,8 +327,12 @@ CORBA::DomainManagerList_var::operator= (const ::CORBA::DomainManagerList_var &p
         }
       else
         {
-          DomainManagerList *deep_copy =
-            new DomainManagerList (*p.ptr_);
+          DomainManagerList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              DomainManagerList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -286,63 +347,68 @@ CORBA::DomainManagerList_var::operator= (const ::CORBA::DomainManagerList_var &p
   return *this;
 }
 
-ACE_INLINE const ::CORBA::DomainManagerList *
+ACE_INLINE
+const ::CORBA::DomainManagerList *
 CORBA::DomainManagerList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList *
+ACE_INLINE
+::CORBA::DomainManagerList *
 CORBA::DomainManagerList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::DomainManagerList_var::operator const ::CORBA::DomainManagerList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// 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>
+ACE_INLINE
+TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
 CORBA::DomainManagerList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::CORBA::DomainManagerList &
+ACE_INLINE
+const ::CORBA::DomainManagerList &
 CORBA::DomainManagerList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList &
+ACE_INLINE
+::CORBA::DomainManagerList &
 CORBA::DomainManagerList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA::DomainManagerList *&
+ACE_INLINE
+::CORBA::DomainManagerList *&
 CORBA::DomainManagerList_var::out (void)
 {
   delete this->ptr_;
@@ -350,7 +416,8 @@ CORBA::DomainManagerList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList *
+ACE_INLINE
+::CORBA::DomainManagerList *
 CORBA::DomainManagerList_var::_retn (void)
 {
   ::CORBA::DomainManagerList *tmp = this->ptr_;
@@ -358,12 +425,16 @@ CORBA::DomainManagerList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList *
+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
 // *************************************************************
@@ -376,7 +447,7 @@ CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList *&p)
 }
 
 ACE_INLINE
-CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList_var &p) // constructor from _var
+CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -384,51 +455,58 @@ CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList_var &p) /
 }
 
 ACE_INLINE
-CORBA::DomainManagerList_out::DomainManagerList_out (const ::CORBA::DomainManagerList_out &p) // copy constructor
+CORBA::DomainManagerList_out::DomainManagerList_out (const ::CORBA::DomainManagerList_out &p)
   : ptr_ (ACE_const_cast (DomainManagerList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA::DomainManagerList_out &
+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 &
+ACE_INLINE
+::CORBA::DomainManagerList_out &
 CORBA::DomainManagerList_out::operator= (DomainManagerList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::DomainManagerList_out::operator ::CORBA::DomainManagerList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList *&
+ACE_INLINE
+::CORBA::DomainManagerList *&
 CORBA::DomainManagerList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::DomainManagerList *
+ACE_INLINE
+::CORBA::DomainManagerList *
 CORBA::DomainManagerList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
 CORBA::DomainManagerList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const CORBA::DomainManager_ptr
@@ -439,6 +517,9 @@ TAO_Export CORBA::Boolean operator>> (
     CORBA::DomainManager_ptr &
   );
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const CORBA::ConstructionPolicy_ptr
@@ -449,6 +530,8 @@ TAO_Export CORBA::Boolean operator>> (
     CORBA::ConstructionPolicy_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_CORBA_DomainManagerList_I_
 #define _TAO_CDR_OP_CORBA_DomainManagerList_I_
@@ -457,6 +540,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA::DomainManagerList &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA::DomainManagerList &
diff --git a/TAO/tao/Dynamic.pidl b/TAO/tao/Dynamic.pidl
index d5fa92b8ffc..a4ea129f37c 100644
--- a/TAO/tao/Dynamic.pidl
+++ b/TAO/tao/Dynamic.pidl
@@ -10,7 +10,7 @@
  *   used to generate code is:
  *
  *     tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Gv
+ *        -o orig -Gp -Gd -Ge 1
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/corbafwd.h"
  *          -Wb,pre_include="ace/pre.h"
@@ -30,6 +30,7 @@
 
 
 #include "orb.idl"
+#include <StringSeq.pidl>
 
 #ifndef _DYNAMIC_IDL_
 #define _DYNAMIC_IDL_
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index b6c261b2322..99bc85390cb 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -1,4 +1,5 @@
 // $Id$
+
 // =================================================================
 //
 // = LIBRARY
@@ -23,12 +24,10 @@
 
 #include "ace/Auto_Ptr.h"
 
-
 ACE_RCSID (DynamicAny,
            DynAnyFactory,
            "$Id$")
 
-
 // Constructor from typecode
 TAO_DynAnyFactory::TAO_DynAnyFactory (void)
 {
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index ffbad848f3d..338d8636e61 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -1,7 +1,9 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynAny_i.h"
 #include "DynAnyFactory.h"
 
-
 ACE_RCSID (DynamicAny,
            DynAny_i,
            "$Id$")
@@ -60,7 +62,8 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
     case CORBA::tk_null:
       break;
     case CORBA::tk_void:
-      this->any_ = CORBA::Any (CORBA::_tc_void);
+      this->any_ = CORBA::Any (CORBA::_tc_void,
+                               0);
       break;
     case CORBA::tk_short:
       this->any_ <<= ACE_static_cast (CORBA::Short, 0);
@@ -101,7 +104,8 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
       this->any_ <<= ACE_static_cast (CORBA::Double, 0);
       break;
     case CORBA::tk_any:
-      this->any_ <<= CORBA::Any (CORBA::_tc_null);
+      this->any_ <<= CORBA::Any (CORBA::_tc_null,
+                                 0);
       break;
     case CORBA::tk_TypeCode:
       {
@@ -114,9 +118,12 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
       {
         TAO_OutputCDR stream;
         stream << CORBA::Object::_nil ();
-        this->any_._tao_replace (tc,
-                                 TAO_ENCAP_BYTE_ORDER,
-                                 stream.begin ());
+        TAO::Unknown_IDL_Type *unk = 0;
+        ACE_NEW (unk,
+                 TAO::Unknown_IDL_Type (tc,
+                                        stream.begin (),
+                                        TAO_ENCAP_BYTE_ORDER));
+        this->any_.replace (unk);
         break;
       }
     case CORBA::tk_string:
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index c304536d27d..5039f8d689a 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -25,7 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "DynCommon.h"
-#include "tao/Any.h"
+#include "tao/Any_T.h"
 
 #if defined (_MSC_VER)
 # if (_MSC_VER >= 1200)
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index f69fc0d5cf1..67c14e6b3a0 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -1,8 +1,10 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynArray_i.h"
 #include "DynAnyFactory.h"
 #include "tao/Marshal.h"
 
-
 ACE_RCSID (DynamicAny,
            DynArray_i,
            "$Id$")
@@ -62,13 +64,15 @@ TAO_DynArray_i::init (const CORBA::Any & any
     this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  for (CORBA::ULong i = 0; i < numfields; i++)
+  for (CORBA::ULong i = 0; i < numfields; ++i)
     {
-      // This Any constructor is a TAO extension.
-      CORBA::Any field_any (field_tc.in (),
-                            0,
-                            cdr.byte_order (),
-                            cdr.start ());
+      CORBA::Any field_any;
+      TAO::Unknown_IDL_Type *unk = 0;
+      ACE_NEW (unk,
+               TAO::Unknown_IDL_Type (field_tc.in (),
+                                      cdr.start (),
+                                      cdr.byte_order ()));
+      field_any.replace (unk);
 
       // This recursive step will call the correct constructor
       // based on the type of field_any.
@@ -429,11 +433,13 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
 
       for (CORBA::ULong i = 0; i < arg_length; ++i)
         {
-          // This Any constructor is a TAO extension.
-          CORBA::Any field_any (field_tc.in (),
-                               0,
-                               cdr.byte_order (),
-                               cdr.start ());
+          CORBA::Any field_any;
+          TAO::Unknown_IDL_Type *unk = 0;
+          ACE_NEW (unk,
+                   TAO::Unknown_IDL_Type (field_tc.in (),
+                                          cdr.start (),
+                                          cdr.byte_order ()));
+          field_any.replace (unk);
 
           this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
@@ -499,13 +505,19 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Any_ptr retval = 0;
   ACE_NEW_THROW_EX (retval,
-                    CORBA::Any (this->type_.in (),
-                                0,
-                                in_cdr.byte_order (),
-                                in_cdr.start ()),
+                    CORBA::Any,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  TAO::Unknown_IDL_Type *unk = 0;
+  ACE_NEW_THROW_EX (unk,
+                    TAO::Unknown_IDL_Type (this->type_.in (),
+                                           in_cdr.start (),
+                                           in_cdr.byte_order ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
+  retval->replace (unk);
   return retval;
 }
 
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index cf7f985a802..b8cc444b224 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -1,3 +1,6 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynCommon.h"
 #include "DynAnyFactory.h"
 #include "DynAny_i.h"
@@ -7,7 +10,6 @@
 #include "DynStruct_i.h"
 #include "DynUnion_i.h"
 
-
 ACE_RCSID (DynamicAny,
            DynCommon,
            "$Id$")
@@ -478,10 +480,13 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
       if (good_type)
         {
           TAO_OutputCDR cdr;
-          cdr << value;
-          this->any_._tao_replace (this->type_.in (),
-                                   TAO_ENCAP_BYTE_ORDER,
-                                   cdr.begin ());
+          value->marshal (cdr);
+          TAO::Unknown_IDL_Type *unk = 0;
+          ACE_NEW (unk,
+                   TAO::Unknown_IDL_Type (this->type_.in (),
+                                          cdr.begin (),
+                                          TAO_ENCAP_BYTE_ORDER));
+          this->any_.replace (unk);
         }
       else
         {
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index f2f64e38f0d..a39234191fe 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -1,7 +1,9 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynEnum_i.h"
 #include "DynAnyFactory.h"
 
-
 ACE_RCSID (DynamicAny,
            DynEnum_i,
            "$Id$")
@@ -238,12 +240,19 @@ TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Any *retval;
   ACE_NEW_THROW_EX (retval,
-                    CORBA::Any (this->type_.in (),
-                               0,
-                               TAO_ENCAP_BYTE_ORDER,
-                               out_cdr.begin ()),
+                    CORBA::Any,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  TAO::Unknown_IDL_Type *unk = 0;
+  ACE_NEW_THROW_EX (unk,
+                    TAO::Unknown_IDL_Type (this->type_.in (),
+                                           out_cdr.begin (),
+                                           TAO_ENCAP_BYTE_ORDER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
+
+  retval->replace (unk);
   return retval;
 }
 
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 79f5aab7fcb..e8990ae1075 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -1,8 +1,10 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynSequence_i.h"
 #include "DynAnyFactory.h"
 #include "tao/Marshal.h"
 
-
 ACE_RCSID (DynamicAny,
            DynSequence_i,
            "$Id$")
@@ -69,11 +71,13 @@ TAO_DynSequence_i::init (const CORBA::Any& any
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      // This Any constructor is a TAO extension.
-      CORBA::Any field_any (field_tc.in (),
-                            0,
-                            cdr.byte_order (),
-                            cdr.start ());
+      CORBA::Any field_any;
+      TAO::Unknown_IDL_Type *unk = 0;
+      ACE_NEW (unk,
+               TAO::Unknown_IDL_Type (field_tc.in (),
+                                      cdr.start (),
+                                      cdr.byte_order ()));
+      field_any.replace (unk);
 
       // This recursive step will call the correct constructor
       // based on the type of field_any.
@@ -585,11 +589,13 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
 
       for (CORBA::ULong i = 0; i < arg_length; ++i)
         {
-          // This Any constructor is a TAO extension.
-          CORBA::Any field_any (field_tc.in (),
-                                0,
-                                cdr.byte_order (),
-                                cdr.start ());
+          CORBA::Any field_any;
+          TAO::Unknown_IDL_Type *unk = 0;
+          ACE_NEW (unk,
+                   TAO::Unknown_IDL_Type (field_tc.in (),
+                                          cdr.start (),
+                                          cdr.byte_order ()));
+          field_any.replace (unk);
 
           if (i < this->component_count_)
             {
@@ -676,13 +682,19 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Any_ptr retval = 0;
   ACE_NEW_THROW_EX (retval,
-                    CORBA::Any (this->type_.in (),
-                                0,
-                                in_cdr.byte_order (),
-                                in_cdr.start ()),
+                    CORBA::Any,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  TAO::Unknown_IDL_Type *unk = 0;
+  ACE_NEW_THROW_EX (unk,
+                    TAO::Unknown_IDL_Type (this->type_.in (),
+                                           in_cdr.start (),
+                                           in_cdr.byte_order ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
+  retval->replace (unk);
   return retval;
 }
 
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index 3288c2a896c..911406c00c2 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -1,8 +1,10 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynStruct_i.h"
 #include "DynAnyFactory.h"
 #include "tao/Marshal.h"
 
-
 ACE_RCSID (DynamicAny,
            DynStruct_i,
            "$Id$")
@@ -104,11 +106,13 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any
                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      // This Any constructor is a TAO extension.
-      CORBA::Any field_any (field_tc.in (),
-                           0,
-                           cdr.byte_order (),
-                           cdr.start ());
+      CORBA::Any field_any;
+      TAO::Unknown_IDL_Type *unk = 0;
+      ACE_NEW (unk,
+               TAO::Unknown_IDL_Type (field_tc.in (),
+                                      cdr.start (),
+                                      cdr.byte_order ()));
+      field_any.replace (unk);
 
       // This recursive step will call the correct constructor
       // based on the type of field_any.
@@ -537,7 +541,54 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any
 
   if (equivalent)
     {
-       this->set_from_any (any ACE_ENV_ARG_PARAMETER);
+      // Get the CDR stream of the argument.
+      ACE_Message_Block* mb = any._tao_get_cdr ();
+      TAO_InputCDR cdr (mb,
+                        any._tao_byte_order ());
+
+      // If we have an exception type, unmarshal the repository ID.
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in ()
+                                                       ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      if (kind == CORBA::tk_except)
+        {
+          CORBA::String_var str;
+          cdr >> str.out ();
+        }
+
+      CORBA::TypeCode_var field_tc;
+
+      for (CORBA::ULong i = 0; i < this->component_count_; ++i)
+        {
+          field_tc = this->type_.in ()->member_type (i
+                                                     ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          CORBA::Any field_any;
+          TAO::Unknown_IDL_Type *unk = 0;
+          ACE_NEW (unk,
+                   TAO::Unknown_IDL_Type (field_tc.in (),
+                                          cdr.start (),
+                                          cdr.byte_order ()));
+          field_any.replace (unk);
+
+          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
+
+          this->da_members_[i] =
+            TAO_DynAnyFactory::make_dyn_any (field_any
+                                                       ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          // Move to the next field in the CDR stream.
+          (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
+                                                   &cdr
+                                                   ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
+      this->current_position_ = this->component_count_ ? 0 : -1;
     }
   else
     {
@@ -594,13 +645,19 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Any_ptr retval = 0;
   ACE_NEW_THROW_EX (retval,
-                    CORBA::Any (this->type_.in (),
-                                0,
-                                in_cdr.byte_order (),
-                                in_cdr.start ()),
+                    CORBA::Any,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  TAO::Unknown_IDL_Type *unk = 0;
+  ACE_NEW_THROW_EX (unk,
+                    TAO::Unknown_IDL_Type (this->type_.in (),
+                                           in_cdr.start (),
+                                           in_cdr.byte_order ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
+  retval->replace (unk);
   return retval;
 }
 
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 720d5c37e0b..0a257feb3a6 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -1,8 +1,10 @@
+/* -*- C++ -*- */
+// $Id$
+
 #include "DynUnion_i.h"
 #include "DynAnyFactory.h"
 #include "tao/Marshal.h"
 
-
 ACE_RCSID (DynamicAny,
            DynUnion_i,
            "$Id$")
@@ -48,18 +50,11 @@ TAO_DynUnion_i::init (const CORBA::Any& any
 
   this->init_common ();
 
-  // Map TypeMismatch to InconsistentTypeCode.2
-  ACE_TRY
-  {
-     this->set_from_any (any
-                         ACE_ENV_ARG_PARAMETER);
-     ACE_CHECK;
-  }
-  ACE_CATCH(DynamicAny::DynAny::TypeMismatch, ex)
-  {
-     ACE_TRY_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
-  }
-  ACE_ENDTRY;
+  // Set the from_factory arg to TRUE, so any problems will throw
+  // InconsistentTypeCode.
+  this->set_from_any (any,
+                      1
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -146,7 +141,8 @@ TAO_DynUnion_i::_tao_QueryInterface (ptr_arith_t type)
 // This code is common to from_any() and the init() overload that takes
 // an Any argument.
 void
-TAO_DynUnion_i::set_from_any (const CORBA::Any & any
+TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
+                              CORBA::Boolean from_factory
                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -162,13 +158,17 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
 
   CORBA::TypeCode_var tc = any.type ();
 
-  CORBA::TypeCode_var disc_tc = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var disc_tc = 
+    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Any disc_any (disc_tc.in (),
-                      0,
-                      cdr.byte_order (),
-                      cdr.start ());
+  CORBA::Any disc_any;
+  TAO::Unknown_IDL_Type *unk = 0;
+  ACE_NEW (unk,
+           TAO::Unknown_IDL_Type (disc_tc.in (),
+                                  cdr.start (),
+                                  cdr.byte_order ()));
+  disc_any.replace (unk);
 
   // Need this here because we might have been called from init().
   if (!CORBA::is_nil (this->discriminator_.in ()))
@@ -225,10 +225,13 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::Any member_any (member_tc.in (),
-                            0,
-                            cdr.byte_order (),
-                            cdr.start ());
+      CORBA::Any member_any;
+      TAO::Unknown_IDL_Type *unk = 0;
+      ACE_NEW (unk,
+               TAO::Unknown_IDL_Type (member_tc.in (),
+                                      cdr.start (),
+                                      cdr.byte_order ()));
+      member_any.replace (unk);
 
       this->member_ =
         TAO_DynAnyFactory::make_dyn_any (member_any
@@ -264,10 +267,13 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
                                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          CORBA::Any default_any (default_tc.in (),
-                                 0,
-                                 cdr.byte_order (),
-                                 cdr.start ());
+          CORBA::Any default_any;
+          TAO::Unknown_IDL_Type *unk = 0;
+          ACE_NEW (unk,
+                   TAO::Unknown_IDL_Type (default_tc.in (),
+                                          cdr.start (),
+                                          cdr.byte_order ()));
+          default_any.replace (unk);
 
           this->member_ =
             TAO_DynAnyFactory::make_dyn_any (default_any
@@ -707,7 +713,10 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any
       // May be changed in set_from_any().
       this->component_count_ = 2;
 
-      this->set_from_any (any
+      // Set the from_factory arg to FALSE, so any problems will throw
+      // TypeMismatch.
+      this->set_from_any (any,
+                          0
                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
@@ -774,13 +783,19 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Any_ptr retval = 0;
   ACE_NEW_THROW_EX (retval,
-                    CORBA::Any (this->type_.in (),
-                               0,
-                               in_cdr.byte_order (),
-                               in_cdr.start ()),
+                    CORBA::Any,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  TAO::Unknown_IDL_Type *unk = 0;
+  ACE_NEW_THROW_EX (unk,
+                    TAO::Unknown_IDL_Type (this->type_.in (),
+                                           in_cdr.start (),
+                                           in_cdr.byte_order ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
+  retval->replace (unk);
   return retval;
 }
 
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index 9ef3d4b215c..c5038b1bf9a 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -180,7 +180,8 @@ public:
 private:
   // Code common to the constructor from an Any arg and the member
   // function from_any().
-  void set_from_any (const CORBA::Any &any
+  void set_from_any (const CORBA::Any &any,
+                     CORBA::Boolean from_factory
                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl
index 8c5273acae2..09dc9b8e59c 100644
--- a/TAO/tao/DynamicAny/DynamicAny.pidl
+++ b/TAO/tao/DynamicAny/DynamicAny.pidl
@@ -20,7 +20,7 @@
  * The command used to generate code from this file is:
  *
  * tao_idl \
- *  -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 \
+ *  -o orig -Gp -Gd -Ge 1 \
  *          -Wb,export_macro=TAO_DynamicAny_Export \
  *          -Wb,export_include=dynamicany_export.h \
  *          -Wb,pre_include="ace/pre.h" \
@@ -214,6 +214,4 @@ module DynamicAny {
 
 }; // module DynamicAny
 
-#pragma prefix ""
-
 #endif // _DYNAMIC_ANY_IDL_
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index 29c23419094..0eba50e1727 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "DynamicAny.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "DynamicAny.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,6 +44,9 @@
 #include "DynamicAnyC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynAny::_tao_class_id = 0;
 
 DynamicAny::DynAny_ptr
@@ -84,13 +92,23 @@ tao_DynamicAny_DynAny_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynAny_marshal (
+    DynamicAny::DynAny_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynAny_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynAny_var::DynAny_var (void) // default constructor
+DynamicAny::DynAny_var::DynAny_var (void)
   : ptr_ (DynAny::_nil ())
 {}
 
@@ -100,12 +118,12 @@ DynamicAny::DynAny_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynAny_var::DynAny_var (const ::DynamicAny::DynAny_var &p) // copy constructor
+DynamicAny::DynAny_var::DynAny_var (const ::DynamicAny::DynAny_var &p)
   : TAO_Base_var (),
     ptr_ (DynAny::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynAny_var::~DynAny_var (void) // destructor
+DynamicAny::DynAny_var::~DynAny_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -134,7 +152,7 @@ DynamicAny::DynAny_var::operator const ::DynamicAny::DynAny_ptr &() const // cas
   return this->ptr_;
 }
 
-DynamicAny::DynAny_var::operator ::DynamicAny::DynAny_ptr &() // cast
+DynamicAny::DynAny_var::operator ::DynamicAny::DynAny_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -209,10 +227,11 @@ DynamicAny::DynAny_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynAny_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynAny_out::DynAny_out (DynAny_ptr &p)
@@ -221,14 +240,14 @@ DynamicAny::DynAny_out::DynAny_out (DynAny_ptr &p)
   this->ptr_ = ::DynamicAny::DynAny::_nil ();
 }
 
-DynamicAny::DynAny_out::DynAny_out (DynAny_var &p) // constructor from _var
+DynamicAny::DynAny_out::DynAny_out (DynAny_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynAny::_nil ();
 }
 
-DynamicAny::DynAny_out::DynAny_out (const ::DynamicAny::DynAny_out &p) // copy constructor
+DynamicAny::DynAny_out::DynAny_out (const ::DynamicAny::DynAny_out &p)
   : ptr_ (ACE_const_cast (DynAny_out &, p).ptr_)
 {}
 
@@ -259,7 +278,7 @@ DynamicAny::DynAny_out::operator ::DynamicAny::DynAny_ptr &() // cast
 }
 
 ::DynamicAny::DynAny_ptr &
-DynamicAny::DynAny_out::ptr (void) // ptr
+DynamicAny::DynAny_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -270,9 +289,8 @@ DynamicAny::DynAny_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynAny::DynAny (void)
 {}
@@ -280,7 +298,8 @@ DynamicAny::DynAny::DynAny (void)
 DynamicAny::DynAny::~DynAny (void)
 {}
 
-DynamicAny::DynAny_ptr DynamicAny::DynAny::_narrow (
+DynamicAny::DynAny_ptr
+DynamicAny::DynAny::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -288,50 +307,68 @@ DynamicAny::DynAny_ptr DynamicAny::DynAny::_narrow (
   return DynAny::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynAny_ptr
+DynamicAny::DynAny_ptr 
 DynamicAny::DynAny::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynAny::_nil ();
+    {
+      return DynAny::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynAny_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynAny::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynAny::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynAny_ptr
 DynamicAny::DynAny::_duplicate (DynAny_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynAny::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -340,7 +377,9 @@ const char* DynamicAny::DynAny::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynAny:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 DynamicAny::DynAny::InvalidValue::InvalidValue (void)
   : CORBA::UserException (
         "IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0",
@@ -349,12 +388,10 @@ DynamicAny::DynAny::InvalidValue::InvalidValue (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 DynamicAny::DynAny::InvalidValue::~InvalidValue (void)
 {
 }
 
-// Copy constructor.
 DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -363,7 +400,6 @@ DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::Inva
 {
 }
 
-// Assignment operator.
 DynamicAny::DynAny::InvalidValue&
 DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
 {
@@ -372,11 +408,11 @@ DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::Invalid
 }
 
 DynamicAny::DynAny::InvalidValue *
-DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception *exc)
+DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InvalidValue *, exc);
+      return ACE_dynamic_cast (InvalidValue *, _tao_excp);
     }
   else
     {
@@ -397,13 +433,13 @@ DynamicAny::DynAny::InvalidValue::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      DynamicAny::DynAny::InvalidValue (*this),
+      ::DynamicAny::DynAny::InvalidValue (*this),
       0
     );
   return result;
 }
 
-void DynamicAny::DynAny::InvalidValue::_raise ()
+void DynamicAny::DynAny::InvalidValue::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -424,7 +460,11 @@ void DynamicAny::DynAny::InvalidValue::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 DynamicAny::DynAny::TypeMismatch::TypeMismatch (void)
   : CORBA::UserException (
         "IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0",
@@ -433,12 +473,10 @@ DynamicAny::DynAny::TypeMismatch::TypeMismatch (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 DynamicAny::DynAny::TypeMismatch::~TypeMismatch (void)
 {
 }
 
-// Copy constructor.
 DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -447,7 +485,6 @@ DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::Type
 {
 }
 
-// Assignment operator.
 DynamicAny::DynAny::TypeMismatch&
 DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
 {
@@ -456,11 +493,11 @@ DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMis
 }
 
 DynamicAny::DynAny::TypeMismatch *
-DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception *exc)
+DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (TypeMismatch *, exc);
+      return ACE_dynamic_cast (TypeMismatch *, _tao_excp);
     }
   else
     {
@@ -481,13 +518,13 @@ DynamicAny::DynAny::TypeMismatch::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      DynamicAny::DynAny::TypeMismatch (*this),
+      ::DynamicAny::DynAny::TypeMismatch (*this),
       0
     );
   return result;
 }
 
-void DynamicAny::DynAny::TypeMismatch::_raise ()
+void DynamicAny::DynAny::TypeMismatch::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -508,6 +545,11 @@ void DynamicAny::DynAny::TypeMismatch::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynFixed::_tao_class_id = 0;
 
 DynamicAny::DynFixed_ptr
@@ -553,13 +595,23 @@ tao_DynamicAny_DynFixed_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynFixed_marshal (
+    DynamicAny::DynFixed_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynFixed_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynFixed_var::DynFixed_var (void) // default constructor
+DynamicAny::DynFixed_var::DynFixed_var (void)
   : ptr_ (DynFixed::_nil ())
 {}
 
@@ -569,12 +621,12 @@ DynamicAny::DynFixed_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynFixed_var::DynFixed_var (const ::DynamicAny::DynFixed_var &p) // copy constructor
+DynamicAny::DynFixed_var::DynFixed_var (const ::DynamicAny::DynFixed_var &p)
   : TAO_Base_var (),
     ptr_ (DynFixed::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynFixed_var::~DynFixed_var (void) // destructor
+DynamicAny::DynFixed_var::~DynFixed_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -603,7 +655,7 @@ DynamicAny::DynFixed_var::operator const ::DynamicAny::DynFixed_ptr &() const //
   return this->ptr_;
 }
 
-DynamicAny::DynFixed_var::operator ::DynamicAny::DynFixed_ptr &() // cast
+DynamicAny::DynFixed_var::operator ::DynamicAny::DynFixed_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -678,10 +730,11 @@ DynamicAny::DynFixed_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynFixed_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynFixed_out::DynFixed_out (DynFixed_ptr &p)
@@ -690,14 +743,14 @@ DynamicAny::DynFixed_out::DynFixed_out (DynFixed_ptr &p)
   this->ptr_ = ::DynamicAny::DynFixed::_nil ();
 }
 
-DynamicAny::DynFixed_out::DynFixed_out (DynFixed_var &p) // constructor from _var
+DynamicAny::DynFixed_out::DynFixed_out (DynFixed_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynFixed::_nil ();
 }
 
-DynamicAny::DynFixed_out::DynFixed_out (const ::DynamicAny::DynFixed_out &p) // copy constructor
+DynamicAny::DynFixed_out::DynFixed_out (const ::DynamicAny::DynFixed_out &p)
   : ptr_ (ACE_const_cast (DynFixed_out &, p).ptr_)
 {}
 
@@ -728,7 +781,7 @@ DynamicAny::DynFixed_out::operator ::DynamicAny::DynFixed_ptr &() // cast
 }
 
 ::DynamicAny::DynFixed_ptr &
-DynamicAny::DynFixed_out::ptr (void) // ptr
+DynamicAny::DynFixed_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -739,9 +792,8 @@ DynamicAny::DynFixed_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynFixed::DynFixed (void)
 {}
@@ -749,7 +801,8 @@ DynamicAny::DynFixed::DynFixed (void)
 DynamicAny::DynFixed::~DynFixed (void)
 {}
 
-DynamicAny::DynFixed_ptr DynamicAny::DynFixed::_narrow (
+DynamicAny::DynFixed_ptr
+DynamicAny::DynFixed::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -757,62 +810,82 @@ DynamicAny::DynFixed_ptr DynamicAny::DynFixed::_narrow (
   return DynFixed::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynFixed_ptr
+DynamicAny::DynFixed_ptr 
 DynamicAny::DynFixed::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynFixed::_nil ();
+    {
+      return DynFixed::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynFixed_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynFixed::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynFixed::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynFixed_ptr
 DynamicAny::DynFixed::_duplicate (DynFixed_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynFixed::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynFixed)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynFixed)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -821,6 +894,9 @@ const char* DynamicAny::DynFixed::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynFixed:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynEnum::_tao_class_id = 0;
 
 DynamicAny::DynEnum_ptr
@@ -866,13 +942,23 @@ tao_DynamicAny_DynEnum_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynEnum_marshal (
+    DynamicAny::DynEnum_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynEnum_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynEnum_var::DynEnum_var (void) // default constructor
+DynamicAny::DynEnum_var::DynEnum_var (void)
   : ptr_ (DynEnum::_nil ())
 {}
 
@@ -882,12 +968,12 @@ DynamicAny::DynEnum_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynEnum_var::DynEnum_var (const ::DynamicAny::DynEnum_var &p) // copy constructor
+DynamicAny::DynEnum_var::DynEnum_var (const ::DynamicAny::DynEnum_var &p)
   : TAO_Base_var (),
     ptr_ (DynEnum::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynEnum_var::~DynEnum_var (void) // destructor
+DynamicAny::DynEnum_var::~DynEnum_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -916,7 +1002,7 @@ DynamicAny::DynEnum_var::operator const ::DynamicAny::DynEnum_ptr &() const // c
   return this->ptr_;
 }
 
-DynamicAny::DynEnum_var::operator ::DynamicAny::DynEnum_ptr &() // cast
+DynamicAny::DynEnum_var::operator ::DynamicAny::DynEnum_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -991,10 +1077,11 @@ DynamicAny::DynEnum_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynEnum_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynEnum_out::DynEnum_out (DynEnum_ptr &p)
@@ -1003,14 +1090,14 @@ DynamicAny::DynEnum_out::DynEnum_out (DynEnum_ptr &p)
   this->ptr_ = ::DynamicAny::DynEnum::_nil ();
 }
 
-DynamicAny::DynEnum_out::DynEnum_out (DynEnum_var &p) // constructor from _var
+DynamicAny::DynEnum_out::DynEnum_out (DynEnum_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynEnum::_nil ();
 }
 
-DynamicAny::DynEnum_out::DynEnum_out (const ::DynamicAny::DynEnum_out &p) // copy constructor
+DynamicAny::DynEnum_out::DynEnum_out (const ::DynamicAny::DynEnum_out &p)
   : ptr_ (ACE_const_cast (DynEnum_out &, p).ptr_)
 {}
 
@@ -1041,7 +1128,7 @@ DynamicAny::DynEnum_out::operator ::DynamicAny::DynEnum_ptr &() // cast
 }
 
 ::DynamicAny::DynEnum_ptr &
-DynamicAny::DynEnum_out::ptr (void) // ptr
+DynamicAny::DynEnum_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1052,9 +1139,8 @@ DynamicAny::DynEnum_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynEnum::DynEnum (void)
 {}
@@ -1062,7 +1148,8 @@ DynamicAny::DynEnum::DynEnum (void)
 DynamicAny::DynEnum::~DynEnum (void)
 {}
 
-DynamicAny::DynEnum_ptr DynamicAny::DynEnum::_narrow (
+DynamicAny::DynEnum_ptr
+DynamicAny::DynEnum::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1070,62 +1157,82 @@ DynamicAny::DynEnum_ptr DynamicAny::DynEnum::_narrow (
   return DynEnum::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynEnum_ptr
+DynamicAny::DynEnum_ptr 
 DynamicAny::DynEnum::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynEnum::_nil ();
+    {
+      return DynEnum::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynEnum_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynEnum::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynEnum::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynEnum_ptr
 DynamicAny::DynEnum::_duplicate (DynEnum_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynEnum::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynEnum)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynEnum)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1134,112 +1241,14 @@ const char* DynamicAny::DynEnum::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynEnum:1.0";
 }
 
-static const CORBA::Long _oc_DynamicAny_FieldName[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d696341),
-  ACE_NTOHL (0x6e792f46),
-  ACE_NTOHL (0x69656c64),
-  ACE_NTOHL (0x4e616d65),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/DynamicAny/FieldName:1.0
-  10,
-  ACE_NTOHL (0x4669656c),
-  ACE_NTOHL (0x644e616d),
-  ACE_NTOHL (0x65000000),  // name = FieldName
-  CORBA::tk_string,
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_DynamicAny_FieldName (
-    CORBA::tk_alias,
-    sizeof (_oc_DynamicAny_FieldName),
-    (char *) &_oc_DynamicAny_FieldName,
-    0,
-    sizeof (DynamicAny::FieldName)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (DynamicAny)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_FieldName, &_tc_TAO_tc_DynamicAny_FieldName)
-TAO_NAMESPACE_END
-
-static const CORBA::Long _oc_DynamicAny_NameValuePair[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d696341),
-  ACE_NTOHL (0x6e792f4e),
-  ACE_NTOHL (0x616d6556),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x50616972),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/DynamicAny/NameValuePair:1.0
-  14,
-  ACE_NTOHL (0x4e616d65),
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65506169),
-  ACE_NTOHL (0x72000000),  // name = NameValuePair
-  2, // member count
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x44796e61),
-    ACE_NTOHL (0x6d696341),
-    ACE_NTOHL (0x6e792f46),
-    ACE_NTOHL (0x69656c64),
-    ACE_NTOHL (0x4e616d65),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/DynamicAny/FieldName:1.0
-    10,
-    ACE_NTOHL (0x4669656c),
-    ACE_NTOHL (0x644e616d),
-    ACE_NTOHL (0x65000000),  // name = FieldName
-    CORBA::tk_string,
-    0U, // string length
-
-  6,
-  ACE_NTOHL (0x76616c75),
-  ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_any,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_DynamicAny_NameValuePair (
-    CORBA::tk_struct,
-    sizeof (_oc_DynamicAny_NameValuePair),
-    (char *) &_oc_DynamicAny_NameValuePair,
-    0,
-    sizeof (DynamicAny::NameValuePair)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (DynamicAny)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NameValuePair, &_tc_TAO_tc_DynamicAny_NameValuePair)
-TAO_NAMESPACE_END
-
-void DynamicAny::NameValuePair::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NameValuePair *tmp = ACE_static_cast (NameValuePair*, _tao_void_pointer);
-  delete tmp;
-}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_)
@@ -1250,18 +1259,23 @@ DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_allocate_buffe
 {
   DynamicAny::NameValuePair* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    DynamicAny::NameValuePair *old = ACE_reinterpret_cast (DynamicAny::NameValuePair *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (old);
-
-  }
+    {
+      DynamicAny::NameValuePair *old =
+        ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -1269,164 +1283,94 @@ void
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  DynamicAny::NameValuePair *tmp =
+    ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
   _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void) // Dtor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // DynamicAny::NameValuePairSeq
 // *************************************************************
 
 DynamicAny::NameValuePairSeq::NameValuePairSeq (void)
 {}
-DynamicAny::NameValuePairSeq::NameValuePairSeq (CORBA::ULong max) // uses max size
-  :
+
+DynamicAny::NameValuePairSeq::NameValuePairSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<DynamicAny::NameValuePair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-DynamicAny::NameValuePairSeq::NameValuePairSeq (CORBA::ULong max, CORBA::ULong length, DynamicAny::NameValuePair *buffer, CORBA::Boolean release)
-  :
+
+DynamicAny::NameValuePairSeq::NameValuePairSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    DynamicAny::NameValuePair *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<DynamicAny::NameValuePair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-DynamicAny::NameValuePairSeq::NameValuePairSeq (const NameValuePairSeq &seq) // copy ctor
-  :
+
+DynamicAny::NameValuePairSeq::NameValuePairSeq (const NameValuePairSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<DynamicAny::NameValuePair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 DynamicAny::NameValuePairSeq::~NameValuePairSeq (void) // dtor
 {}
-void DynamicAny::NameValuePairSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NameValuePairSeq *tmp = ACE_static_cast (NameValuePairSeq*, _tao_void_pointer);
-  delete tmp;
-}
+
 
 
 #endif /* end #if !defined */
 
-static const CORBA::Long _oc_DynamicAny_NameValuePairSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d696341),
-  ACE_NTOHL (0x6e792f4e),
-  ACE_NTOHL (0x616d6556),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x50616972),
-  ACE_NTOHL (0x5365713a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/DynamicAny/NameValuePairSeq:1.0
-  17,
-  ACE_NTOHL (0x4e616d65),
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65506169),
-  ACE_NTOHL (0x72536571),
-  ACE_NTOHL (0x0),  // name = NameValuePairSeq
-  CORBA::tk_sequence, // typecode kind
-  196, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    180, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      41,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x44796e61),
-      ACE_NTOHL (0x6d696341),
-      ACE_NTOHL (0x6e792f4e),
-      ACE_NTOHL (0x616d6556),
-      ACE_NTOHL (0x616c7565),
-      ACE_NTOHL (0x50616972),
-      ACE_NTOHL (0x3a312e30),
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/DynamicAny/NameValuePair:1.0
-      14,
-      ACE_NTOHL (0x4e616d65),
-      ACE_NTOHL (0x56616c75),
-      ACE_NTOHL (0x65506169),
-      ACE_NTOHL (0x72000000),  // name = NameValuePair
-      2, // member count
-      3,
-      ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x44796e61),
-        ACE_NTOHL (0x6d696341),
-        ACE_NTOHL (0x6e792f46),
-        ACE_NTOHL (0x69656c64),
-        ACE_NTOHL (0x4e616d65),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/DynamicAny/FieldName:1.0
-        10,
-        ACE_NTOHL (0x4669656c),
-        ACE_NTOHL (0x644e616d),
-        ACE_NTOHL (0x65000000),  // name = FieldName
-        CORBA::tk_string,
-        0U, // string length
-
-      6,
-      ACE_NTOHL (0x76616c75),
-      ACE_NTOHL (0x65000000),  // name = value
-      CORBA::tk_any,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_DynamicAny_NameValuePairSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_DynamicAny_NameValuePairSeq),
-    (char *) &_oc_DynamicAny_NameValuePairSeq,
-    0,
-    sizeof (DynamicAny::NameValuePairSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (DynamicAny)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NameValuePairSeq, &_tc_TAO_tc_DynamicAny_NameValuePairSeq)
-TAO_NAMESPACE_END
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
@@ -1437,18 +1381,23 @@ DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_allocate_buff
 {
   DynamicAny::NameDynAnyPair* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    DynamicAny::NameDynAnyPair *old = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (old);
-
-  }
+    {
+      DynamicAny::NameDynAnyPair *old =
+        ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -1456,72 +1405,89 @@ void
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  DynamicAny::NameDynAnyPair *tmp =
+    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
   _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void) // Dtor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // DynamicAny::NameDynAnyPairSeq
 // *************************************************************
 
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (void)
 {}
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (CORBA::ULong max) // uses max size
-  :
+
+DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (CORBA::ULong max, CORBA::ULong length, DynamicAny::NameDynAnyPair *buffer, CORBA::Boolean release)
-  :
+
+DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    DynamicAny::NameDynAnyPair *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (const NameDynAnyPairSeq &seq) // copy ctor
-  :
+
+DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (const NameDynAnyPairSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void) // dtor
 {}
-void DynamicAny::NameDynAnyPairSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NameDynAnyPairSeq *tmp = ACE_static_cast (NameDynAnyPairSeq*, _tao_void_pointer);
-  delete tmp;
-}
+
 
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynStruct::_tao_class_id = 0;
 
 DynamicAny::DynStruct_ptr
@@ -1567,13 +1533,23 @@ tao_DynamicAny_DynStruct_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynStruct_marshal (
+    DynamicAny::DynStruct_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynStruct_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynStruct_var::DynStruct_var (void) // default constructor
+DynamicAny::DynStruct_var::DynStruct_var (void)
   : ptr_ (DynStruct::_nil ())
 {}
 
@@ -1583,12 +1559,12 @@ DynamicAny::DynStruct_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynStruct_var::DynStruct_var (const ::DynamicAny::DynStruct_var &p) // copy constructor
+DynamicAny::DynStruct_var::DynStruct_var (const ::DynamicAny::DynStruct_var &p)
   : TAO_Base_var (),
     ptr_ (DynStruct::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynStruct_var::~DynStruct_var (void) // destructor
+DynamicAny::DynStruct_var::~DynStruct_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1617,7 +1593,7 @@ DynamicAny::DynStruct_var::operator const ::DynamicAny::DynStruct_ptr &() const
   return this->ptr_;
 }
 
-DynamicAny::DynStruct_var::operator ::DynamicAny::DynStruct_ptr &() // cast
+DynamicAny::DynStruct_var::operator ::DynamicAny::DynStruct_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1692,10 +1668,11 @@ DynamicAny::DynStruct_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynStruct_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynStruct_out::DynStruct_out (DynStruct_ptr &p)
@@ -1704,14 +1681,14 @@ DynamicAny::DynStruct_out::DynStruct_out (DynStruct_ptr &p)
   this->ptr_ = ::DynamicAny::DynStruct::_nil ();
 }
 
-DynamicAny::DynStruct_out::DynStruct_out (DynStruct_var &p) // constructor from _var
+DynamicAny::DynStruct_out::DynStruct_out (DynStruct_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynStruct::_nil ();
 }
 
-DynamicAny::DynStruct_out::DynStruct_out (const ::DynamicAny::DynStruct_out &p) // copy constructor
+DynamicAny::DynStruct_out::DynStruct_out (const ::DynamicAny::DynStruct_out &p)
   : ptr_ (ACE_const_cast (DynStruct_out &, p).ptr_)
 {}
 
@@ -1742,7 +1719,7 @@ DynamicAny::DynStruct_out::operator ::DynamicAny::DynStruct_ptr &() // cast
 }
 
 ::DynamicAny::DynStruct_ptr &
-DynamicAny::DynStruct_out::ptr (void) // ptr
+DynamicAny::DynStruct_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1753,9 +1730,8 @@ DynamicAny::DynStruct_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynStruct::DynStruct (void)
 {}
@@ -1763,7 +1739,8 @@ DynamicAny::DynStruct::DynStruct (void)
 DynamicAny::DynStruct::~DynStruct (void)
 {}
 
-DynamicAny::DynStruct_ptr DynamicAny::DynStruct::_narrow (
+DynamicAny::DynStruct_ptr
+DynamicAny::DynStruct::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1771,62 +1748,82 @@ DynamicAny::DynStruct_ptr DynamicAny::DynStruct::_narrow (
   return DynStruct::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynStruct_ptr
+DynamicAny::DynStruct_ptr 
 DynamicAny::DynStruct::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynStruct::_nil ();
+    {
+      return DynStruct::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynStruct_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynStruct::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynStruct::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynStruct_ptr
 DynamicAny::DynStruct::_duplicate (DynStruct_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynStruct::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynStruct)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynStruct)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1835,6 +1832,9 @@ const char* DynamicAny::DynStruct::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynStruct:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynUnion::_tao_class_id = 0;
 
 DynamicAny::DynUnion_ptr
@@ -1880,13 +1880,23 @@ tao_DynamicAny_DynUnion_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynUnion_marshal (
+    DynamicAny::DynUnion_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynUnion_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynUnion_var::DynUnion_var (void) // default constructor
+DynamicAny::DynUnion_var::DynUnion_var (void)
   : ptr_ (DynUnion::_nil ())
 {}
 
@@ -1896,12 +1906,12 @@ DynamicAny::DynUnion_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynUnion_var::DynUnion_var (const ::DynamicAny::DynUnion_var &p) // copy constructor
+DynamicAny::DynUnion_var::DynUnion_var (const ::DynamicAny::DynUnion_var &p)
   : TAO_Base_var (),
     ptr_ (DynUnion::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynUnion_var::~DynUnion_var (void) // destructor
+DynamicAny::DynUnion_var::~DynUnion_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1930,7 +1940,7 @@ DynamicAny::DynUnion_var::operator const ::DynamicAny::DynUnion_ptr &() const //
   return this->ptr_;
 }
 
-DynamicAny::DynUnion_var::operator ::DynamicAny::DynUnion_ptr &() // cast
+DynamicAny::DynUnion_var::operator ::DynamicAny::DynUnion_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2005,10 +2015,11 @@ DynamicAny::DynUnion_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynUnion_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynUnion_out::DynUnion_out (DynUnion_ptr &p)
@@ -2017,14 +2028,14 @@ DynamicAny::DynUnion_out::DynUnion_out (DynUnion_ptr &p)
   this->ptr_ = ::DynamicAny::DynUnion::_nil ();
 }
 
-DynamicAny::DynUnion_out::DynUnion_out (DynUnion_var &p) // constructor from _var
+DynamicAny::DynUnion_out::DynUnion_out (DynUnion_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynUnion::_nil ();
 }
 
-DynamicAny::DynUnion_out::DynUnion_out (const ::DynamicAny::DynUnion_out &p) // copy constructor
+DynamicAny::DynUnion_out::DynUnion_out (const ::DynamicAny::DynUnion_out &p)
   : ptr_ (ACE_const_cast (DynUnion_out &, p).ptr_)
 {}
 
@@ -2055,7 +2066,7 @@ DynamicAny::DynUnion_out::operator ::DynamicAny::DynUnion_ptr &() // cast
 }
 
 ::DynamicAny::DynUnion_ptr &
-DynamicAny::DynUnion_out::ptr (void) // ptr
+DynamicAny::DynUnion_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2066,9 +2077,8 @@ DynamicAny::DynUnion_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynUnion::DynUnion (void)
 {}
@@ -2076,7 +2086,8 @@ DynamicAny::DynUnion::DynUnion (void)
 DynamicAny::DynUnion::~DynUnion (void)
 {}
 
-DynamicAny::DynUnion_ptr DynamicAny::DynUnion::_narrow (
+DynamicAny::DynUnion_ptr
+DynamicAny::DynUnion::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2084,62 +2095,82 @@ DynamicAny::DynUnion_ptr DynamicAny::DynUnion::_narrow (
   return DynUnion::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynUnion_ptr
+DynamicAny::DynUnion_ptr 
 DynamicAny::DynUnion::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynUnion::_nil ();
+    {
+      return DynUnion::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynUnion_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynUnion::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynUnion::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynUnion_ptr
 DynamicAny::DynUnion::_duplicate (DynUnion_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynUnion::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynUnion)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynUnion)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -2148,6 +2179,8 @@ const char* DynamicAny::DynUnion::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynUnion:1.0";
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -2159,18 +2192,23 @@ DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_allocate_buffer (CORBA::
 {
   CORBA::Any* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    CORBA::Any *old = ACE_reinterpret_cast (CORBA::Any *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (old);
-
-  }
+    {
+      CORBA::Any *old =
+        ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -2178,110 +2216,88 @@ void
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  CORBA::Any *tmp =
+    ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
   _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::~_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void) // Dtor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::~_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_ANYSEQ_CS_)
 #define _DYNAMICANY_ANYSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // DynamicAny::AnySeq
 // *************************************************************
 
 DynamicAny::AnySeq::AnySeq (void)
 {}
-DynamicAny::AnySeq::AnySeq (CORBA::ULong max) // uses max size
-  :
+
+DynamicAny::AnySeq::AnySeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_AnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-DynamicAny::AnySeq::AnySeq (CORBA::ULong max, CORBA::ULong length, CORBA::Any *buffer, CORBA::Boolean release)
-  :
+
+DynamicAny::AnySeq::AnySeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Any *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_AnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-DynamicAny::AnySeq::AnySeq (const AnySeq &seq) // copy ctor
-  :
+
+DynamicAny::AnySeq::AnySeq (const AnySeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_DynamicAny_AnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 DynamicAny::AnySeq::~AnySeq (void) // dtor
 {}
-void DynamicAny::AnySeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AnySeq *tmp = ACE_static_cast (AnySeq*, _tao_void_pointer);
-  delete tmp;
-}
 
 
-#endif /* end #if !defined */
 
-static const CORBA::Long _oc_DynamicAny_AnySeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d696341),
-  ACE_NTOHL (0x6e792f41),
-  ACE_NTOHL (0x6e795365),
-  ACE_NTOHL (0x713a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/DynamicAny/AnySeq:1.0
-  7,
-  ACE_NTOHL (0x416e7953),
-  ACE_NTOHL (0x65710000),  // name = AnySeq
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_any,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_DynamicAny_AnySeq (
-    CORBA::tk_alias,
-    sizeof (_oc_DynamicAny_AnySeq),
-    (char *) &_oc_DynamicAny_AnySeq,
-    0,
-    sizeof (DynamicAny::AnySeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (DynamicAny)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_AnySeq, &_tc_TAO_tc_DynamicAny_AnySeq)
-TAO_NAMESPACE_END
+#endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -2294,27 +2310,29 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_allocate_buffe
 {
   DynamicAny::DynAny **tmp = 0;
   tmp = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    DynamicAny::DynAny **old = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        if (!this->release_)
-          {
-            tmp[i] = DynamicAny::DynAny::_duplicate (old[i]);
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-      }
-
-    if (this->release_)
-      {
-        delete[] old;
-      }
-  }
+    {
+      DynamicAny::DynAny **old = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = DynamicAny::DynAny::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -2322,15 +2340,18 @@ void
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       CORBA::release (tmp[i]);
       tmp[i] = DynamicAny::DynAny::_nil ();
     }
-
+  
   _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -2344,7 +2365,7 @@ void
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
-
+  
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       CORBA::release (tmp[i]);
@@ -2352,7 +2373,7 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_shrink_buffer
     }
 }
 
-void
+void 
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast (
     void* target,
     CORBA::Object *src
@@ -2373,56 +2394,72 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_upcast (void *
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_DYNANYSEQ_CS_)
 #define _DYNAMICANY_DYNANYSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // DynamicAny::DynAnySeq
 // *************************************************************
 
 DynamicAny::DynAnySeq::DynAnySeq (void)
 {}
-DynamicAny::DynAnySeq::DynAnySeq (CORBA::ULong max) // uses max size
-  :
+
+DynamicAny::DynAnySeq::DynAnySeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-DynamicAny::DynAnySeq::DynAnySeq (CORBA::ULong max, CORBA::ULong length, DynamicAny::DynAny_ptr *buffer, CORBA::Boolean release)
-  :
+
+DynamicAny::DynAnySeq::DynAnySeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    DynamicAny::DynAny_ptr *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-DynamicAny::DynAnySeq::DynAnySeq (const DynAnySeq &seq) // copy ctor
-  :
+
+DynamicAny::DynAnySeq::DynAnySeq (const DynAnySeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 DynamicAny::DynAnySeq::~DynAnySeq (void) // dtor
 {}
-void DynamicAny::DynAnySeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  DynAnySeq *tmp = ACE_static_cast (DynAnySeq*, _tao_void_pointer);
-  delete tmp;
-}
+
 
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynSequence::_tao_class_id = 0;
 
 DynamicAny::DynSequence_ptr
@@ -2468,13 +2505,23 @@ tao_DynamicAny_DynSequence_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynSequence_marshal (
+    DynamicAny::DynSequence_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynSequence_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynSequence_var::DynSequence_var (void) // default constructor
+DynamicAny::DynSequence_var::DynSequence_var (void)
   : ptr_ (DynSequence::_nil ())
 {}
 
@@ -2484,12 +2531,12 @@ DynamicAny::DynSequence_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynSequence_var::DynSequence_var (const ::DynamicAny::DynSequence_var &p) // copy constructor
+DynamicAny::DynSequence_var::DynSequence_var (const ::DynamicAny::DynSequence_var &p)
   : TAO_Base_var (),
     ptr_ (DynSequence::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynSequence_var::~DynSequence_var (void) // destructor
+DynamicAny::DynSequence_var::~DynSequence_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2518,7 +2565,7 @@ DynamicAny::DynSequence_var::operator const ::DynamicAny::DynSequence_ptr &() co
   return this->ptr_;
 }
 
-DynamicAny::DynSequence_var::operator ::DynamicAny::DynSequence_ptr &() // cast
+DynamicAny::DynSequence_var::operator ::DynamicAny::DynSequence_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2593,10 +2640,11 @@ DynamicAny::DynSequence_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynSequence_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynSequence_out::DynSequence_out (DynSequence_ptr &p)
@@ -2605,14 +2653,14 @@ DynamicAny::DynSequence_out::DynSequence_out (DynSequence_ptr &p)
   this->ptr_ = ::DynamicAny::DynSequence::_nil ();
 }
 
-DynamicAny::DynSequence_out::DynSequence_out (DynSequence_var &p) // constructor from _var
+DynamicAny::DynSequence_out::DynSequence_out (DynSequence_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynSequence::_nil ();
 }
 
-DynamicAny::DynSequence_out::DynSequence_out (const ::DynamicAny::DynSequence_out &p) // copy constructor
+DynamicAny::DynSequence_out::DynSequence_out (const ::DynamicAny::DynSequence_out &p)
   : ptr_ (ACE_const_cast (DynSequence_out &, p).ptr_)
 {}
 
@@ -2643,7 +2691,7 @@ DynamicAny::DynSequence_out::operator ::DynamicAny::DynSequence_ptr &() // cast
 }
 
 ::DynamicAny::DynSequence_ptr &
-DynamicAny::DynSequence_out::ptr (void) // ptr
+DynamicAny::DynSequence_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2654,9 +2702,8 @@ DynamicAny::DynSequence_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynSequence::DynSequence (void)
 {}
@@ -2664,7 +2711,8 @@ DynamicAny::DynSequence::DynSequence (void)
 DynamicAny::DynSequence::~DynSequence (void)
 {}
 
-DynamicAny::DynSequence_ptr DynamicAny::DynSequence::_narrow (
+DynamicAny::DynSequence_ptr
+DynamicAny::DynSequence::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2672,62 +2720,82 @@ DynamicAny::DynSequence_ptr DynamicAny::DynSequence::_narrow (
   return DynSequence::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynSequence_ptr
+DynamicAny::DynSequence_ptr 
 DynamicAny::DynSequence::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynSequence::_nil ();
+    {
+      return DynSequence::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynSequence_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynSequence::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynSequence::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynSequence_ptr
 DynamicAny::DynSequence::_duplicate (DynSequence_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynSequence::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynSequence)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynSequence)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -2736,6 +2804,9 @@ const char* DynamicAny::DynSequence::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynSequence:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynArray::_tao_class_id = 0;
 
 DynamicAny::DynArray_ptr
@@ -2781,13 +2852,23 @@ tao_DynamicAny_DynArray_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynArray_marshal (
+    DynamicAny::DynArray_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynArray_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynArray_var::DynArray_var (void) // default constructor
+DynamicAny::DynArray_var::DynArray_var (void)
   : ptr_ (DynArray::_nil ())
 {}
 
@@ -2797,12 +2878,12 @@ DynamicAny::DynArray_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynArray_var::DynArray_var (const ::DynamicAny::DynArray_var &p) // copy constructor
+DynamicAny::DynArray_var::DynArray_var (const ::DynamicAny::DynArray_var &p)
   : TAO_Base_var (),
     ptr_ (DynArray::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynArray_var::~DynArray_var (void) // destructor
+DynamicAny::DynArray_var::~DynArray_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2831,7 +2912,7 @@ DynamicAny::DynArray_var::operator const ::DynamicAny::DynArray_ptr &() const //
   return this->ptr_;
 }
 
-DynamicAny::DynArray_var::operator ::DynamicAny::DynArray_ptr &() // cast
+DynamicAny::DynArray_var::operator ::DynamicAny::DynArray_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2906,10 +2987,11 @@ DynamicAny::DynArray_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynArray_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynArray_out::DynArray_out (DynArray_ptr &p)
@@ -2918,14 +3000,14 @@ DynamicAny::DynArray_out::DynArray_out (DynArray_ptr &p)
   this->ptr_ = ::DynamicAny::DynArray::_nil ();
 }
 
-DynamicAny::DynArray_out::DynArray_out (DynArray_var &p) // constructor from _var
+DynamicAny::DynArray_out::DynArray_out (DynArray_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynArray::_nil ();
 }
 
-DynamicAny::DynArray_out::DynArray_out (const ::DynamicAny::DynArray_out &p) // copy constructor
+DynamicAny::DynArray_out::DynArray_out (const ::DynamicAny::DynArray_out &p)
   : ptr_ (ACE_const_cast (DynArray_out &, p).ptr_)
 {}
 
@@ -2956,7 +3038,7 @@ DynamicAny::DynArray_out::operator ::DynamicAny::DynArray_ptr &() // cast
 }
 
 ::DynamicAny::DynArray_ptr &
-DynamicAny::DynArray_out::ptr (void) // ptr
+DynamicAny::DynArray_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2967,9 +3049,8 @@ DynamicAny::DynArray_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynArray::DynArray (void)
 {}
@@ -2977,7 +3058,8 @@ DynamicAny::DynArray::DynArray (void)
 DynamicAny::DynArray::~DynArray (void)
 {}
 
-DynamicAny::DynArray_ptr DynamicAny::DynArray::_narrow (
+DynamicAny::DynArray_ptr
+DynamicAny::DynArray::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2985,62 +3067,82 @@ DynamicAny::DynArray_ptr DynamicAny::DynArray::_narrow (
   return DynArray::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynArray_ptr
+DynamicAny::DynArray_ptr 
 DynamicAny::DynArray::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynArray::_nil ();
+    {
+      return DynArray::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynArray_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynArray::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynArray::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynArray_ptr
 DynamicAny::DynArray::_duplicate (DynArray_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynArray::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynArray)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynArray)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -3049,6 +3151,9 @@ const char* DynamicAny::DynArray::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynArray:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynValue::_tao_class_id = 0;
 
 DynamicAny::DynValue_ptr
@@ -3094,13 +3199,23 @@ tao_DynamicAny_DynValue_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynValue_marshal (
+    DynamicAny::DynValue_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynValue_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynValue_var::DynValue_var (void) // default constructor
+DynamicAny::DynValue_var::DynValue_var (void)
   : ptr_ (DynValue::_nil ())
 {}
 
@@ -3110,12 +3225,12 @@ DynamicAny::DynValue_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynValue_var::DynValue_var (const ::DynamicAny::DynValue_var &p) // copy constructor
+DynamicAny::DynValue_var::DynValue_var (const ::DynamicAny::DynValue_var &p)
   : TAO_Base_var (),
     ptr_ (DynValue::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynValue_var::~DynValue_var (void) // destructor
+DynamicAny::DynValue_var::~DynValue_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3144,7 +3259,7 @@ DynamicAny::DynValue_var::operator const ::DynamicAny::DynValue_ptr &() const //
   return this->ptr_;
 }
 
-DynamicAny::DynValue_var::operator ::DynamicAny::DynValue_ptr &() // cast
+DynamicAny::DynValue_var::operator ::DynamicAny::DynValue_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3219,10 +3334,11 @@ DynamicAny::DynValue_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynValue_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynValue_out::DynValue_out (DynValue_ptr &p)
@@ -3231,14 +3347,14 @@ DynamicAny::DynValue_out::DynValue_out (DynValue_ptr &p)
   this->ptr_ = ::DynamicAny::DynValue::_nil ();
 }
 
-DynamicAny::DynValue_out::DynValue_out (DynValue_var &p) // constructor from _var
+DynamicAny::DynValue_out::DynValue_out (DynValue_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynValue::_nil ();
 }
 
-DynamicAny::DynValue_out::DynValue_out (const ::DynamicAny::DynValue_out &p) // copy constructor
+DynamicAny::DynValue_out::DynValue_out (const ::DynamicAny::DynValue_out &p)
   : ptr_ (ACE_const_cast (DynValue_out &, p).ptr_)
 {}
 
@@ -3269,7 +3385,7 @@ DynamicAny::DynValue_out::operator ::DynamicAny::DynValue_ptr &() // cast
 }
 
 ::DynamicAny::DynValue_ptr &
-DynamicAny::DynValue_out::ptr (void) // ptr
+DynamicAny::DynValue_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3280,9 +3396,8 @@ DynamicAny::DynValue_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynValue::DynValue (void)
 {}
@@ -3290,7 +3405,8 @@ DynamicAny::DynValue::DynValue (void)
 DynamicAny::DynValue::~DynValue (void)
 {}
 
-DynamicAny::DynValue_ptr DynamicAny::DynValue::_narrow (
+DynamicAny::DynValue_ptr
+DynamicAny::DynValue::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3298,62 +3414,82 @@ DynamicAny::DynValue_ptr DynamicAny::DynValue::_narrow (
   return DynValue::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynValue_ptr
+DynamicAny::DynValue_ptr 
 DynamicAny::DynValue::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynValue::_nil ();
+    {
+      return DynValue::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynValue_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynValue::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynValue::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynValue_ptr
 DynamicAny::DynValue::_duplicate (DynValue_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynValue::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynValue)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            DynamicAny::DynAny_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynValue)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                DynamicAny::DynAny_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -3362,6 +3498,9 @@ const char* DynamicAny::DynValue::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynValue:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int DynamicAny::DynAnyFactory::_tao_class_id = 0;
 
 DynamicAny::DynAnyFactory_ptr
@@ -3407,13 +3546,23 @@ tao_DynamicAny_DynAnyFactory_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_DynamicAny_DynAnyFactory_marshal (
+    DynamicAny::DynAnyFactory_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // DynamicAny::DynAnyFactory_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-DynamicAny::DynAnyFactory_var::DynAnyFactory_var (void) // default constructor
+DynamicAny::DynAnyFactory_var::DynAnyFactory_var (void)
   : ptr_ (DynAnyFactory::_nil ())
 {}
 
@@ -3423,12 +3572,12 @@ DynamicAny::DynAnyFactory_var::ptr (void) const
   return this->ptr_;
 }
 
-DynamicAny::DynAnyFactory_var::DynAnyFactory_var (const ::DynamicAny::DynAnyFactory_var &p) // copy constructor
+DynamicAny::DynAnyFactory_var::DynAnyFactory_var (const ::DynamicAny::DynAnyFactory_var &p)
   : TAO_Base_var (),
     ptr_ (DynAnyFactory::_duplicate (p.ptr ()))
 {}
 
-DynamicAny::DynAnyFactory_var::~DynAnyFactory_var (void) // destructor
+DynamicAny::DynAnyFactory_var::~DynAnyFactory_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3457,7 +3606,7 @@ DynamicAny::DynAnyFactory_var::operator const ::DynamicAny::DynAnyFactory_ptr &(
   return this->ptr_;
 }
 
-DynamicAny::DynAnyFactory_var::operator ::DynamicAny::DynAnyFactory_ptr &() // cast
+DynamicAny::DynAnyFactory_var::operator ::DynamicAny::DynAnyFactory_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3532,10 +3681,11 @@ DynamicAny::DynAnyFactory_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // DynamicAny::DynAnyFactory_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_ptr &p)
@@ -3544,14 +3694,14 @@ DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_ptr &p)
   this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
 }
 
-DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_var &p) // constructor from _var
+DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
 }
 
-DynamicAny::DynAnyFactory_out::DynAnyFactory_out (const ::DynamicAny::DynAnyFactory_out &p) // copy constructor
+DynamicAny::DynAnyFactory_out::DynAnyFactory_out (const ::DynamicAny::DynAnyFactory_out &p)
   : ptr_ (ACE_const_cast (DynAnyFactory_out &, p).ptr_)
 {}
 
@@ -3582,7 +3732,7 @@ DynamicAny::DynAnyFactory_out::operator ::DynamicAny::DynAnyFactory_ptr &() // c
 }
 
 ::DynamicAny::DynAnyFactory_ptr &
-DynamicAny::DynAnyFactory_out::ptr (void) // ptr
+DynamicAny::DynAnyFactory_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3593,9 +3743,8 @@ DynamicAny::DynAnyFactory_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 DynamicAny::DynAnyFactory::DynAnyFactory (void)
 {}
@@ -3603,7 +3752,8 @@ DynamicAny::DynAnyFactory::DynAnyFactory (void)
 DynamicAny::DynAnyFactory::~DynAnyFactory (void)
 {}
 
-DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory::_narrow (
+DynamicAny::DynAnyFactory_ptr
+DynamicAny::DynAnyFactory::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3611,50 +3761,68 @@ DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory::_narrow (
   return DynAnyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynAnyFactory_ptr
+DynamicAny::DynAnyFactory_ptr 
 DynamicAny::DynAnyFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DynAnyFactory::_nil ();
+    {
+      return DynAnyFactory::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DynAnyFactory_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DynAnyFactory::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DynAnyFactory::_tao_class_id
+                )
+            )
         );
 }
 
 DynamicAny::DynAnyFactory_ptr
 DynamicAny::DynAnyFactory::_duplicate (DynAnyFactory_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *DynamicAny::DynAnyFactory::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::DynamicAny, DynAnyFactory)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::DynamicAny, DynAnyFactory)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -3663,7 +3831,9 @@ const char* DynamicAny::DynAnyFactory::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynAnyFactory:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
   : CORBA::UserException (
         "IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0",
@@ -3672,12 +3842,10 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 DynamicAny::DynAnyFactory::InconsistentTypeCode::~InconsistentTypeCode (void)
 {
 }
 
-// Copy constructor.
 DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -3686,7 +3854,6 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::D
 {
 }
 
-// Assignment operator.
 DynamicAny::DynAnyFactory::InconsistentTypeCode&
 DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
 {
@@ -3695,11 +3862,11 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::
 }
 
 DynamicAny::DynAnyFactory::InconsistentTypeCode *
-DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception *exc)
+DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InconsistentTypeCode *, exc);
+      return ACE_dynamic_cast (InconsistentTypeCode *, _tao_excp);
     }
   else
     {
@@ -3720,13 +3887,13 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      DynamicAny::DynAnyFactory::InconsistentTypeCode (*this),
+      ::DynamicAny::DynAnyFactory::InconsistentTypeCode (*this),
       0
     );
   return result;
 }
 
-void DynamicAny::DynAnyFactory::InconsistentTypeCode::_raise ()
+void DynamicAny::DynAnyFactory::InconsistentTypeCode::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -3747,350 +3914,32 @@ void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynFixed,DynamicAny::DynFixed_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynFixed,DynamicAny::DynFixed_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynEnum,DynamicAny::DynEnum_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynEnum,DynamicAny::DynEnum_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const DynamicAny::NameValuePair &_tao_elem) // copying
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      DynamicAny::_tc_NameValuePair,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
-}
-
-void operator<<= (CORBA::Any &_tao_any, DynamicAny::NameValuePair *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      DynamicAny::_tc_NameValuePair,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      DynamicAny::NameValuePair::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, DynamicAny::NameValuePair *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(const DynamicAny::NameValuePair*&,_tao_elem);
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameValuePair *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePair ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const DynamicAny::NameValuePair*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      DynamicAny::NameValuePair *tmp;
-      ACE_NEW_RETURN (tmp, DynamicAny::NameValuePair, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            DynamicAny::_tc_NameValuePair,
-            1,
-            ACE_static_cast (void *, tmp),
-            DynamicAny::NameValuePair::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const DynamicAny::NameValuePairSeq &_tao_elem
-  ) // copying
-{
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        DynamicAny::_tc_NameValuePairSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
-}
-
-void operator<<= (CORBA::Any &_tao_any, DynamicAny::NameValuePairSeq *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      DynamicAny::_tc_NameValuePairSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      DynamicAny::NameValuePairSeq::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, DynamicAny::NameValuePairSeq *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const DynamicAny::NameValuePairSeq*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameValuePairSeq *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePairSeq ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const DynamicAny::NameValuePairSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      DynamicAny::NameValuePairSeq *tmp;
-      ACE_NEW_RETURN (tmp, DynamicAny::NameValuePairSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            DynamicAny::_tc_NameValuePairSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            DynamicAny::NameValuePairSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynStruct,DynamicAny::DynStruct_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynStruct,DynamicAny::DynStruct_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynUnion,DynamicAny::DynUnion_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynUnion,DynamicAny::DynUnion_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const DynamicAny::AnySeq &_tao_elem
-  ) // copying
-{
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        DynamicAny::_tc_AnySeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
-}
-
-void operator<<= (CORBA::Any &_tao_any, DynamicAny::AnySeq *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      DynamicAny::_tc_AnySeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      DynamicAny::AnySeq::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, DynamicAny::AnySeq *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const DynamicAny::AnySeq*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::AnySeq *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_AnySeq ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
-    if (!result)
-      return 0; // not equivalent
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const DynamicAny::AnySeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      DynamicAny::AnySeq *tmp;
-      ACE_NEW_RETURN (tmp, DynamicAny::AnySeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            DynamicAny::_tc_AnySeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            DynamicAny::AnySeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynSequence,DynamicAny::DynSequence_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynSequence,DynamicAny::DynSequence_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynArray,DynamicAny::DynArray_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynArray,DynamicAny::DynArray_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynValue,DynamicAny::DynValue_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynValue,DynamicAny::DynValue_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<DynamicAny::DynAnyFactory,DynamicAny::DynAnyFactory_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<DynamicAny::DynAnyFactory,DynamicAny::DynAnyFactory_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const DynamicAny::NameValuePairSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -4099,45 +3948,64 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const DynamicAny::AnySeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -4146,25 +4014,36 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 8051a77603d..c21b9584550 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_
 #define _TAO_IDL_ORIG_DYNAMICANYC_H_
 
@@ -59,21 +62,29 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  DynamicAny
 {
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNANY___PTR_CH_)
 #define _DYNAMICANY_DYNANY___PTR_CH_
   
   class DynAny;
   typedef DynAny *DynAny_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNANY___VAR_CH_)
 #define _DYNAMICANY_DYNANY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynAny_var : public TAO_Base_var
   {
   public:
@@ -113,13 +124,14 @@ TAO_NAMESPACE  DynamicAny
     DynAny_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNANY___OUT_CH_)
 #define _DYNAMICANY_DYNANY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynAny_out
   {
   public:
@@ -136,11 +148,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynAny_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNANY_CH_)
 #define _DYNAMICANY_DYNANY_CH_
   
@@ -148,11 +161,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynAny_ptr _ptr_type;
     typedef DynAny_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -174,6 +184,10 @@ TAO_NAMESPACE  DynamicAny
       }
     
     
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_DYNAMICANY_DYNANY_INVALIDVALUE_CH_)
 #define _DYNAMICANY_DYNANY_INVALIDVALUE_CH_
     
@@ -186,7 +200,7 @@ TAO_NAMESPACE  DynamicAny
       ~InvalidValue (void);
 
       InvalidValue &operator= (const InvalidValue &);
-
+      
       static InvalidValue *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -204,13 +218,15 @@ TAO_NAMESPACE  DynamicAny
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
-      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
-
 #endif /* end #if !defined */
     
-    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_DYNAMICANY_DYNANY_TYPEMISMATCH_CH_)
 #define _DYNAMICANY_DYNANY_TYPEMISMATCH_CH_
     
@@ -223,7 +239,7 @@ TAO_NAMESPACE  DynamicAny
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
-
+      
       static TypeMismatch *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -241,20 +257,25 @@ TAO_NAMESPACE  DynamicAny
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
-      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
-
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr type (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void assign (
         DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -264,6 +285,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void from_any (
         const CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -274,14 +298,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * to_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean equal (
         DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -290,22 +319,29 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr copy (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_boolean (
         CORBA::Boolean value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -316,6 +352,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_octet (
         CORBA::Octet value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -326,6 +365,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_char (
         CORBA::Char value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -336,6 +378,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_short (
         CORBA::Short value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -346,6 +391,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_ushort (
         CORBA::UShort value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -356,6 +404,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_long (
         CORBA::Long value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -366,6 +417,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_ulong (
         CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -376,6 +430,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_float (
         CORBA::Float value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -386,6 +443,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_double (
         CORBA::Double value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -396,6 +456,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_string (
         const char * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -406,6 +469,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_reference (
         CORBA::Object_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -416,6 +482,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_typecode (
         CORBA::TypeCode_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -426,6 +495,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_longlong (
         CORBA::LongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -436,6 +508,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_ulonglong (
         CORBA::ULongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -446,6 +521,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_longdouble (
         CORBA::LongDouble value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -456,6 +534,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_wchar (
         CORBA::WChar value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -466,6 +547,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_wstring (
         const CORBA::WChar * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -476,6 +560,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_any (
         const CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -486,6 +573,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_dyn_any (
         DynamicAny::DynAny_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -496,6 +586,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void insert_val (
         CORBA::ValueBase_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -506,8 +599,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean get_boolean (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -516,8 +611,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Octet get_octet (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -526,8 +623,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Char get_char (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -536,8 +635,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Short get_short (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -546,8 +647,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::UShort get_ushort (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -556,8 +659,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Long get_long (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -566,8 +671,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong get_ulong (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -576,8 +683,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Float get_float (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -586,8 +695,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Double get_double (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -596,8 +707,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * get_string (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -606,8 +719,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr get_reference (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -616,8 +731,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr get_typecode (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -626,8 +743,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::LongLong get_longlong (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -636,8 +755,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULongLong get_ulonglong (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -646,8 +767,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::LongDouble get_longdouble (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -656,8 +779,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::WChar get_wchar (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -666,8 +791,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::WChar * get_wstring (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -676,8 +803,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * get_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -686,8 +815,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr get_dyn_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -696,8 +827,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ValueBase_ptr get_val (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -706,6 +839,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean seek (
         CORBA::Long index
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -714,32 +850,40 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void rewind (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean next (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong component_count (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr current_component (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -747,36 +891,46 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynAny (void);
-    
     virtual ~DynAny (void);
+    
+    friend class _TAO_DynAny_Remote_Proxy_Impl;
+    friend class _TAO_DynAny_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynAny_Direct_Proxy_Impl;
   
   private:
     DynAny (const DynAny &);
     void operator= (const DynAny &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNFIXED___PTR_CH_)
 #define _DYNAMICANY_DYNFIXED___PTR_CH_
   
   class DynFixed;
   typedef DynFixed *DynFixed_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNFIXED___VAR_CH_)
 #define _DYNAMICANY_DYNFIXED___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynFixed_var : public TAO_Base_var
   {
   public:
@@ -816,13 +970,14 @@ TAO_NAMESPACE  DynamicAny
     DynFixed_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNFIXED___OUT_CH_)
 #define _DYNAMICANY_DYNFIXED___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynFixed_out
   {
   public:
@@ -839,11 +994,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynFixed_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNFIXED_CH_)
 #define _DYNAMICANY_DYNFIXED_CH_
   
@@ -851,11 +1007,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynFixed_ptr _ptr_type;
     typedef DynFixed_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -876,14 +1029,21 @@ TAO_NAMESPACE  DynamicAny
         return (DynFixed_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * get_value (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean set_value (
         const char * val
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -894,36 +1054,46 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynFixed (void);
-    
     virtual ~DynFixed (void);
+    
+    friend class _TAO_DynFixed_Remote_Proxy_Impl;
+    friend class _TAO_DynFixed_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynFixed_Direct_Proxy_Impl;
   
   private:
     DynFixed (const DynFixed &);
     void operator= (const DynFixed &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNENUM___PTR_CH_)
 #define _DYNAMICANY_DYNENUM___PTR_CH_
   
   class DynEnum;
   typedef DynEnum *DynEnum_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNENUM___VAR_CH_)
 #define _DYNAMICANY_DYNENUM___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynEnum_var : public TAO_Base_var
   {
   public:
@@ -963,13 +1133,14 @@ TAO_NAMESPACE  DynamicAny
     DynEnum_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNENUM___OUT_CH_)
 #define _DYNAMICANY_DYNENUM___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynEnum_out
   {
   public:
@@ -986,11 +1157,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynEnum_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNENUM_CH_)
 #define _DYNAMICANY_DYNENUM_CH_
   
@@ -998,11 +1170,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynEnum_ptr _ptr_type;
     typedef DynEnum_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -1023,14 +1192,21 @@ TAO_NAMESPACE  DynamicAny
         return (DynEnum_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * get_as_string (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_as_string (
         const char * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1040,14 +1216,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong get_as_ulong (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_as_ulong (
         CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1057,45 +1238,53 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynEnum (void);
-    
     virtual ~DynEnum (void);
+    
+    friend class _TAO_DynEnum_Remote_Proxy_Impl;
+    friend class _TAO_DynEnum_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynEnum_Direct_Proxy_Impl;
   
   private:
     DynEnum (const DynEnum &);
     void operator= (const DynEnum &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
+  
   typedef char * FieldName;
   typedef CORBA::String_var FieldName_var;
   typedef CORBA::String_out FieldName_out;
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FieldName;
   
-  struct NameValuePair;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class NameValuePair_var;
   
   struct TAO_DynamicAny_Export NameValuePair
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef NameValuePair_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
+    
     
     TAO_String_Manager id;
     CORBA::Any value;
-    
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_DynamicAny_Export NameValuePair_var
   {
   public:
@@ -1112,6 +1301,7 @@ TAO_NAMESPACE  DynamicAny
     operator const NameValuePair &() const;
     operator NameValuePair &();
     operator NameValuePair &() const;
+    
     // Variable-size types only.
     operator NameValuePair *&();
     
@@ -1126,6 +1316,9 @@ TAO_NAMESPACE  DynamicAny
     NameValuePair *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_DynamicAny_Export NameValuePair_out
   {
   public:
@@ -1144,19 +1337,18 @@ TAO_NAMESPACE  DynamicAny
     void operator= (const NameValuePair_var &);
   };
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NameValuePair;
-  
-  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
+  class TAO_DynamicAny_Export _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void);
     _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (
@@ -1193,55 +1385,59 @@ TAO_NAMESPACE  DynamicAny
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class NameValuePairSeq;
   class NameValuePairSeq_var;
   
   // *************************************************************
-  // NameValuePairSeq
+  // DynamicAny::NameValuePairSeq
   // *************************************************************
   
   class TAO_DynamicAny_Export NameValuePairSeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<NameValuePair>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    NameValuePairSeq (void); // default ctor
-    NameValuePairSeq (CORBA::ULong max); // uses max size
+    NameValuePairSeq (void);
+    NameValuePairSeq (CORBA::ULong max);
     NameValuePairSeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         NameValuePair *buffer, 
         CORBA::Boolean release = 0
       );
-    NameValuePairSeq (const NameValuePairSeq &); // copy ctor
+    NameValuePairSeq (const NameValuePairSeq &);
     ~NameValuePairSeq (void);
-    static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef NameValuePairSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ___VAR_CH_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class DynamicAny::NameValuePairSeq_var
   // *************************************************************
@@ -1262,7 +1458,9 @@ TAO_NAMESPACE  DynamicAny
     operator const NameValuePairSeq &() const;
     operator NameValuePairSeq &();
     operator NameValuePairSeq &() const;
-    operator NameValuePairSeq *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator NameValuePairSeq *&();
     
     NameValuePair & operator[] (CORBA::ULong index);
     const NameValuePair & operator[] (CORBA::ULong index) const;
@@ -1277,14 +1475,15 @@ TAO_NAMESPACE  DynamicAny
   private:
     NameValuePairSeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ___OUT_CH_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_DynamicAny_Export NameValuePairSeq_out
   {
   public:
@@ -1303,27 +1502,26 @@ TAO_NAMESPACE  DynamicAny
     // Assignment from T_var not allowed.
     void operator= (const NameValuePairSeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NameValuePairSeq;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
   
-  struct NameDynAnyPair;
   class NameDynAnyPair_var;
   
   struct TAO_DynamicAny_Export NameDynAnyPair
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef NameDynAnyPair_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    TAO_String_Manager id;
-    ACE_NESTED_CLASS (DynamicAny, DynAny_var) value;
     
+    
+    TAO_String_Manager id;
+    DynamicAny::DynAny_var value;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_DynamicAny_Export NameDynAnyPair_var
   {
   public:
@@ -1340,6 +1538,7 @@ TAO_NAMESPACE  DynamicAny
     operator const NameDynAnyPair &() const;
     operator NameDynAnyPair &();
     operator NameDynAnyPair &() const;
+    
     // Variable-size types only.
     operator NameDynAnyPair *&();
     
@@ -1354,6 +1553,9 @@ TAO_NAMESPACE  DynamicAny
     NameDynAnyPair *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_DynamicAny_Export NameDynAnyPair_out
   {
   public:
@@ -1372,17 +1574,18 @@ TAO_NAMESPACE  DynamicAny
     void operator= (const NameDynAnyPair_var &);
   };
   
-  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
+  class TAO_DynamicAny_Export _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void);
     _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (
@@ -1419,55 +1622,59 @@ TAO_NAMESPACE  DynamicAny
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class NameDynAnyPairSeq;
   class NameDynAnyPairSeq_var;
   
   // *************************************************************
-  // NameDynAnyPairSeq
+  // DynamicAny::NameDynAnyPairSeq
   // *************************************************************
   
   class TAO_DynamicAny_Export NameDynAnyPairSeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<NameDynAnyPair>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    NameDynAnyPairSeq (void); // default ctor
-    NameDynAnyPairSeq (CORBA::ULong max); // uses max size
+    NameDynAnyPairSeq (void);
+    NameDynAnyPairSeq (CORBA::ULong max);
     NameDynAnyPairSeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         NameDynAnyPair *buffer, 
         CORBA::Boolean release = 0
       );
-    NameDynAnyPairSeq (const NameDynAnyPairSeq &); // copy ctor
+    NameDynAnyPairSeq (const NameDynAnyPairSeq &);
     ~NameDynAnyPairSeq (void);
-    static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef NameDynAnyPairSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ___VAR_CH_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class DynamicAny::NameDynAnyPairSeq_var
   // *************************************************************
@@ -1488,7 +1695,9 @@ TAO_NAMESPACE  DynamicAny
     operator const NameDynAnyPairSeq &() const;
     operator NameDynAnyPairSeq &();
     operator NameDynAnyPairSeq &() const;
-    operator NameDynAnyPairSeq *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator NameDynAnyPairSeq *&();
     
     NameDynAnyPair & operator[] (CORBA::ULong index);
     const NameDynAnyPair & operator[] (CORBA::ULong index) const;
@@ -1503,14 +1712,15 @@ TAO_NAMESPACE  DynamicAny
   private:
     NameDynAnyPairSeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ___OUT_CH_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_DynamicAny_Export NameDynAnyPairSeq_out
   {
   public:
@@ -1529,23 +1739,26 @@ TAO_NAMESPACE  DynamicAny
     // Assignment from T_var not allowed.
     void operator= (const NameDynAnyPairSeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNSTRUCT___PTR_CH_)
 #define _DYNAMICANY_DYNSTRUCT___PTR_CH_
   
   class DynStruct;
   typedef DynStruct *DynStruct_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNSTRUCT___VAR_CH_)
 #define _DYNAMICANY_DYNSTRUCT___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynStruct_var : public TAO_Base_var
   {
   public:
@@ -1585,13 +1798,14 @@ TAO_NAMESPACE  DynamicAny
     DynStruct_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNSTRUCT___OUT_CH_)
 #define _DYNAMICANY_DYNSTRUCT___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynStruct_out
   {
   public:
@@ -1608,11 +1822,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynStruct_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNSTRUCT_CH_)
 #define _DYNAMICANY_DYNSTRUCT_CH_
   
@@ -1620,11 +1835,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynStruct_ptr _ptr_type;
     typedef DynStruct_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -1645,8 +1857,12 @@ TAO_NAMESPACE  DynamicAny
         return (DynStruct_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * current_member_name (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1655,8 +1871,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
-    virtual CORBA::TCKind current_member_kind (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::TCKind current_member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1665,14 +1883,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::NameValuePairSeq * get_members (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_members (
         const DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1683,14 +1906,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_members_as_dyn_any (
         const DynamicAny::NameDynAnyPairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1701,36 +1929,46 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynStruct (void);
-    
     virtual ~DynStruct (void);
+    
+    friend class _TAO_DynStruct_Remote_Proxy_Impl;
+    friend class _TAO_DynStruct_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynStruct_Direct_Proxy_Impl;
   
   private:
     DynStruct (const DynStruct &);
     void operator= (const DynStruct &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNUNION___PTR_CH_)
 #define _DYNAMICANY_DYNUNION___PTR_CH_
   
   class DynUnion;
   typedef DynUnion *DynUnion_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNUNION___VAR_CH_)
 #define _DYNAMICANY_DYNUNION___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynUnion_var : public TAO_Base_var
   {
   public:
@@ -1770,13 +2008,14 @@ TAO_NAMESPACE  DynamicAny
     DynUnion_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNUNION___OUT_CH_)
 #define _DYNAMICANY_DYNUNION___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynUnion_out
   {
   public:
@@ -1793,11 +2032,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynUnion_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNUNION_CH_)
 #define _DYNAMICANY_DYNUNION_CH_
   
@@ -1805,11 +2045,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynUnion_ptr _ptr_type;
     typedef DynUnion_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -1830,14 +2067,21 @@ TAO_NAMESPACE  DynamicAny
         return (DynUnion_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr get_discriminator (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_discriminator (
         DynamicAny::DynAny_ptr d
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1847,8 +2091,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_to_default_member (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1856,8 +2102,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_to_no_active_member (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1865,24 +2113,30 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean has_no_active_member (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
-    virtual CORBA::TCKind discriminator_kind (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::TCKind discriminator_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr member (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1890,8 +2144,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * member_name (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1899,8 +2155,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
-    virtual CORBA::TCKind member_kind (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::TCKind member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1908,34 +2166,41 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynUnion (void);
-    
     virtual ~DynUnion (void);
+    
+    friend class _TAO_DynUnion_Remote_Proxy_Impl;
+    friend class _TAO_DynUnion_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynUnion_Direct_Proxy_Impl;
   
   private:
     DynUnion (const DynUnion &);
     void operator= (const DynUnion &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_DynamicAny_AnySeq
+  class TAO_DynamicAny_Export _TAO_Unbounded_Sequence_DynamicAny_AnySeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_DynamicAny_AnySeq (void);
     _TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_DynamicAny_AnySeq (
@@ -1972,55 +2237,59 @@ TAO_NAMESPACE  DynamicAny
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_DYNAMICANY_ANYSEQ_CH_)
 #define _DYNAMICANY_ANYSEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class AnySeq;
   class AnySeq_var;
   
   // *************************************************************
-  // AnySeq
+  // DynamicAny::AnySeq
   // *************************************************************
   
   class TAO_DynamicAny_Export AnySeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_AnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Any>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    AnySeq (void); // default ctor
-    AnySeq (CORBA::ULong max); // uses max size
+    AnySeq (void);
+    AnySeq (CORBA::ULong max);
     AnySeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         CORBA::Any *buffer, 
         CORBA::Boolean release = 0
       );
-    AnySeq (const AnySeq &); // copy ctor
+    AnySeq (const AnySeq &);
     ~AnySeq (void);
-    static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef AnySeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_ANYSEQ___VAR_CH_)
 #define _DYNAMICANY_ANYSEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class DynamicAny::AnySeq_var
   // *************************************************************
@@ -2041,7 +2310,9 @@ TAO_NAMESPACE  DynamicAny
     operator const AnySeq &() const;
     operator AnySeq &();
     operator AnySeq &() const;
-    operator AnySeq *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator AnySeq *&();
     
     CORBA::Any & operator[] (CORBA::ULong index);
     const CORBA::Any & operator[] (CORBA::ULong index) const;
@@ -2056,14 +2327,15 @@ TAO_NAMESPACE  DynamicAny
   private:
     AnySeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_ANYSEQ___OUT_CH_)
 #define _DYNAMICANY_ANYSEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_DynamicAny_Export AnySeq_out
   {
   public:
@@ -2082,23 +2354,21 @@ TAO_NAMESPACE  DynamicAny
     // Assignment from T_var not allowed.
     void operator= (const AnySeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AnySeq;
-  
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
+  class TAO_DynamicAny_Export _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void);
     _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (
@@ -2139,55 +2409,59 @@ TAO_NAMESPACE  DynamicAny
       );
     virtual CORBA::Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_DYNAMICANY_DYNANYSEQ_CH_)
 #define _DYNAMICANY_DYNANYSEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class DynAnySeq;
   class DynAnySeq_var;
   
   // *************************************************************
-  // DynAnySeq
+  // DynamicAny::DynAnySeq
   // *************************************************************
   
   class TAO_DynamicAny_Export DynAnySeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<DynAny,DynAny_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    DynAnySeq (void); // default ctor
-    DynAnySeq (CORBA::ULong max); // uses max size
+    DynAnySeq (void);
+    DynAnySeq (CORBA::ULong max);
     DynAnySeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         DynAny_ptr *buffer, 
         CORBA::Boolean release = 0
       );
-    DynAnySeq (const DynAnySeq &); // copy ctor
+    DynAnySeq (const DynAnySeq &);
     ~DynAnySeq (void);
-    static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynAnySeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNANYSEQ___VAR_CH_)
 #define _DYNAMICANY_DYNANYSEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class DynamicAny::DynAnySeq_var
   // *************************************************************
@@ -2208,7 +2482,9 @@ TAO_NAMESPACE  DynamicAny
     operator const DynAnySeq &() const;
     operator DynAnySeq &();
     operator DynAnySeq &() const;
-    operator DynAnySeq *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator DynAnySeq *&();
     
     TAO_Object_Manager<DynAny, DynAny_var> operator[] (CORBA::ULong index);
     
@@ -2222,14 +2498,15 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynAnySeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNANYSEQ___OUT_CH_)
 #define _DYNAMICANY_DYNANYSEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_DynamicAny_Export DynAnySeq_out
   {
   public:
@@ -2248,23 +2525,26 @@ TAO_NAMESPACE  DynamicAny
     // Assignment from T_var not allowed.
     void operator= (const DynAnySeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNSEQUENCE___PTR_CH_)
 #define _DYNAMICANY_DYNSEQUENCE___PTR_CH_
   
   class DynSequence;
   typedef DynSequence *DynSequence_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNSEQUENCE___VAR_CH_)
 #define _DYNAMICANY_DYNSEQUENCE___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynSequence_var : public TAO_Base_var
   {
   public:
@@ -2304,13 +2584,14 @@ TAO_NAMESPACE  DynamicAny
     DynSequence_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNSEQUENCE___OUT_CH_)
 #define _DYNAMICANY_DYNSEQUENCE___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynSequence_out
   {
   public:
@@ -2327,11 +2608,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynSequence_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNSEQUENCE_CH_)
 #define _DYNAMICANY_DYNSEQUENCE_CH_
   
@@ -2339,11 +2621,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynSequence_ptr _ptr_type;
     typedef DynSequence_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -2364,14 +2643,21 @@ TAO_NAMESPACE  DynamicAny
         return (DynSequence_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong get_length (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_length (
         CORBA::ULong len
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2381,14 +2667,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::AnySeq * get_elements (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_elements (
         const DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2399,14 +2690,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_elements_as_dyn_any (
         const DynamicAny::DynAnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2417,36 +2713,46 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynSequence (void);
-    
     virtual ~DynSequence (void);
+    
+    friend class _TAO_DynSequence_Remote_Proxy_Impl;
+    friend class _TAO_DynSequence_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynSequence_Direct_Proxy_Impl;
   
   private:
     DynSequence (const DynSequence &);
     void operator= (const DynSequence &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNARRAY___PTR_CH_)
 #define _DYNAMICANY_DYNARRAY___PTR_CH_
   
   class DynArray;
   typedef DynArray *DynArray_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNARRAY___VAR_CH_)
 #define _DYNAMICANY_DYNARRAY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynArray_var : public TAO_Base_var
   {
   public:
@@ -2486,13 +2792,14 @@ TAO_NAMESPACE  DynamicAny
     DynArray_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNARRAY___OUT_CH_)
 #define _DYNAMICANY_DYNARRAY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynArray_out
   {
   public:
@@ -2509,11 +2816,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynArray_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNARRAY_CH_)
 #define _DYNAMICANY_DYNARRAY_CH_
   
@@ -2521,11 +2829,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynArray_ptr _ptr_type;
     typedef DynArray_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -2546,14 +2851,21 @@ TAO_NAMESPACE  DynamicAny
         return (DynArray_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::AnySeq * get_elements (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_elements (
         const DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2564,14 +2876,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_elements_as_dyn_any (
         const DynamicAny::DynAnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2582,36 +2899,46 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynArray (void);
-    
     virtual ~DynArray (void);
+    
+    friend class _TAO_DynArray_Remote_Proxy_Impl;
+    friend class _TAO_DynArray_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynArray_Direct_Proxy_Impl;
   
   private:
     DynArray (const DynArray &);
     void operator= (const DynArray &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNVALUE___PTR_CH_)
 #define _DYNAMICANY_DYNVALUE___PTR_CH_
   
   class DynValue;
   typedef DynValue *DynValue_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNVALUE___VAR_CH_)
 #define _DYNAMICANY_DYNVALUE___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynValue_var : public TAO_Base_var
   {
   public:
@@ -2651,13 +2978,14 @@ TAO_NAMESPACE  DynamicAny
     DynValue_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNVALUE___OUT_CH_)
 #define _DYNAMICANY_DYNVALUE___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynValue_out
   {
   public:
@@ -2674,11 +3002,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynValue_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNVALUE_CH_)
 #define _DYNAMICANY_DYNVALUE_CH_
   
@@ -2686,11 +3015,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual DynamicAny::DynAny
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynValue_ptr _ptr_type;
     typedef DynValue_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -2711,8 +3037,12 @@ TAO_NAMESPACE  DynamicAny
         return (DynValue_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * current_member_name (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2721,8 +3051,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
-    virtual CORBA::TCKind current_member_kind (
-        
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::TCKind current_member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2731,14 +3063,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::NameValuePairSeq * get_members (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_members (
         const DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2749,14 +3086,19 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_members_as_dyn_any (
         const DynamicAny::NameDynAnyPairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2767,36 +3109,46 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynValue (void);
-    
     virtual ~DynValue (void);
+    
+    friend class _TAO_DynValue_Remote_Proxy_Impl;
+    friend class _TAO_DynValue_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynValue_Direct_Proxy_Impl;
   
   private:
     DynValue (const DynValue &);
     void operator= (const DynValue &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_DYNAMICANY_DYNANYFACTORY___PTR_CH_)
 #define _DYNAMICANY_DYNANYFACTORY___PTR_CH_
   
   class DynAnyFactory;
   typedef DynAnyFactory *DynAnyFactory_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNANYFACTORY___VAR_CH_)
 #define _DYNAMICANY_DYNANYFACTORY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_DynamicAny_Export DynAnyFactory_var : public TAO_Base_var
   {
   public:
@@ -2836,13 +3188,14 @@ TAO_NAMESPACE  DynamicAny
     DynAnyFactory_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_DYNAMICANY_DYNANYFACTORY___OUT_CH_)
 #define _DYNAMICANY_DYNANYFACTORY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_DynamicAny_Export DynAnyFactory_out
   {
   public:
@@ -2859,11 +3212,12 @@ TAO_NAMESPACE  DynamicAny
   private:
     DynAnyFactory_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_DYNAMICANY_DYNANYFACTORY_CH_)
 #define _DYNAMICANY_DYNANYFACTORY_CH_
   
@@ -2871,11 +3225,8 @@ TAO_NAMESPACE  DynamicAny
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DynAnyFactory_ptr _ptr_type;
     typedef DynAnyFactory_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -2897,6 +3248,10 @@ TAO_NAMESPACE  DynamicAny
       }
     
     
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_)
 #define _DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_
     
@@ -2909,7 +3264,7 @@ TAO_NAMESPACE  DynamicAny
       ~InconsistentTypeCode (void);
 
       InconsistentTypeCode &operator= (const InconsistentTypeCode &);
-
+      
       static InconsistentTypeCode *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2927,12 +3282,15 @@ TAO_NAMESPACE  DynamicAny
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
-      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
-
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr create_dyn_any (
         const CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2942,6 +3300,9 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
         CORBA::TypeCode_ptr type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2951,45 +3312,49 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DynAnyFactory (void);
-    
     virtual ~DynAnyFactory (void);
+    
+    friend class _TAO_DynAnyFactory_Remote_Proxy_Impl;
+    friend class _TAO_DynAnyFactory_ThruPOA_Proxy_Impl;
+    friend class _TAO_DynAnyFactory_Direct_Proxy_Impl;
   
   private:
     DynAnyFactory (const DynAnyFactory &);
     void operator= (const DynAnyFactory &);
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module DynamicAny
 
-TAO_DynamicAny_Export void operator<<= (CORBA::Any &, const DynamicAny::NameValuePair &); // copying version
-TAO_DynamicAny_Export void operator<<= (CORBA::Any &, DynamicAny::NameValuePair*); // noncopying version
-TAO_DynamicAny_Export CORBA::Boolean operator>>= (const CORBA::Any &, DynamicAny::NameValuePair *&); // deprecated
-TAO_DynamicAny_Export CORBA::Boolean operator>>= (const CORBA::Any &, const DynamicAny::NameValuePair *&);
-TAO_DynamicAny_Export void operator<<= (CORBA::Any &, const DynamicAny::NameValuePairSeq &); // copying version
-TAO_DynamicAny_Export void operator<<= (CORBA::Any &, DynamicAny::NameValuePairSeq*); // noncopying version
-TAO_DynamicAny_Export CORBA::Boolean operator>>= (const CORBA::Any &, DynamicAny::NameValuePairSeq *&); // deprecated
-TAO_DynamicAny_Export CORBA::Boolean operator>>= (const CORBA::Any &, const DynamicAny::NameValuePairSeq *&);
-TAO_DynamicAny_Export void operator<<= (CORBA::Any &, const DynamicAny::AnySeq &); // copying version
-TAO_DynamicAny_Export void operator<<= (CORBA::Any &, DynamicAny::AnySeq*); // noncopying version
-TAO_DynamicAny_Export CORBA::Boolean operator>>= (const CORBA::Any &, DynamicAny::AnySeq *&); // deprecated
-TAO_DynamicAny_Export CORBA::Boolean operator>>= (const CORBA::Any &, const DynamicAny::AnySeq *&);
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_DynamicAny_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const DynamicAny::NameValuePair &);
 TAO_DynamicAny_Export CORBA::Boolean operator>> (TAO_InputCDR &, DynamicAny::NameValuePair &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_DynamicAny_NameValuePairSeq_H_
 #define _TAO_CDR_OP_DynamicAny_NameValuePairSeq_H_
 
@@ -3004,6 +3369,8 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_DynamicAny_NameValuePairSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_DynamicAny_AnySeq_H_
 #define _TAO_CDR_OP_DynamicAny_AnySeq_H_
@@ -3019,9 +3386,13 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_DynamicAny_AnySeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "DynamicAnyC.i"
@@ -3037,3 +3408,4 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.i b/TAO/tao/DynamicAny/DynamicAnyC.i
index c8d57c489fa..c317e10a441 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.i
+++ b/TAO/tao/DynamicAny/DynamicAnyC.i
@@ -19,41 +19,61 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// *************************************************************
-// Inline operations for exception DynamicAny::DynAny::InvalidValue
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception DynamicAny::DynAny::TypeMismatch
-// *************************************************************
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNANY___CI_)
 #define _DYNAMICANY_DYNANY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynAny::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNFIXED___CI_)
 #define _DYNAMICANY_DYNFIXED___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynFixed::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNENUM___CI_)
 #define _DYNAMICANY_DYNENUM___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynEnum::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameValuePair_var
 // *************************************************************
 
 ACE_INLINE
-DynamicAny::NameValuePair_var::NameValuePair_var (void) // default constructor
+DynamicAny::NameValuePair_var::NameValuePair_var (void)
   : ptr_ (0)
 {}
 
@@ -63,42 +83,52 @@ DynamicAny::NameValuePair_var::NameValuePair_var (NameValuePair *p)
 {}
 
 ACE_INLINE
-DynamicAny::NameValuePair_var::NameValuePair_var (const ::DynamicAny::NameValuePair_var &p) // copy constructor
+DynamicAny::NameValuePair_var::NameValuePair_var (const ::DynamicAny::NameValuePair_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::DynamicAny::NameValuePair (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::DynamicAny::NameValuePair (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-DynamicAny::NameValuePair_var::~NameValuePair_var (void) // destructor
+DynamicAny::NameValuePair_var::~NameValuePair_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameValuePair_var &
-DynamicAny::NameValuePair_var::operator= (NameValuePair *p)
+ACE_INLINE
+DynamicAny::NameValuePair_var &
+DynamicAny::NameValuePair_var::operator= (NameValuePair *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePair_var &
-DynamicAny::NameValuePair_var::operator= (const ::DynamicAny::NameValuePair_var &p)
+ACE_INLINE
+::DynamicAny::NameValuePair_var &
+DynamicAny::NameValuePair_var::operator= (const ::DynamicAny::NameValuePair_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          NameValuePair *deep_copy =
-            new NameValuePair (*p.ptr_);
+          NameValuePair *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              NameValuePair (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -143,7 +173,7 @@ DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair &() const //
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair *&() // cast 
 {
@@ -162,7 +192,7 @@ DynamicAny::NameValuePair_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::DynamicAny::NameValuePair *&
 DynamicAny::NameValuePair_var::out (void)
 {
@@ -185,6 +215,9 @@ DynamicAny::NameValuePair_var::ptr (void) const
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameValuePair_out
 // *************************************************************
@@ -197,7 +230,7 @@ DynamicAny::NameValuePair_out::NameValuePair_out (::DynamicAny::NameValuePair *&
 }
 
 ACE_INLINE
-DynamicAny::NameValuePair_out::NameValuePair_out (NameValuePair_var &p) // constructor from _var
+DynamicAny::NameValuePair_out::NameValuePair_out (NameValuePair_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -205,21 +238,23 @@ DynamicAny::NameValuePair_out::NameValuePair_out (NameValuePair_var &p) // const
 }
 
 ACE_INLINE
-DynamicAny::NameValuePair_out::NameValuePair_out (const ::DynamicAny::NameValuePair_out &p) // copy constructor
+DynamicAny::NameValuePair_out::NameValuePair_out (const ::DynamicAny::NameValuePair_out &p)
   : ptr_ (ACE_const_cast (NameValuePair_out&, p).ptr_)
 {}
 
-ACE_INLINE DynamicAny::NameValuePair_out &
+ACE_INLINE
+DynamicAny::NameValuePair_out &
 DynamicAny::NameValuePair_out::operator= (const ::DynamicAny::NameValuePair_out &p)
 {
   this->ptr_ = ACE_const_cast (NameValuePair_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE DynamicAny::NameValuePair_out &
-DynamicAny::NameValuePair_out::operator= (NameValuePair *p)
+ACE_INLINE
+DynamicAny::NameValuePair_out &
+DynamicAny::NameValuePair_out::operator= (NameValuePair *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -241,192 +276,231 @@ DynamicAny::NameValuePair_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_
 
-// = Static operations.
-ACE_INLINE DynamicAny::NameValuePair *
+ACE_INLINE
+DynamicAny::NameValuePair *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   DynamicAny::NameValuePair *retval = 0;
   ACE_NEW_RETURN (retval, DynamicAny::NameValuePair[size], 0);
   return retval;
 }
 
-ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (DynamicAny::NameValuePair *buffer)
-// Free the sequence.
+ACE_INLINE
+void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (DynamicAny::NameValuePair *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void) // Default constructor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  DynamicAny::NameValuePair *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    DynamicAny::NameValuePair *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs)
-// Copy constructor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (
+    const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    DynamicAny::NameValuePair *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->maximum_);
-    DynamicAny::NameValuePair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      DynamicAny::NameValuePair *tmp1 =
+        _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->maximum_);
+      DynamicAny::NameValuePair * const tmp2 =
+        ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs)
-// Assignment operator.
+ACE_INLINE
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator= (
+    const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
-      _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          DynamicAny::NameValuePair *tmp =
+            ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  DynamicAny::NameValuePair *tmp1 = ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
-  DynamicAny::NameValuePair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_);
+  DynamicAny::NameValuePair *tmp1 =
+    ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
+  DynamicAny::NameValuePair * const tmp2 =
+    ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE DynamicAny::NameValuePair &
+ACE_INLINE
+DynamicAny::NameValuePair &
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  DynamicAny::NameValuePair* tmp = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_);
+  DynamicAny::NameValuePair* tmp =
+    ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const DynamicAny::NameValuePair &
+ACE_INLINE
+const DynamicAny::NameValuePair &
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  DynamicAny::NameValuePair * const tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair* ACE_CAST_CONST, this->buffer_);
+  DynamicAny::NameValuePair * const tmp =
+    ACE_reinterpret_cast (DynamicAny::NameValuePair* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE DynamicAny::NameValuePair *
+ACE_INLINE
+DynamicAny::NameValuePair *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::get_buffer (CORBA::Boolean orphan)
 {
   DynamicAny::NameValuePair *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const DynamicAny::NameValuePair *
+ACE_INLINE
+const DynamicAny::NameValuePair *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const DynamicAny::NameValuePair * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const DynamicAny::NameValuePair * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::replace (CORBA::ULong max,
-CORBA::ULong length,
-DynamicAny::NameValuePair *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    DynamicAny::NameValuePair *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_);
-    _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
-  }
+    {
+      DynamicAny::NameValuePair *tmp =
+        ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_);
+      _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameValuePairSeq_var
 // *************************************************************
 
 ACE_INLINE
-DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (void) // default constructor
+DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (void)
   : ptr_ (0)
 {}
 
@@ -436,21 +510,26 @@ DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (NameValuePairSeq *p)
 {}
 
 ACE_INLINE
-DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (const ::DynamicAny::NameValuePairSeq_var &p) // copy constructor
+DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (const ::DynamicAny::NameValuePairSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::DynamicAny::NameValuePairSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::DynamicAny::NameValuePairSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-DynamicAny::NameValuePairSeq_var::~NameValuePairSeq_var (void) // destructor
+DynamicAny::NameValuePairSeq_var::~NameValuePairSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameValuePairSeq_var &
+ACE_INLINE
+DynamicAny::NameValuePairSeq_var &
 DynamicAny::NameValuePairSeq_var::operator= (NameValuePairSeq *p)
 {
   delete this->ptr_;
@@ -458,7 +537,8 @@ DynamicAny::NameValuePairSeq_var::operator= (NameValuePairSeq *p)
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq_var &
+ACE_INLINE
+::DynamicAny::NameValuePairSeq_var &
 DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSeq_var &p)
 {
   if (this != &p)
@@ -470,8 +550,12 @@ DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSe
         }
       else
         {
-          NameValuePairSeq *deep_copy =
-            new NameValuePairSeq (*p.ptr_);
+          NameValuePairSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              NameValuePairSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -486,69 +570,75 @@ DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSe
   return *this;
 }
 
-ACE_INLINE const ::DynamicAny::NameValuePairSeq *
+ACE_INLINE
+const ::DynamicAny::NameValuePairSeq *
 DynamicAny::NameValuePairSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq *
+ACE_INLINE
+::DynamicAny::NameValuePairSeq *
 DynamicAny::NameValuePairSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameValuePairSeq_var::operator const ::DynamicAny::NameValuePairSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameValuePair &
+ACE_INLINE
+DynamicAny::NameValuePair &
 DynamicAny::NameValuePairSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const DynamicAny::NameValuePair &
+ACE_INLINE
+const DynamicAny::NameValuePair &
 DynamicAny::NameValuePairSeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const DynamicAny::NameValuePair &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::DynamicAny::NameValuePairSeq &
+ACE_INLINE
+const ::DynamicAny::NameValuePairSeq &
 DynamicAny::NameValuePairSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq &
+ACE_INLINE
+::DynamicAny::NameValuePairSeq &
 DynamicAny::NameValuePairSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::DynamicAny::NameValuePairSeq *&
+ACE_INLINE
+::DynamicAny::NameValuePairSeq *&
 DynamicAny::NameValuePairSeq_var::out (void)
 {
   delete this->ptr_;
@@ -556,7 +646,8 @@ DynamicAny::NameValuePairSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq *
+ACE_INLINE
+::DynamicAny::NameValuePairSeq *
 DynamicAny::NameValuePairSeq_var::_retn (void)
 {
   ::DynamicAny::NameValuePairSeq *tmp = this->ptr_;
@@ -564,12 +655,16 @@ DynamicAny::NameValuePairSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq *
+ACE_INLINE
+::DynamicAny::NameValuePairSeq *
 DynamicAny::NameValuePairSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameValuePairSeq_out
 // *************************************************************
@@ -582,7 +677,7 @@ DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (NameValuePairSeq *&p)
 }
 
 ACE_INLINE
-DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (NameValuePairSeq_var &p) // constructor from _var
+DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (NameValuePairSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -590,57 +685,64 @@ DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (NameValuePairSeq_var &p)
 }
 
 ACE_INLINE
-DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (const ::DynamicAny::NameValuePairSeq_out &p) // copy constructor
+DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (const ::DynamicAny::NameValuePairSeq_out &p)
   : ptr_ (ACE_const_cast (NameValuePairSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq_out &
+ACE_INLINE
+::DynamicAny::NameValuePairSeq_out &
 DynamicAny::NameValuePairSeq_out::operator= (const ::DynamicAny::NameValuePairSeq_out &p)
 {
   this->ptr_ = ACE_const_cast (NameValuePairSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq_out &
+ACE_INLINE
+::DynamicAny::NameValuePairSeq_out &
 DynamicAny::NameValuePairSeq_out::operator= (NameValuePairSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameValuePairSeq_out::operator ::DynamicAny::NameValuePairSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq *&
+ACE_INLINE
+::DynamicAny::NameValuePairSeq *&
 DynamicAny::NameValuePairSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameValuePairSeq *
+ACE_INLINE
+::DynamicAny::NameValuePairSeq *
 DynamicAny::NameValuePairSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameValuePair &
+ACE_INLINE
+DynamicAny::NameValuePair &
 DynamicAny::NameValuePairSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameDynAnyPair_var
 // *************************************************************
 
 ACE_INLINE
-DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (void) // default constructor
+DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (void)
   : ptr_ (0)
 {}
 
@@ -650,42 +752,52 @@ DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (NameDynAnyPair *p)
 {}
 
 ACE_INLINE
-DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (const ::DynamicAny::NameDynAnyPair_var &p) // copy constructor
+DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (const ::DynamicAny::NameDynAnyPair_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::DynamicAny::NameDynAnyPair (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::DynamicAny::NameDynAnyPair (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPair_var::~NameDynAnyPair_var (void) // destructor
+DynamicAny::NameDynAnyPair_var::~NameDynAnyPair_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameDynAnyPair_var &
-DynamicAny::NameDynAnyPair_var::operator= (NameDynAnyPair *p)
+ACE_INLINE
+DynamicAny::NameDynAnyPair_var &
+DynamicAny::NameDynAnyPair_var::operator= (NameDynAnyPair *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPair_var &
-DynamicAny::NameDynAnyPair_var::operator= (const ::DynamicAny::NameDynAnyPair_var &p)
+ACE_INLINE
+::DynamicAny::NameDynAnyPair_var &
+DynamicAny::NameDynAnyPair_var::operator= (const ::DynamicAny::NameDynAnyPair_var &_tao_struct_var)
 {
-  if (this != &p)
+  if (this != &_tao_struct_var)
     {
-      if (p.ptr_ == 0)
+      if (_tao_struct_var.ptr_ == 0)
         {
           delete this->ptr_;
           this->ptr_ = 0;
         }
       else
         {
-          NameDynAnyPair *deep_copy =
-            new NameDynAnyPair (*p.ptr_);
+          NameDynAnyPair *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              NameDynAnyPair (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -730,7 +842,7 @@ DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair &() const
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair *&() // cast 
 {
@@ -749,7 +861,7 @@ DynamicAny::NameDynAnyPair_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::DynamicAny::NameDynAnyPair *&
 DynamicAny::NameDynAnyPair_var::out (void)
 {
@@ -772,6 +884,9 @@ DynamicAny::NameDynAnyPair_var::ptr (void) const
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameDynAnyPair_out
 // *************************************************************
@@ -784,7 +899,7 @@ DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (::DynamicAny::NameDynAnyPair
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (NameDynAnyPair_var &p) // constructor from _var
+DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (NameDynAnyPair_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -792,21 +907,23 @@ DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (NameDynAnyPair_var &p) // co
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (const ::DynamicAny::NameDynAnyPair_out &p) // copy constructor
+DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (const ::DynamicAny::NameDynAnyPair_out &p)
   : ptr_ (ACE_const_cast (NameDynAnyPair_out&, p).ptr_)
 {}
 
-ACE_INLINE DynamicAny::NameDynAnyPair_out &
+ACE_INLINE
+DynamicAny::NameDynAnyPair_out &
 DynamicAny::NameDynAnyPair_out::operator= (const ::DynamicAny::NameDynAnyPair_out &p)
 {
   this->ptr_ = ACE_const_cast (NameDynAnyPair_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE DynamicAny::NameDynAnyPair_out &
-DynamicAny::NameDynAnyPair_out::operator= (NameDynAnyPair *p)
+ACE_INLINE
+DynamicAny::NameDynAnyPair_out &
+DynamicAny::NameDynAnyPair_out::operator= (NameDynAnyPair *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -828,192 +945,231 @@ DynamicAny::NameDynAnyPair_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_
 
-// = Static operations.
-ACE_INLINE DynamicAny::NameDynAnyPair *
+ACE_INLINE
+DynamicAny::NameDynAnyPair *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   DynamicAny::NameDynAnyPair *retval = 0;
   ACE_NEW_RETURN (retval, DynamicAny::NameDynAnyPair[size], 0);
   return retval;
 }
 
-ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (DynamicAny::NameDynAnyPair *buffer)
-// Free the sequence.
+ACE_INLINE
+void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (DynamicAny::NameDynAnyPair *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void) // Default constructor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  DynamicAny::NameDynAnyPair *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    DynamicAny::NameDynAnyPair *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs)
-// Copy constructor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (
+    const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    DynamicAny::NameDynAnyPair *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->maximum_);
-    DynamicAny::NameDynAnyPair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      DynamicAny::NameDynAnyPair *tmp1 =
+        _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->maximum_);
+      DynamicAny::NameDynAnyPair * const tmp2 =
+        ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs)
-// Assignment operator.
+ACE_INLINE
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator= (
+    const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
-      _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          DynamicAny::NameDynAnyPair *tmp =
+            ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  DynamicAny::NameDynAnyPair *tmp1 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
-  DynamicAny::NameDynAnyPair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_);
+  DynamicAny::NameDynAnyPair *tmp1 =
+    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
+  DynamicAny::NameDynAnyPair * const tmp2 =
+    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE DynamicAny::NameDynAnyPair &
+ACE_INLINE
+DynamicAny::NameDynAnyPair &
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  DynamicAny::NameDynAnyPair* tmp = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_);
+  DynamicAny::NameDynAnyPair* tmp =
+    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const DynamicAny::NameDynAnyPair &
+ACE_INLINE
+const DynamicAny::NameDynAnyPair &
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  DynamicAny::NameDynAnyPair * const tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair* ACE_CAST_CONST, this->buffer_);
+  DynamicAny::NameDynAnyPair * const tmp =
+    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE DynamicAny::NameDynAnyPair *
+ACE_INLINE
+DynamicAny::NameDynAnyPair *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::get_buffer (CORBA::Boolean orphan)
 {
   DynamicAny::NameDynAnyPair *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const DynamicAny::NameDynAnyPair *
+ACE_INLINE
+const DynamicAny::NameDynAnyPair *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const DynamicAny::NameDynAnyPair * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const DynamicAny::NameDynAnyPair * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::replace (CORBA::ULong max,
-CORBA::ULong length,
-DynamicAny::NameDynAnyPair *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    DynamicAny::NameDynAnyPair *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_);
-    _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
-  }
+    {
+      DynamicAny::NameDynAnyPair *tmp =
+        ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_);
+      _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameDynAnyPairSeq_var
 // *************************************************************
 
 ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (void) // default constructor
+DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (void)
   : ptr_ (0)
 {}
 
@@ -1023,21 +1179,26 @@ DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (NameDynAnyPairSeq *p)
 {}
 
 ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (const ::DynamicAny::NameDynAnyPairSeq_var &p) // copy constructor
+DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (const ::DynamicAny::NameDynAnyPairSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::DynamicAny::NameDynAnyPairSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::DynamicAny::NameDynAnyPairSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::~NameDynAnyPairSeq_var (void) // destructor
+DynamicAny::NameDynAnyPairSeq_var::~NameDynAnyPairSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameDynAnyPairSeq_var &
+ACE_INLINE
+DynamicAny::NameDynAnyPairSeq_var &
 DynamicAny::NameDynAnyPairSeq_var::operator= (NameDynAnyPairSeq *p)
 {
   delete this->ptr_;
@@ -1045,7 +1206,8 @@ DynamicAny::NameDynAnyPairSeq_var::operator= (NameDynAnyPairSeq *p)
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq_var &
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq_var &
 DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPairSeq_var &p)
 {
   if (this != &p)
@@ -1057,8 +1219,12 @@ DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPair
         }
       else
         {
-          NameDynAnyPairSeq *deep_copy =
-            new NameDynAnyPairSeq (*p.ptr_);
+          NameDynAnyPairSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              NameDynAnyPairSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1073,69 +1239,75 @@ DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPair
   return *this;
 }
 
-ACE_INLINE const ::DynamicAny::NameDynAnyPairSeq *
+ACE_INLINE
+const ::DynamicAny::NameDynAnyPairSeq *
 DynamicAny::NameDynAnyPairSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq *
 DynamicAny::NameDynAnyPairSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameDynAnyPairSeq_var::operator const ::DynamicAny::NameDynAnyPairSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameDynAnyPair &
+ACE_INLINE
+DynamicAny::NameDynAnyPair &
 DynamicAny::NameDynAnyPairSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const DynamicAny::NameDynAnyPair &
+ACE_INLINE
+const DynamicAny::NameDynAnyPair &
 DynamicAny::NameDynAnyPairSeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const DynamicAny::NameDynAnyPair &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::DynamicAny::NameDynAnyPairSeq &
+ACE_INLINE
+const ::DynamicAny::NameDynAnyPairSeq &
 DynamicAny::NameDynAnyPairSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq &
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq &
 DynamicAny::NameDynAnyPairSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *&
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq *&
 DynamicAny::NameDynAnyPairSeq_var::out (void)
 {
   delete this->ptr_;
@@ -1143,7 +1315,8 @@ DynamicAny::NameDynAnyPairSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq *
 DynamicAny::NameDynAnyPairSeq_var::_retn (void)
 {
   ::DynamicAny::NameDynAnyPairSeq *tmp = this->ptr_;
@@ -1151,12 +1324,16 @@ DynamicAny::NameDynAnyPairSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq *
 DynamicAny::NameDynAnyPairSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class DynamicAny::NameDynAnyPairSeq_out
 // *************************************************************
@@ -1169,7 +1346,7 @@ DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (NameDynAnyPairSeq *&p)
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (NameDynAnyPairSeq_var &p) // constructor from _var
+DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (NameDynAnyPairSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1177,251 +1354,310 @@ DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (NameDynAnyPairSeq_var
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (const ::DynamicAny::NameDynAnyPairSeq_out &p) // copy constructor
+DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (const ::DynamicAny::NameDynAnyPairSeq_out &p)
   : ptr_ (ACE_const_cast (NameDynAnyPairSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq_out &
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq_out &
 DynamicAny::NameDynAnyPairSeq_out::operator= (const ::DynamicAny::NameDynAnyPairSeq_out &p)
 {
   this->ptr_ = ACE_const_cast (NameDynAnyPairSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq_out &
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq_out &
 DynamicAny::NameDynAnyPairSeq_out::operator= (NameDynAnyPairSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameDynAnyPairSeq_out::operator ::DynamicAny::NameDynAnyPairSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *&
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq *&
 DynamicAny::NameDynAnyPairSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *
+ACE_INLINE
+::DynamicAny::NameDynAnyPairSeq *
 DynamicAny::NameDynAnyPairSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE DynamicAny::NameDynAnyPair &
+ACE_INLINE
+DynamicAny::NameDynAnyPair &
 DynamicAny::NameDynAnyPairSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNSTRUCT___CI_)
 #define _DYNAMICANY_DYNSTRUCT___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynStruct::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNUNION___CI_)
 #define _DYNAMICANY_DYNUNION___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynUnion::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CI_
 
-// = Static operations.
-ACE_INLINE CORBA::Any *
+ACE_INLINE
+CORBA::Any *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   CORBA::Any *retval = 0;
   ACE_NEW_RETURN (retval, CORBA::Any[size], 0);
   return retval;
 }
 
-ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (CORBA::Any *buffer)
-// Free the sequence.
+ACE_INLINE
+void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (CORBA::Any *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void) // Default constructor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  CORBA::Any *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::Any *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs)
-// Copy constructor.
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (
+    const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    CORBA::Any *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->maximum_);
-    CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      CORBA::Any *tmp1 =
+        _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->maximum_);
+      CORBA::Any * const tmp2 =
+        ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs)
-// Assignment operator.
+ACE_INLINE
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq &
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator= (
+    const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
-      _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          CORBA::Any *tmp =
+            ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  CORBA::Any *tmp1 = ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
-  CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
+  CORBA::Any *tmp1 =
+    ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
+  CORBA::Any * const tmp2 =
+    ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE CORBA::Any &
+ACE_INLINE
+CORBA::Any &
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  CORBA::Any* tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
+  CORBA::Any* tmp =
+    ACE_reinterpret_cast (CORBA::Any*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const CORBA::Any &
+ACE_INLINE
+const CORBA::Any &
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  CORBA::Any * const tmp = ACE_reinterpret_cast (CORBA::Any* ACE_CAST_CONST, this->buffer_);
+  CORBA::Any * const tmp =
+    ACE_reinterpret_cast (CORBA::Any* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE CORBA::Any *
+ACE_INLINE
+CORBA::Any *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::Any *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (CORBA::Any*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::Any*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const CORBA::Any *
+ACE_INLINE
+const CORBA::Any *
 DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const CORBA::Any * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::Any * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::replace (CORBA::ULong max,
-CORBA::ULong length,
-CORBA::Any *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Any *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    CORBA::Any *tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
-    _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
-  }
+    {
+      CORBA::Any *tmp =
+        ACE_reinterpret_cast (CORBA::Any*, this->buffer_);
+      _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_ANYSEQ_CI_)
 #define _DYNAMICANY_ANYSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class DynamicAny::AnySeq_var
 // *************************************************************
 
 ACE_INLINE
-DynamicAny::AnySeq_var::AnySeq_var (void) // default constructor
+DynamicAny::AnySeq_var::AnySeq_var (void)
   : ptr_ (0)
 {}
 
@@ -1431,21 +1667,26 @@ DynamicAny::AnySeq_var::AnySeq_var (AnySeq *p)
 {}
 
 ACE_INLINE
-DynamicAny::AnySeq_var::AnySeq_var (const ::DynamicAny::AnySeq_var &p) // copy constructor
+DynamicAny::AnySeq_var::AnySeq_var (const ::DynamicAny::AnySeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::DynamicAny::AnySeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::DynamicAny::AnySeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-DynamicAny::AnySeq_var::~AnySeq_var (void) // destructor
+DynamicAny::AnySeq_var::~AnySeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE DynamicAny::AnySeq_var &
+ACE_INLINE
+DynamicAny::AnySeq_var &
 DynamicAny::AnySeq_var::operator= (AnySeq *p)
 {
   delete this->ptr_;
@@ -1453,7 +1694,8 @@ DynamicAny::AnySeq_var::operator= (AnySeq *p)
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq_var &
+ACE_INLINE
+::DynamicAny::AnySeq_var &
 DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p)
 {
   if (this != &p)
@@ -1465,8 +1707,12 @@ DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p)
         }
       else
         {
-          AnySeq *deep_copy =
-            new AnySeq (*p.ptr_);
+          AnySeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              AnySeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1481,69 +1727,75 @@ DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::DynamicAny::AnySeq *
+ACE_INLINE
+const ::DynamicAny::AnySeq *
 DynamicAny::AnySeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq *
+ACE_INLINE
+::DynamicAny::AnySeq *
 DynamicAny::AnySeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::AnySeq_var::operator const ::DynamicAny::AnySeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Any &
+ACE_INLINE
+CORBA::Any &
 DynamicAny::AnySeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::Any &
+ACE_INLINE
+const CORBA::Any &
 DynamicAny::AnySeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const CORBA::Any &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::DynamicAny::AnySeq &
+ACE_INLINE
+const ::DynamicAny::AnySeq &
 DynamicAny::AnySeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq &
+ACE_INLINE
+::DynamicAny::AnySeq &
 DynamicAny::AnySeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::DynamicAny::AnySeq *&
+ACE_INLINE
+::DynamicAny::AnySeq *&
 DynamicAny::AnySeq_var::out (void)
 {
   delete this->ptr_;
@@ -1551,7 +1803,8 @@ DynamicAny::AnySeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq *
+ACE_INLINE
+::DynamicAny::AnySeq *
 DynamicAny::AnySeq_var::_retn (void)
 {
   ::DynamicAny::AnySeq *tmp = this->ptr_;
@@ -1559,12 +1812,16 @@ DynamicAny::AnySeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq *
+ACE_INLINE
+::DynamicAny::AnySeq *
 DynamicAny::AnySeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class DynamicAny::AnySeq_out
 // *************************************************************
@@ -1577,7 +1834,7 @@ DynamicAny::AnySeq_out::AnySeq_out (AnySeq *&p)
 }
 
 ACE_INLINE
-DynamicAny::AnySeq_out::AnySeq_out (AnySeq_var &p) // constructor from _var
+DynamicAny::AnySeq_out::AnySeq_out (AnySeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1585,58 +1842,65 @@ DynamicAny::AnySeq_out::AnySeq_out (AnySeq_var &p) // constructor from _var
 }
 
 ACE_INLINE
-DynamicAny::AnySeq_out::AnySeq_out (const ::DynamicAny::AnySeq_out &p) // copy constructor
+DynamicAny::AnySeq_out::AnySeq_out (const ::DynamicAny::AnySeq_out &p)
   : ptr_ (ACE_const_cast (AnySeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::DynamicAny::AnySeq_out &
+ACE_INLINE
+::DynamicAny::AnySeq_out &
 DynamicAny::AnySeq_out::operator= (const ::DynamicAny::AnySeq_out &p)
 {
   this->ptr_ = ACE_const_cast (AnySeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq_out &
+ACE_INLINE
+::DynamicAny::AnySeq_out &
 DynamicAny::AnySeq_out::operator= (AnySeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::AnySeq_out::operator ::DynamicAny::AnySeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq *&
+ACE_INLINE
+::DynamicAny::AnySeq *&
 DynamicAny::AnySeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::AnySeq *
+ACE_INLINE
+::DynamicAny::AnySeq *
 DynamicAny::AnySeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Any &
+ACE_INLINE
+CORBA::Any &
 DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CI_
 
-ACE_INLINE DynamicAny::DynAny **
+ACE_INLINE
+DynamicAny::DynAny **
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (CORBA::ULong nelems)
 {
   DynamicAny::DynAny **buf = 0;
@@ -1651,11 +1915,15 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (CORBA
   return buf;
 }
 
-ACE_INLINE void 
+ACE_INLINE
+void 
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (DynamicAny::DynAny **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -1671,64 +1939,83 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  DynamicAny::DynAny* *value,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    DynamicAny::DynAny* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
 ACE_INLINE
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq(const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs)
+DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq(
+    const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    DynamicAny::DynAny **tmp1 = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_);
-    DynamicAny::DynAny ** const tmp2 = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]);
-      }
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      DynamicAny::DynAny **tmp1 =
+        _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_);
+      DynamicAny::DynAny ** const tmp2 =
+        ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator= (const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs)
+ACE_INLINE
+DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &
+DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator= (
+    const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = DynamicAny::DynAny::_nil ();
+      DynamicAny::DynAny **tmp =
+        ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::release (tmp[i]);
+          tmp[i] = DynamicAny::DynAny::_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_);
+        }
     }
-    if (this->maximum_ < rhs.maximum_)
+  else
     {
-      _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_);
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_);
     }
-  }
-  else
-    this->buffer_ = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_);
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  DynamicAny::DynAny **tmp1 = ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_);
-  DynamicAny::DynAny ** const tmp2 = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
+  DynamicAny::DynAny **tmp1 =
+    ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_);
+  
+  DynamicAny::DynAny ** const tmp2 =
+    ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
@@ -1738,70 +2025,78 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator= (cons
   return *this;
 }
 
-ACE_INLINE TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>
+ACE_INLINE
+TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  DynamicAny::DynAny ** const tmp = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_);
+  DynamicAny::DynAny ** const tmp =
+    ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_);
   return TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var> (tmp + index, this->release_);
 }
 
-ACE_INLINE DynamicAny::DynAny* *
+ACE_INLINE
+DynamicAny::DynAny* *
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::get_buffer (CORBA::Boolean orphan)
 {
   DynamicAny::DynAny **result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(DynamicAny::DynAny**,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(DynamicAny::DynAny**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const DynamicAny::DynAny* *
+ACE_INLINE
+const DynamicAny::DynAny* *
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_);
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMICANY_DYNANYSEQ_CI_)
 #define _DYNAMICANY_DYNANYSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class DynamicAny::DynAnySeq_var
 // *************************************************************
 
 ACE_INLINE
-DynamicAny::DynAnySeq_var::DynAnySeq_var (void) // default constructor
+DynamicAny::DynAnySeq_var::DynAnySeq_var (void)
   : ptr_ (0)
 {}
 
@@ -1811,21 +2106,26 @@ DynamicAny::DynAnySeq_var::DynAnySeq_var (DynAnySeq *p)
 {}
 
 ACE_INLINE
-DynamicAny::DynAnySeq_var::DynAnySeq_var (const ::DynamicAny::DynAnySeq_var &p) // copy constructor
+DynamicAny::DynAnySeq_var::DynAnySeq_var (const ::DynamicAny::DynAnySeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::DynamicAny::DynAnySeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::DynamicAny::DynAnySeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-DynamicAny::DynAnySeq_var::~DynAnySeq_var (void) // destructor
+DynamicAny::DynAnySeq_var::~DynAnySeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE DynamicAny::DynAnySeq_var &
+ACE_INLINE
+DynamicAny::DynAnySeq_var &
 DynamicAny::DynAnySeq_var::operator= (DynAnySeq *p)
 {
   delete this->ptr_;
@@ -1833,7 +2133,8 @@ DynamicAny::DynAnySeq_var::operator= (DynAnySeq *p)
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq_var &
+ACE_INLINE
+::DynamicAny::DynAnySeq_var &
 DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p)
 {
   if (this != &p)
@@ -1845,8 +2146,12 @@ DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p)
         }
       else
         {
-          DynAnySeq *deep_copy =
-            new DynAnySeq (*p.ptr_);
+          DynAnySeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              DynAnySeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1861,63 +2166,68 @@ DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::DynamicAny::DynAnySeq *
+ACE_INLINE
+const ::DynamicAny::DynAnySeq *
 DynamicAny::DynAnySeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq *
+ACE_INLINE
+::DynamicAny::DynAnySeq *
 DynamicAny::DynAnySeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::DynAnySeq_var::operator const ::DynamicAny::DynAnySeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<DynamicAny::DynAny, DynamicAny::DynAny_var>
+ACE_INLINE
+TAO_Object_Manager<DynamicAny::DynAny, DynamicAny::DynAny_var>
 DynamicAny::DynAnySeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::DynamicAny::DynAnySeq &
+ACE_INLINE
+const ::DynamicAny::DynAnySeq &
 DynamicAny::DynAnySeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq &
+ACE_INLINE
+::DynamicAny::DynAnySeq &
 DynamicAny::DynAnySeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::DynamicAny::DynAnySeq *&
+ACE_INLINE
+::DynamicAny::DynAnySeq *&
 DynamicAny::DynAnySeq_var::out (void)
 {
   delete this->ptr_;
@@ -1925,7 +2235,8 @@ DynamicAny::DynAnySeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq *
+ACE_INLINE
+::DynamicAny::DynAnySeq *
 DynamicAny::DynAnySeq_var::_retn (void)
 {
   ::DynamicAny::DynAnySeq *tmp = this->ptr_;
@@ -1933,12 +2244,16 @@ DynamicAny::DynAnySeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq *
+ACE_INLINE
+::DynamicAny::DynAnySeq *
 DynamicAny::DynAnySeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
 // *************************************************************
 // Inline operations for class DynamicAny::DynAnySeq_out
 // *************************************************************
@@ -1951,7 +2266,7 @@ DynamicAny::DynAnySeq_out::DynAnySeq_out (DynAnySeq *&p)
 }
 
 ACE_INLINE
-DynamicAny::DynAnySeq_out::DynAnySeq_out (DynAnySeq_var &p) // constructor from _var
+DynamicAny::DynAnySeq_out::DynAnySeq_out (DynAnySeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1959,107 +2274,158 @@ DynamicAny::DynAnySeq_out::DynAnySeq_out (DynAnySeq_var &p) // constructor from
 }
 
 ACE_INLINE
-DynamicAny::DynAnySeq_out::DynAnySeq_out (const ::DynamicAny::DynAnySeq_out &p) // copy constructor
+DynamicAny::DynAnySeq_out::DynAnySeq_out (const ::DynamicAny::DynAnySeq_out &p)
   : ptr_ (ACE_const_cast (DynAnySeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::DynamicAny::DynAnySeq_out &
+ACE_INLINE
+::DynamicAny::DynAnySeq_out &
 DynamicAny::DynAnySeq_out::operator= (const ::DynamicAny::DynAnySeq_out &p)
 {
   this->ptr_ = ACE_const_cast (DynAnySeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq_out &
+ACE_INLINE
+::DynamicAny::DynAnySeq_out &
 DynamicAny::DynAnySeq_out::operator= (DynAnySeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::DynAnySeq_out::operator ::DynamicAny::DynAnySeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq *&
+ACE_INLINE
+::DynamicAny::DynAnySeq *&
 DynamicAny::DynAnySeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::DynamicAny::DynAnySeq *
+ACE_INLINE
+::DynamicAny::DynAnySeq *
 DynamicAny::DynAnySeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<DynamicAny::DynAny, DynamicAny::DynAny_var>
+ACE_INLINE
+TAO_Object_Manager<DynamicAny::DynAny, DynamicAny::DynAny_var>
 DynamicAny::DynAnySeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNSEQUENCE___CI_)
 #define _DYNAMICANY_DYNSEQUENCE___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynSequence::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNARRAY___CI_)
 #define _DYNAMICANY_DYNARRAY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynArray::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNVALUE___CI_)
 #define _DYNAMICANY_DYNVALUE___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynValue::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception DynamicAny::DynAnyFactory::InconsistentTypeCode
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY___CI_)
 #define _DYNAMICANY_DYNANYFACTORY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+DynamicAny::DynAnyFactory::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const DynamicAny::NameValuePair &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const DynamicAny::NameValuePair &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.id.in ()) &&
     (strm << _tao_aggregate.value)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, DynamicAny::NameValuePair &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    DynamicAny::NameValuePair &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.id.out ()) &&
     (strm >> _tao_aggregate.value)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_DynamicAny_NameValuePairSeq_I_
 #define _TAO_CDR_OP_DynamicAny_NameValuePairSeq_I_
@@ -2068,6 +2434,7 @@ CORBA::Boolean TAO_DynamicAny_Export operator<< (
     TAO_OutputCDR &,
     const DynamicAny::NameValuePairSeq &
   );
+
 CORBA::Boolean TAO_DynamicAny_Export operator>> (
     TAO_InputCDR &,
     DynamicAny::NameValuePairSeq &
@@ -2075,6 +2442,8 @@ CORBA::Boolean TAO_DynamicAny_Export operator>> (
 
 #endif /* _TAO_CDR_OP_DynamicAny_NameValuePairSeq_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_DynamicAny_AnySeq_I_
 #define _TAO_CDR_OP_DynamicAny_AnySeq_I_
@@ -2083,6 +2452,7 @@ CORBA::Boolean TAO_DynamicAny_Export operator<< (
     TAO_OutputCDR &,
     const DynamicAny::AnySeq &
   );
+
 CORBA::Boolean TAO_DynamicAny_Export operator>> (
     TAO_InputCDR &,
     DynamicAny::AnySeq &
diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile
index e9b18105653..a1b2ec89672 100644
--- a/TAO/tao/DynamicAny/Makefile
+++ b/TAO/tao/DynamicAny/Makefile
@@ -136,7 +136,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -165,7 +166,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -201,7 +203,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -225,8 +236,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -236,10 +256,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -255,16 +277,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -341,7 +358,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -370,7 +388,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -406,7 +425,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -430,8 +458,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -441,10 +478,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -460,16 +499,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -555,7 +589,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -584,7 +619,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -620,7 +656,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -644,8 +689,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -655,10 +709,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -674,16 +730,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -769,7 +820,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -798,7 +850,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -834,7 +887,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -858,8 +920,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -869,10 +940,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -888,16 +961,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -974,7 +1042,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1003,7 +1072,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1039,7 +1109,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1063,8 +1142,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1074,10 +1162,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1093,16 +1183,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1122,9 +1207,7 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i
+  $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h
 
 .obj/DynSequence_i.o .obj/DynSequence_i.so .shobj/DynSequence_i.o .shobj/DynSequence_i.so: DynSequence_i.cpp DynSequence_i.h \
   $(ACE_ROOT)/ace/pre.h DynamicAny.h dynamicany_export.h \
@@ -1188,7 +1271,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1217,7 +1301,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1253,7 +1338,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1277,8 +1371,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1288,10 +1391,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1307,16 +1412,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1336,9 +1436,7 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i
+  $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h
 
 .obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp DynEnum_i.h $(ACE_ROOT)/ace/pre.h \
   DynamicAny.h dynamicany_export.h \
@@ -1402,7 +1500,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1431,7 +1530,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1467,7 +1567,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1491,8 +1600,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1502,10 +1620,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1521,16 +1641,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1614,7 +1729,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1643,7 +1759,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1679,7 +1796,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1703,8 +1829,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1714,10 +1849,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1733,16 +1870,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1762,9 +1894,7 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i
+  $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h
 
 .obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp DynUnion_i.h \
   $(ACE_ROOT)/ace/pre.h DynamicAny.h dynamicany_export.h \
@@ -1828,7 +1958,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1857,7 +1988,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1893,7 +2025,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1917,8 +2058,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1928,10 +2078,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1947,16 +2099,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1969,8 +2116,7 @@ endif
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i DynamicAnyC.i \
-  DynCommon.h DynAnyFactory.h $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i
+  DynCommon.h DynAnyFactory.h
 
 .obj/DynamicAnyC.o .obj/DynamicAnyC.so .shobj/DynamicAnyC.o .shobj/DynamicAnyC.so: DynamicAnyC.cpp DynamicAny.h \
   $(ACE_ROOT)/ace/pre.h dynamicany_export.h \
@@ -2034,7 +2180,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2063,7 +2210,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2099,7 +2247,16 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h DynamicAnyC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2123,8 +2280,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -2134,10 +2300,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -2153,16 +2321,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2182,9 +2345,10 @@ endif
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -2215,14 +2379,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -2268,6 +2424,28 @@ endif
   $(TAO_ROOT)/tao/target_specification.h \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
diff --git a/TAO/tao/DynamicAny/TAO_DynamicAny.dsp b/TAO/tao/DynamicAny/TAO_DynamicAny.dsp
index f262c8125d2..8ca6443aad9 100644
--- a/TAO/tao/DynamicAny/TAO_DynamicAny.dsp
+++ b/TAO/tao/DynamicAny/TAO_DynamicAny.dsp
@@ -161,6 +161,7 @@ SOURCE=.\DynamicAny.cpp
 # Begin Source File

 

 SOURCE=.\DynamicAnyC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index a39c3630b11..ac87a5d034f 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -19,12 +19,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "DynamicC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "DynamicC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
-#include "tao/StringSeqC.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
@@ -32,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -40,34 +44,39 @@
 #include "DynamicC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Dynamic_Parameter[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  26,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  34,
   ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x44796e61), 
   ACE_NTOHL (0x6d69632f), 
   ACE_NTOHL (0x50617261), 
   ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x723a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
-  10,
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/Parameter:1.0
+    10,
   ACE_NTOHL (0x50617261), 
   ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x72000000),  // name = Parameter
   2, // member count
-  9,
+    9,
   ACE_NTOHL (0x61726775), 
   ACE_NTOHL (0x6d656e74), 
   ACE_NTOHL (0x0),  // name = argument
-  CORBA::tk_any,
+    CORBA::tk_any,
 
   5,
   ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
-  CORBA::tk_enum, // typecode kind
+    CORBA::tk_enum, // typecode kind
   116, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
+TAO_ENCAP_BYTE_ORDER, // byte order
     36,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
@@ -96,7 +105,7 @@ static const CORBA::Long _oc_Dynamic_Parameter[] =
     ACE_NTOHL (0x50415241), 
     ACE_NTOHL (0x4d5f494e), 
     ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
@@ -109,15 +118,24 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Parameter, &_tc_TAO_tc_Dynamic_Parameter)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Parameter,
+    &_tc_TAO_tc_Dynamic_Parameter
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void Dynamic::Parameter::_tao_any_destructor (void *_tao_void_pointer)
 {
   Parameter *tmp = ACE_static_cast (Parameter*, _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)
 
@@ -131,16 +149,21 @@ Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_allocate_buffer (CORBA:
   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);
-    
-  }
+    {
+      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;
 }
 
@@ -148,120 +171,145 @@ 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_);
+    {
+      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) // Dtor.
+Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::~_TAO_Unbounded_Sequence_Dynamic_ParameterList (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_DYNAMIC_PARAMETERLIST_CS_)
 #define _DYNAMIC_PARAMETERLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // Dynamic::ParameterList
 // *************************************************************
 
 Dynamic::ParameterList::ParameterList (void)
 {}
-Dynamic::ParameterList::ParameterList (CORBA::ULong max) // uses max size
+
+Dynamic::ParameterList::ParameterList (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<Dynamic::Parameter>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-Dynamic::ParameterList::ParameterList (CORBA::ULong max, CORBA::ULong length, Dynamic::Parameter *buffer, CORBA::Boolean release)
+
+Dynamic::ParameterList::ParameterList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    Dynamic::Parameter *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<Dynamic::Parameter>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-Dynamic::ParameterList::ParameterList (const ParameterList &seq) // copy ctor
+
+Dynamic::ParameterList::ParameterList (const ParameterList &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_Dynamic_ParameterList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<Dynamic::Parameter>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 Dynamic::ParameterList::~ParameterList (void) // dtor
 {}
+
 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 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Dynamic_ParameterList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
   ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x44796e61), 
   ACE_NTOHL (0x6d69632f), 
   ACE_NTOHL (0x50617261), 
   ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x724c6973), 
   ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/ParameterList:1.0
-  14,
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ParameterList:1.0
+    14,
   ACE_NTOHL (0x50617261), 
   ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x724c6973), 
   ACE_NTOHL (0x74000000),  // name = ParameterList
-  CORBA::tk_sequence, // typecode kind
-  228, // encapsulation length
+    CORBA::tk_sequence, // typecode kind
+  236, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
-    212, // encapsulation length
+    220, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      26,
+      34,
       ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
       ACE_NTOHL (0x44796e61), 
       ACE_NTOHL (0x6d69632f), 
       ACE_NTOHL (0x50617261), 
       ACE_NTOHL (0x6d657465), 
       ACE_NTOHL (0x723a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
-      10,
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/Parameter:1.0
+            10,
       ACE_NTOHL (0x50617261), 
       ACE_NTOHL (0x6d657465), 
       ACE_NTOHL (0x72000000),  // name = Parameter
       2, // member count
-      9,
+            9,
       ACE_NTOHL (0x61726775), 
       ACE_NTOHL (0x6d656e74), 
       ACE_NTOHL (0x0),  // name = argument
-      CORBA::tk_any,
+            CORBA::tk_any,
 
       5,
       ACE_NTOHL (0x6d6f6465), 
       ACE_NTOHL (0x0),  // name = mode
-      CORBA::tk_enum, // typecode kind
+            CORBA::tk_enum, // typecode kind
       116, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
+TAO_ENCAP_BYTE_ORDER, // byte order
         36,
         ACE_NTOHL (0x49444c3a), 
         ACE_NTOHL (0x6f6d672e), 
@@ -290,7 +338,7 @@ static const CORBA::Long _oc_Dynamic_ParameterList[] =
         ACE_NTOHL (0x50415241), 
         ACE_NTOHL (0x4d5f494e), 
         ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+        
 
     0U,
 
@@ -306,25 +354,34 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ParameterList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ParameterList, &_tc_TAO_tc_Dynamic_ParameterList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ParameterList,
+    &_tc_TAO_tc_Dynamic_ParameterList
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Dynamic_ContextList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  28,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
   ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x44796e61), 
   ACE_NTOHL (0x6d69632f), 
   ACE_NTOHL (0x436f6e74), 
   ACE_NTOHL (0x6578744c), 
   ACE_NTOHL (0x6973743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:Dynamic/ContextList:1.0
-  12,
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Dynamic/ContextList:1.0
+    12,
   ACE_NTOHL (0x436f6e74), 
   ACE_NTOHL (0x6578744c), 
   ACE_NTOHL (0x69737400),  // name = ContextList
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
@@ -336,11 +393,11 @@ static const CORBA::Long _oc_Dynamic_ContextList[] =
     ACE_NTOHL (0x72696e67), 
     ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-    10,
+        10,
     ACE_NTOHL (0x53747269), 
     ACE_NTOHL (0x6e675365), 
     ACE_NTOHL (0x71000000),  // name = StringSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_string, 
@@ -360,25 +417,34 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ContextList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ContextList, &_tc_TAO_tc_Dynamic_ContextList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ContextList,
+    &_tc_TAO_tc_Dynamic_ContextList
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Dynamic_TypeCode[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  25,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
   ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x44796e61), 
   ACE_NTOHL (0x6d69632f), 
   ACE_NTOHL (0x54797065), 
   ACE_NTOHL (0x436f6465), 
   ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:Dynamic/TypeCode:1.0
-  9,
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Dynamic/TypeCode:1.0
+    9,
   ACE_NTOHL (0x54797065), 
   ACE_NTOHL (0x436f6465), 
   ACE_NTOHL (0x0),  // name = TypeCode
-  CORBA::tk_TypeCode,
+    CORBA::tk_TypeCode,
 
 };
 
@@ -392,9 +458,15 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_TypeCode (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_TypeCode, &_tc_TAO_tc_Dynamic_TypeCode)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TypeCode,
+    &_tc_TAO_tc_Dynamic_TypeCode
+  )
 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)
 
@@ -409,25 +481,27 @@ Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_allocate_buffer
   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;
-      }
-  }
+    {
+      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;
 }
 
@@ -435,7 +509,10 @@ void
 Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   CORBA::TypeCode **tmp = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
@@ -466,94 +543,119 @@ Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_shrink_buffer (C
 }
 
 
-#endif /* end #if !defined */
 
+#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) // uses max size
+
+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)
+
+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) // copy ctor
+
+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
 {}
+
 void Dynamic::ExceptionList::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExceptionList *tmp = ACE_static_cast (ExceptionList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Dynamic_ExceptionList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
   ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x44796e61), 
   ACE_NTOHL (0x6d69632f), 
   ACE_NTOHL (0x45786365), 
   ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e4c6973), 
   ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/ExceptionList:1.0
-  14,
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ExceptionList:1.0
+    14,
   ACE_NTOHL (0x45786365), 
   ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e4c6973), 
   ACE_NTOHL (0x74000000),  // name = ExceptionList
-  CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
+    CORBA::tk_sequence, // typecode kind
+  80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
+    64, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      25,
+      33,
       ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
       ACE_NTOHL (0x44796e61), 
       ACE_NTOHL (0x6d69632f), 
       ACE_NTOHL (0x54797065), 
       ACE_NTOHL (0x436f6465), 
       ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:Dynamic/TypeCode:1.0
-      9,
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Dynamic/TypeCode:1.0
+            9,
       ACE_NTOHL (0x54797065), 
       ACE_NTOHL (0x436f6465), 
       ACE_NTOHL (0x0),  // name = TypeCode
-      CORBA::tk_TypeCode,
+            CORBA::tk_TypeCode,
 
 
     0U,
@@ -570,27 +672,36 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ExceptionList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ExceptionList, &_tc_TAO_tc_Dynamic_ExceptionList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExceptionList,
+    &_tc_TAO_tc_Dynamic_ExceptionList
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Dynamic_RequestContext[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
   ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x44796e61), 
   ACE_NTOHL (0x6d69632f), 
   ACE_NTOHL (0x52657175), 
   ACE_NTOHL (0x65737443), 
   ACE_NTOHL (0x6f6e7465), 
   ACE_NTOHL (0x78743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:Dynamic/RequestContext:1.0
-  15,
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Dynamic/RequestContext:1.0
+    15,
   ACE_NTOHL (0x52657175), 
   ACE_NTOHL (0x65737443), 
   ACE_NTOHL (0x6f6e7465), 
   ACE_NTOHL (0x78740000),  // name = RequestContext
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
@@ -602,11 +713,11 @@ static const CORBA::Long _oc_Dynamic_RequestContext[] =
     ACE_NTOHL (0x72696e67), 
     ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-    10,
+        10,
     ACE_NTOHL (0x53747269), 
     ACE_NTOHL (0x6e675365), 
     ACE_NTOHL (0x71000000),  // name = StringSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_string, 
@@ -626,12 +737,15 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_RequestContext (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Dynamic)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_RequestContext, &_tc_TAO_tc_Dynamic_RequestContext)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_RequestContext,
+    &_tc_TAO_tc_Dynamic_RequestContext
+  )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:58
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -639,16 +753,12 @@ void operator<<= (
     const Dynamic::Parameter &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Dynamic::_tc_Parameter,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<Dynamic::Parameter>::insert_copy (
+      _tao_any,
+      Dynamic::Parameter::_tao_any_destructor,
+      Dynamic::_tc_Parameter,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -657,19 +767,12 @@ void operator<<= (
     Dynamic::Parameter *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Dynamic::_tc_Parameter,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Dynamic::Parameter::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<Dynamic::Parameter>::insert (
+      _tao_any,
+      Dynamic::Parameter::_tao_any_destructor,
+      Dynamic::_tc_Parameter,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -690,76 +793,24 @@ CORBA::Boolean operator>>= (
     const Dynamic::Parameter *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Dynamic::_tc_Parameter
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const Dynamic::Parameter*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Dynamic::Parameter *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            Dynamic::Parameter,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Dynamic::_tc_Parameter,
-                1,
-                ACE_static_cast (void *, tmp),
-                Dynamic::Parameter::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<Dynamic::Parameter>::extract (
+        _tao_any,
+        Dynamic::Parameter::_tao_any_destructor,
+        Dynamic::_tc_Parameter,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<Dynamic::Parameter>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<Dynamic::Parameter>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -767,16 +818,12 @@ void operator<<= (
     const Dynamic::ParameterList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Dynamic::_tc_ParameterList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert_copy (
+      _tao_any,
+      Dynamic::ParameterList::_tao_any_destructor,
+      Dynamic::_tc_ParameterList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -785,19 +832,12 @@ void operator<<= (
     Dynamic::ParameterList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Dynamic::_tc_ParameterList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Dynamic::ParameterList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert (
+      _tao_any,
+      Dynamic::ParameterList::_tao_any_destructor,
+      Dynamic::_tc_ParameterList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -806,8 +846,8 @@ CORBA::Boolean operator>>= (
     Dynamic::ParameterList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const Dynamic::ParameterList*&,
+  return _tao_any >>= ACE_const_cast (
+      const Dynamic::ParameterList *&,
       _tao_elem
     );
 }
@@ -818,76 +858,17 @@ CORBA::Boolean operator>>= (
     const Dynamic::ParameterList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Dynamic::_tc_ParameterList
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const Dynamic::ParameterList*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Dynamic::ParameterList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            Dynamic::ParameterList,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Dynamic::_tc_ParameterList,
-                1,
-                ACE_static_cast (void *, tmp),
-                Dynamic::ParameterList::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::extract (
+        _tao_any,
+        Dynamic::ParameterList::_tao_any_destructor,
+        Dynamic::_tc_ParameterList,
+        _tao_elem
+      );
 }
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -895,16 +876,12 @@ void operator<<= (
     const Dynamic::ExceptionList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Dynamic::_tc_ExceptionList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert_copy (
+      _tao_any,
+      Dynamic::ExceptionList::_tao_any_destructor,
+      Dynamic::_tc_ExceptionList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -913,19 +890,12 @@ void operator<<= (
     Dynamic::ExceptionList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Dynamic::_tc_ExceptionList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Dynamic::ExceptionList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert (
+      _tao_any,
+      Dynamic::ExceptionList::_tao_any_destructor,
+      Dynamic::_tc_ExceptionList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -934,8 +904,8 @@ CORBA::Boolean operator>>= (
     Dynamic::ExceptionList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const Dynamic::ExceptionList*&,
+  return _tao_any >>= ACE_const_cast (
+      const Dynamic::ExceptionList *&,
       _tao_elem
     );
 }
@@ -946,89 +916,39 @@ CORBA::Boolean operator>>= (
     const Dynamic::ExceptionList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Dynamic::_tc_ExceptionList
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const Dynamic::ExceptionList*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Dynamic::ExceptionList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            Dynamic::ExceptionList,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Dynamic::_tc_ExceptionList,
-                1,
-                ACE_static_cast (void *, tmp),
-                Dynamic::ExceptionList::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::extract (
+        _tao_any,
+        Dynamic::ExceptionList::_tao_any_destructor,
+        Dynamic::_tc_ExceptionList,
+        _tao_elem
+      );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const Dynamic::ParameterList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -1037,45 +957,64 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const Dynamic::ExceptionList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -1084,26 +1023,37 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
index 3eb653d8af6..4e384bd664a 100644
--- a/TAO/tao/DynamicC.h
+++ b/TAO/tao/DynamicC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_DYNAMICC_H_
-#define _TAO_IDL_DYNAMICC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_DYNAMICC_H_
+#define _TAO_IDL_ORIG_DYNAMICC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -29,8 +32,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "StringSeqC.h"
 #include "tao/TAO_Export.h"
-#include "tao/Any.h"
+#include "tao/Any_T.h"
 #include "tao/Sequence.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -56,25 +60,29 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  Dynamic
 {
-  struct Parameter;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class Parameter_var;
   
   struct TAO_Export Parameter
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Parameter_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
     
+    static void _tao_any_destructor (void *);
     CORBA::Any argument;
     CORBA::ParameterMode mode;
-    
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export Parameter_var
   {
   public:
@@ -91,6 +99,7 @@ TAO_NAMESPACE  Dynamic
     operator const Parameter &() const;
     operator Parameter &();
     operator Parameter &() const;
+    
     // Variable-size types only.
     operator Parameter *&();
     
@@ -105,6 +114,9 @@ TAO_NAMESPACE  Dynamic
     Parameter *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export Parameter_out
   {
   public:
@@ -123,19 +135,23 @@ TAO_NAMESPACE  Dynamic
     void operator= (const Parameter_var &);
   };
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Parameter;
+  // 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_MACRO _TAO_Unbounded_Sequence_Dynamic_ParameterList
+  class TAO_Export _TAO_Unbounded_Sequence_Dynamic_ParameterList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_Dynamic_ParameterList (void);
     _TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_Dynamic_ParameterList (
@@ -172,55 +188,61 @@ TAO_NAMESPACE  Dynamic
         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;
   
   // *************************************************************
-  // ParameterList
+  // 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); // default ctor
-    ParameterList (CORBA::ULong max); // uses max size
+    ParameterList (void);
+    ParameterList (CORBA::ULong max);
     ParameterList (
         CORBA::ULong max, 
         CORBA::ULong length, 
         Parameter *buffer, 
         CORBA::Boolean release = 0
       );
-    ParameterList (const ParameterList &); // copy ctor
+    ParameterList (const ParameterList &);
     ~ParameterList (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ParameterList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #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
   // *************************************************************
@@ -241,7 +263,9 @@ TAO_NAMESPACE  Dynamic
     operator const ParameterList &() const;
     operator ParameterList &();
     operator ParameterList &() const;
-    operator ParameterList *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator ParameterList *&();
     
     Parameter & operator[] (CORBA::ULong index);
     const Parameter & operator[] (CORBA::ULong index) const;
@@ -256,14 +280,15 @@ TAO_NAMESPACE  Dynamic
   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:
@@ -282,34 +307,51 @@ TAO_NAMESPACE  Dynamic
     // Assignment from T_var not allowed.
     void operator= (const ParameterList_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // 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_ParameterList;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
+  
   typedef CORBA::StringSeq ContextList;
   typedef CORBA::StringSeq_var ContextList_var;
   typedef CORBA::StringSeq_out ContextList_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_ContextList;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::TypeCode TypeCode;
   typedef CORBA::TypeCode_ptr TypeCode_ptr;
   typedef CORBA::TypeCode_var TypeCode_var;
   typedef CORBA::TypeCode_out TypeCode_out;
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeCode;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  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_MACRO _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
+  class TAO_Export _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void);
     _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (
@@ -342,58 +384,62 @@ TAO_NAMESPACE  Dynamic
         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;
   
   // *************************************************************
-  // ExceptionList
+  // 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); // default ctor
-    ExceptionList (CORBA::ULong max); // uses max size
+    ExceptionList (void);
+    ExceptionList (CORBA::ULong max);
     ExceptionList (
         CORBA::ULong max, 
         CORBA::ULong length, 
         CORBA::TypeCode_ptr *buffer, 
         CORBA::Boolean release = 0
       );
-    ExceptionList (const ExceptionList &); // copy ctor
+    ExceptionList (const ExceptionList &);
     ~ExceptionList (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ExceptionList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #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
   // *************************************************************
@@ -414,7 +460,9 @@ TAO_NAMESPACE  Dynamic
     operator const ExceptionList &() const;
     operator ExceptionList &();
     operator ExceptionList &() const;
-    operator ExceptionList *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator ExceptionList *&();
     
     TAO_Pseudo_Object_Manager<TypeCode,TypeCode_var> operator[] (CORBA::ULong index);
     
@@ -428,14 +476,15 @@ TAO_NAMESPACE  Dynamic
   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:
@@ -454,39 +503,70 @@ TAO_NAMESPACE  Dynamic
     // Assignment from T_var not allowed.
     void operator= (const ExceptionList_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // 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_ExceptionList;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
+  
   typedef CORBA::StringSeq RequestContext;
   typedef CORBA::StringSeq_var RequestContext_var;
   typedef CORBA::StringSeq_out RequestContext_out;
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestContext;
   
+  // 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_RequestContext;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module Dynamic
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const Dynamic::Parameter &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, Dynamic::Parameter*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::Parameter *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::Parameter *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const Dynamic::ParameterList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, Dynamic::ParameterList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ParameterList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ParameterList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const Dynamic::ExceptionList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, Dynamic::ExceptionList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ExceptionList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ExceptionList *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_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
+
 #if !defined _TAO_CDR_OP_Dynamic_ParameterList_H_
 #define _TAO_CDR_OP_Dynamic_ParameterList_H_
 
@@ -501,6 +581,8 @@ 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
 
 #if !defined _TAO_CDR_OP_Dynamic_ExceptionList_H_
 #define _TAO_CDR_OP_Dynamic_ExceptionList_H_
@@ -516,9 +598,13 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "DynamicC.i"
@@ -534,3 +620,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/DynamicC.i b/TAO/tao/DynamicC.i
index 97f72630d14..323bbc4e31d 100644
--- a/TAO/tao/DynamicC.i
+++ b/TAO/tao/DynamicC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class Dynamic::Parameter_var
 // *************************************************************
 
 ACE_INLINE
-Dynamic::Parameter_var::Parameter_var (void) // default constructor
+Dynamic::Parameter_var::Parameter_var (void)
   : ptr_ (0)
 {}
 
@@ -34,42 +38,52 @@ Dynamic::Parameter_var::Parameter_var (Parameter *p)
 {}
 
 ACE_INLINE
-Dynamic::Parameter_var::Parameter_var (const ::Dynamic::Parameter_var &p) // copy constructor
+Dynamic::Parameter_var::Parameter_var (const ::Dynamic::Parameter_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::Dynamic::Parameter (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::Dynamic::Parameter (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-Dynamic::Parameter_var::~Parameter_var (void) // destructor
+Dynamic::Parameter_var::~Parameter_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE Dynamic::Parameter_var &
-Dynamic::Parameter_var::operator= (Parameter *p)
+ACE_INLINE
+Dynamic::Parameter_var &
+Dynamic::Parameter_var::operator= (Parameter *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::Dynamic::Parameter_var &
-Dynamic::Parameter_var::operator= (const ::Dynamic::Parameter_var &p)
+ACE_INLINE
+::Dynamic::Parameter_var &
+Dynamic::Parameter_var::operator= (const ::Dynamic::Parameter_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
         {
-          Parameter *deep_copy =
-            new Parameter (*p.ptr_);
+          Parameter *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              Parameter (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -114,7 +128,7 @@ Dynamic::Parameter_var::operator ::Dynamic::Parameter &() const // cast
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 Dynamic::Parameter_var::operator ::Dynamic::Parameter *&() // cast 
 {
@@ -133,7 +147,7 @@ Dynamic::Parameter_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::Dynamic::Parameter *&
 Dynamic::Parameter_var::out (void)
 {
@@ -156,6 +170,9 @@ 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
 // *************************************************************
@@ -168,7 +185,7 @@ Dynamic::Parameter_out::Parameter_out (::Dynamic::Parameter *&p)
 }
 
 ACE_INLINE
-Dynamic::Parameter_out::Parameter_out (Parameter_var &p) // constructor from _var
+Dynamic::Parameter_out::Parameter_out (Parameter_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -176,21 +193,23 @@ Dynamic::Parameter_out::Parameter_out (Parameter_var &p) // constructor from _va
 }
 
 ACE_INLINE
-Dynamic::Parameter_out::Parameter_out (const ::Dynamic::Parameter_out &p) // copy constructor
+Dynamic::Parameter_out::Parameter_out (const ::Dynamic::Parameter_out &p)
   : ptr_ (ACE_const_cast (Parameter_out&, p).ptr_)
 {}
 
-ACE_INLINE Dynamic::Parameter_out &
+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 *p)
+ACE_INLINE
+Dynamic::Parameter_out &
+Dynamic::Parameter_out::operator= (Parameter *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -212,192 +231,231 @@ 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_
 
-// = Static operations.
-ACE_INLINE Dynamic::Parameter *
+ACE_INLINE
+Dynamic::Parameter *
 Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   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)
-// Free the sequence.
+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) // Default constructor.
+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) // Constructor using a maximum length value.
+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)
+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)
-// Copy constructor.
+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;
-  }
+    {
+      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;
-  }
+    {
+      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)
-// Assignment operator.
+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;
+    {
+      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_);
+      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_);
+    {
+      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_);
+  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];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE Dynamic::Parameter &
+ACE_INLINE
+Dynamic::Parameter &
 Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  Dynamic::Parameter* tmp = ACE_reinterpret_cast(Dynamic::Parameter*,this->buffer_);
+  Dynamic::Parameter* tmp =
+    ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const Dynamic::Parameter &
+ACE_INLINE
+const Dynamic::Parameter &
 Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  Dynamic::Parameter * const tmp = ACE_reinterpret_cast (Dynamic::Parameter* ACE_CAST_CONST, this->buffer_);
+  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 *
+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_);
+      // 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;
+      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 *
+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_);
+  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)
+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);
-  }
+    {
+      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) // default constructor
+Dynamic::ParameterList_var::ParameterList_var (void)
   : ptr_ (0)
 {}
 
@@ -407,21 +465,26 @@ Dynamic::ParameterList_var::ParameterList_var (ParameterList *p)
 {}
 
 ACE_INLINE
-Dynamic::ParameterList_var::ParameterList_var (const ::Dynamic::ParameterList_var &p) // copy constructor
+Dynamic::ParameterList_var::ParameterList_var (const ::Dynamic::ParameterList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::Dynamic::ParameterList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::Dynamic::ParameterList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-Dynamic::ParameterList_var::~ParameterList_var (void) // destructor
+Dynamic::ParameterList_var::~ParameterList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE Dynamic::ParameterList_var &
+ACE_INLINE
+Dynamic::ParameterList_var &
 Dynamic::ParameterList_var::operator= (ParameterList *p)
 {
   delete this->ptr_;
@@ -429,7 +492,8 @@ Dynamic::ParameterList_var::operator= (ParameterList *p)
   return *this;
 }
 
-ACE_INLINE ::Dynamic::ParameterList_var &
+ACE_INLINE
+::Dynamic::ParameterList_var &
 Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p)
 {
   if (this != &p)
@@ -441,8 +505,12 @@ Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p)
         }
       else
         {
-          ParameterList *deep_copy =
-            new ParameterList (*p.ptr_);
+          ParameterList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ParameterList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -457,69 +525,75 @@ Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p)
   return *this;
 }
 
-ACE_INLINE const ::Dynamic::ParameterList *
+ACE_INLINE
+const ::Dynamic::ParameterList *
 Dynamic::ParameterList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ParameterList *
+ACE_INLINE
+::Dynamic::ParameterList *
 Dynamic::ParameterList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ParameterList_var::operator const ::Dynamic::ParameterList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ParameterList_var::operator ::Dynamic::ParameterList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ParameterList_var::operator ::Dynamic::ParameterList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 Dynamic::ParameterList_var::operator ::Dynamic::ParameterList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE Dynamic::Parameter &
+ACE_INLINE
+Dynamic::Parameter &
 Dynamic::ParameterList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const Dynamic::Parameter &
+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 &
+ACE_INLINE
+const ::Dynamic::ParameterList &
 Dynamic::ParameterList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ParameterList &
+ACE_INLINE
+::Dynamic::ParameterList &
 Dynamic::ParameterList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::Dynamic::ParameterList *&
+ACE_INLINE
+::Dynamic::ParameterList *&
 Dynamic::ParameterList_var::out (void)
 {
   delete this->ptr_;
@@ -527,7 +601,8 @@ Dynamic::ParameterList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ParameterList *
+ACE_INLINE
+::Dynamic::ParameterList *
 Dynamic::ParameterList_var::_retn (void)
 {
   ::Dynamic::ParameterList *tmp = this->ptr_;
@@ -535,12 +610,16 @@ Dynamic::ParameterList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::Dynamic::ParameterList *
+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
 // *************************************************************
@@ -553,7 +632,7 @@ Dynamic::ParameterList_out::ParameterList_out (ParameterList *&p)
 }
 
 ACE_INLINE
-Dynamic::ParameterList_out::ParameterList_out (ParameterList_var &p) // constructor from _var
+Dynamic::ParameterList_out::ParameterList_out (ParameterList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -561,58 +640,65 @@ Dynamic::ParameterList_out::ParameterList_out (ParameterList_var &p) // construc
 }
 
 ACE_INLINE
-Dynamic::ParameterList_out::ParameterList_out (const ::Dynamic::ParameterList_out &p) // copy constructor
+Dynamic::ParameterList_out::ParameterList_out (const ::Dynamic::ParameterList_out &p)
   : ptr_ (ACE_const_cast (ParameterList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::Dynamic::ParameterList_out &
+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 &
+ACE_INLINE
+::Dynamic::ParameterList_out &
 Dynamic::ParameterList_out::operator= (ParameterList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ParameterList_out::operator ::Dynamic::ParameterList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ParameterList *&
+ACE_INLINE
+::Dynamic::ParameterList *&
 Dynamic::ParameterList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ParameterList *
+ACE_INLINE
+::Dynamic::ParameterList *
 Dynamic::ParameterList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE Dynamic::Parameter &
+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 **
+ACE_INLINE
+CORBA::TypeCode **
 Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (CORBA::ULong nelems)
 {
   CORBA::TypeCode **buf = 0;
@@ -627,11 +713,15 @@ Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (CORBA::
   return buf;
 }
 
-ACE_INLINE void 
+ACE_INLINE
+void 
 Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (CORBA::TypeCode **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -647,64 +737,83 @@ Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Ob
 }
 
 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)
+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)
+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;
-  }
+    {
+      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;
-  }
+    {
+      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)
+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;
+    {
+      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 ();
+      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_);
+        }
     }
-    if (this->maximum_ < rhs.maximum_)
+  else
     {
-      _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
+      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_);
+  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)
     {
@@ -714,70 +823,78 @@ Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator= (const
   return *this;
 }
 
-ACE_INLINE TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
 Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  CORBA::TypeCode ** const tmp = ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
+  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* *
+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_);
+      // 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;
+      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* *
+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_);
+  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) // default constructor
+Dynamic::ExceptionList_var::ExceptionList_var (void)
   : ptr_ (0)
 {}
 
@@ -787,21 +904,26 @@ Dynamic::ExceptionList_var::ExceptionList_var (ExceptionList *p)
 {}
 
 ACE_INLINE
-Dynamic::ExceptionList_var::ExceptionList_var (const ::Dynamic::ExceptionList_var &p) // copy constructor
+Dynamic::ExceptionList_var::ExceptionList_var (const ::Dynamic::ExceptionList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::Dynamic::ExceptionList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::Dynamic::ExceptionList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-Dynamic::ExceptionList_var::~ExceptionList_var (void) // destructor
+Dynamic::ExceptionList_var::~ExceptionList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE Dynamic::ExceptionList_var &
+ACE_INLINE
+Dynamic::ExceptionList_var &
 Dynamic::ExceptionList_var::operator= (ExceptionList *p)
 {
   delete this->ptr_;
@@ -809,7 +931,8 @@ Dynamic::ExceptionList_var::operator= (ExceptionList *p)
   return *this;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList_var &
+ACE_INLINE
+::Dynamic::ExceptionList_var &
 Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p)
 {
   if (this != &p)
@@ -821,8 +944,12 @@ Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p)
         }
       else
         {
-          ExceptionList *deep_copy =
-            new ExceptionList (*p.ptr_);
+          ExceptionList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExceptionList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -837,63 +964,68 @@ Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p)
   return *this;
 }
 
-ACE_INLINE const ::Dynamic::ExceptionList *
+ACE_INLINE
+const ::Dynamic::ExceptionList *
 Dynamic::ExceptionList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList *
+ACE_INLINE
+::Dynamic::ExceptionList *
 Dynamic::ExceptionList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ExceptionList_var::operator const ::Dynamic::ExceptionList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// 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>
+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 &
+ACE_INLINE
+const ::Dynamic::ExceptionList &
 Dynamic::ExceptionList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList &
+ACE_INLINE
+::Dynamic::ExceptionList &
 Dynamic::ExceptionList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::Dynamic::ExceptionList *&
+ACE_INLINE
+::Dynamic::ExceptionList *&
 Dynamic::ExceptionList_var::out (void)
 {
   delete this->ptr_;
@@ -901,7 +1033,8 @@ Dynamic::ExceptionList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList *
+ACE_INLINE
+::Dynamic::ExceptionList *
 Dynamic::ExceptionList_var::_retn (void)
 {
   ::Dynamic::ExceptionList *tmp = this->ptr_;
@@ -909,12 +1042,16 @@ Dynamic::ExceptionList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList *
+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
 // *************************************************************
@@ -927,7 +1064,7 @@ Dynamic::ExceptionList_out::ExceptionList_out (ExceptionList *&p)
 }
 
 ACE_INLINE
-Dynamic::ExceptionList_out::ExceptionList_out (ExceptionList_var &p) // constructor from _var
+Dynamic::ExceptionList_out::ExceptionList_out (ExceptionList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -935,75 +1072,98 @@ Dynamic::ExceptionList_out::ExceptionList_out (ExceptionList_var &p) // construc
 }
 
 ACE_INLINE
-Dynamic::ExceptionList_out::ExceptionList_out (const ::Dynamic::ExceptionList_out &p) // copy constructor
+Dynamic::ExceptionList_out::ExceptionList_out (const ::Dynamic::ExceptionList_out &p)
   : ptr_ (ACE_const_cast (ExceptionList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::Dynamic::ExceptionList_out &
+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 &
+ACE_INLINE
+::Dynamic::ExceptionList_out &
 Dynamic::ExceptionList_out::operator= (ExceptionList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Dynamic::ExceptionList_out::operator ::Dynamic::ExceptionList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList *&
+ACE_INLINE
+::Dynamic::ExceptionList *&
 Dynamic::ExceptionList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Dynamic::ExceptionList *
+ACE_INLINE
+::Dynamic::ExceptionList *
 Dynamic::ExceptionList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
+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 */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Dynamic::Parameter &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const Dynamic::Parameter &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.argument) &&
     (strm << _tao_aggregate.mode)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Dynamic::Parameter &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    Dynamic::Parameter &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.argument) &&
     (strm >> _tao_aggregate.mode)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_Dynamic_ParameterList_I_
 #define _TAO_CDR_OP_Dynamic_ParameterList_I_
@@ -1012,6 +1172,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const Dynamic::ParameterList &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     Dynamic::ParameterList &
@@ -1019,6 +1180,8 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_Dynamic_ParameterList_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_Dynamic_ExceptionList_I_
 #define _TAO_CDR_OP_Dynamic_ExceptionList_I_
@@ -1027,6 +1190,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const Dynamic::ExceptionList &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     Dynamic::ExceptionList &
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index 0aefb2b1dc4..d4597c1cf9f 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -5,7 +5,6 @@ ACE_RCSID (DynamicInterface,
            Context,
            "$Id$")
 
-
 #include "tao/Typecode.h"
 #include "tao/NVList.h"
 
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index b9bdceafaf3..29ab3664b70 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 //=============================================================================
 /**
@@ -84,11 +85,9 @@ namespace CORBA
                      CORBA::NVList_ptr &values
                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     // Useful for template programming.
     typedef CORBA::Context_ptr _ptr_type;
     typedef CORBA::Context_var _var_type;
-#endif /* __GNUC__ */
 
   private:
     /// Reference counting.
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index 1ba1d9703cd..f3d919660ce 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "DII_Invocation.h"
 #include "Unknown_User_Exception.h"
 #include "tao/Stub.h"
@@ -14,7 +16,6 @@ ACE_RCSID (DynamicInterface,
            DII_Invocation,
            "$Id$")
 
-
 int
 TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions
                                  ACE_ENV_ARG_DECL)
@@ -63,12 +64,15 @@ TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions
               continue;
             }
 
-          const ACE_Message_Block* cdr = this->inp_stream ().start ();
-
-          CORBA::Any any (tcp,
-                          0,
-                          this->inp_stream ().byte_order (),
-                          cdr);
+          CORBA::Any any;
+          TAO::Unknown_IDL_Type *unk = 0;
+          ACE_NEW_RETURN (unk,
+                          TAO::Unknown_IDL_Type (
+                              tcp,
+                              this->inp_stream ().start (),
+                              this->inp_stream ().byte_order ()
+                            ),
+                          TAO_INVOKE_EXCEPTION);
 
           ACE_THROW_RETURN (CORBA::UnknownUserException (any),
                             TAO_INVOKE_EXCEPTION);
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index 8525f8fb764..04a9bbdd9ce 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -1,11 +1,11 @@
-#include "Dynamic_Implementation.h"
+// $Id$
 
+#include "Dynamic_Implementation.h"
 
 ACE_RCSID (DynamicInterface,
            Dynamic_Implementation,
            "$Id$")
 
-
 #include "Server_Request.h"
 #include "tao/ORB_Core.h"
 #include "tao/IFR_Client_Adapter.h"
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index 8ff6ccfbf28..1e73a8b5c9f 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -29,6 +29,13 @@
 
 #include "dynamicinterface_export.h"
 
+TAO_NAMESPACE CORBA
+{
+  typedef char *RepositoryId;
+  typedef String_var RepositoryId_var;
+};
+TAO_NAMESPACE_CLOSE
+
 class TAO_DynamicInterface_Export TAO_DynamicImplementation
   : public virtual TAO_ServantBase
 {
diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile
index b9e1cf77de4..d52ecebf682 100644
--- a/TAO/tao/DynamicInterface/Makefile
+++ b/TAO/tao/DynamicInterface/Makefile
@@ -104,7 +104,8 @@ endif
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -113,7 +114,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -130,9 +132,8 @@ endif
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h Context.inl \
   $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -145,6 +146,18 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -169,14 +182,27 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/NVList.h \
@@ -203,6 +229,8 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/NVList.i
@@ -242,6 +270,8 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
@@ -268,7 +298,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -297,7 +328,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -316,8 +348,6 @@ endif
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -328,15 +358,52 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Condition.h \
   $(TAO_ROOT)/tao/Condition.inl \
@@ -354,16 +421,8 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
-  $(TAO_ROOT)/tao/Invocation.i \
-  $(TAO_ROOT)/tao/Asynch_Invocation.h \
-  $(TAO_ROOT)/tao/Asynch_Invocation.i \
-  Unknown_User_Exception.h dynamicinterface_export.h \
-  DII_Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
   $(TAO_ROOT)/tao/Transport.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(TAO_ROOT)/tao/Cache_Entries.h \
@@ -372,33 +431,6 @@ endif
   $(ACE_ROOT)/ace/Recyclable.h \
   $(ACE_ROOT)/ace/Recyclable.inl \
   $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
@@ -409,25 +441,40 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl \
-  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.i \
-  Request.h Dynamic_Adapter_Impl.h \
-  $(TAO_ROOT)/tao/Dynamic_Adapter.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i Context.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/Asynch_Invocation.h \
+  $(TAO_ROOT)/tao/Asynch_Invocation.i \
+  Unknown_User_Exception.h dynamicinterface_export.h \
+  DII_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
+  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.i \
+  Request.h Dynamic_Adapter_Impl.h \
+  $(TAO_ROOT)/tao/Dynamic_Adapter.h Context.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.i \
   $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
   $(ACE_ROOT)/ace/Atomic_Op.i Context.inl ExceptionList.h \
   ExceptionList.inl $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -438,8 +485,8 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/NVList.h \
-  $(TAO_ROOT)/tao/NVList.i Request.inl DII_Invocation.inl \
-  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/NVList.i Request.inl \
+  DII_Invocation.inl $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -448,7 +495,6 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -468,12 +514,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -531,14 +575,16 @@ endif
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i dynamicinterface_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h dynamicinterface_export.h \
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/Transport.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -551,7 +597,6 @@ endif
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -585,7 +630,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -614,7 +660,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -676,6 +723,8 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -684,11 +733,19 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
@@ -696,6 +753,16 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Condition.h \
@@ -704,22 +771,21 @@ endif
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.i \
   Request.h Dynamic_Adapter_Impl.h \
-  $(TAO_ROOT)/tao/Dynamic_Adapter.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i Context.h \
+  $(TAO_ROOT)/tao/Dynamic_Adapter.h Context.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.i \
   $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
   $(ACE_ROOT)/ace/Atomic_Op.i Context.inl ExceptionList.h \
   ExceptionList.inl $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -731,7 +797,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i Request.inl \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
@@ -757,12 +822,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -865,12 +928,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -883,13 +943,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -899,6 +959,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -917,34 +995,58 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -972,28 +1074,9 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   dynamicinterface_export.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Context.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.h \
@@ -1004,10 +1087,12 @@ endif
   ExceptionList.h \
   ExceptionList.inl \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/NVList.h \
@@ -1061,7 +1146,8 @@ endif
   $(ACE_ROOT)/ace/Exception_Macros.h \
   dynamicinterface_export.h $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -1092,7 +1178,8 @@ endif
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1145,7 +1232,8 @@ endif
   ExceptionList.inl $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1158,22 +1246,37 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -1183,21 +1286,23 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/NVList.i Request.inl Server_Request.h \
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/GIOPC.i \
   $(TAO_ROOT)/tao/Tagged_Profile.i \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1206,10 +1311,10 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1219,8 +1324,8 @@ endif
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/TAO_Server_Request.i Server_Request.inl \
-  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+  Server_Request.inl $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Condition.h \
@@ -1237,12 +1342,35 @@ endif
   $(TAO_ROOT)/tao/target_specification.h \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -1272,14 +1400,6 @@ endif
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -1360,12 +1480,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -1378,13 +1495,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1394,6 +1511,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1412,28 +1547,48 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
@@ -1447,42 +1602,25 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Context.h Context.inl \
+  $(ACE_ROOT)/ace/Service_Object.i Context.h Context.inl \
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/GIOPC.i \
   $(TAO_ROOT)/tao/Tagged_Profile.i \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1491,10 +1629,10 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1504,21 +1642,24 @@ endif
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/TAO_Server_Request.i Server_Request.inl \
-  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+  Server_Request.inl $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -1546,14 +1687,6 @@ endif
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -1648,7 +1781,8 @@ endif
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -1657,7 +1791,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1674,9 +1809,8 @@ endif
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h ExceptionList.inl \
   $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -1689,6 +1823,18 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -1713,14 +1859,27 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
@@ -1733,12 +1892,14 @@ endif
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i Dynamic_Adapter_Impl.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h Dynamic_Adapter_Impl.h \
   $(TAO_ROOT)/tao/Dynamic_Adapter.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -1751,7 +1912,6 @@ endif
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -1770,7 +1930,8 @@ endif
   $(ACE_ROOT)/ace/Exception_Macros.h \
   dynamicinterface_export.h $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -1801,7 +1962,8 @@ endif
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1854,7 +2016,8 @@ endif
   ExceptionList.inl $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1867,22 +2030,37 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -1892,14 +2070,20 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/NVList.i Request.inl DII_Invocation.h \
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Condition.h \
   $(TAO_ROOT)/tao/Condition.inl \
@@ -1917,15 +2101,8 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
-  $(TAO_ROOT)/tao/Invocation.i \
-  $(TAO_ROOT)/tao/Asynch_Invocation.h \
-  $(TAO_ROOT)/tao/Asynch_Invocation.i \
-  Unknown_User_Exception.h DII_Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
   $(TAO_ROOT)/tao/Transport.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(TAO_ROOT)/tao/Cache_Entries.h \
@@ -1934,14 +2111,6 @@ endif
   $(ACE_ROOT)/ace/Recyclable.h \
   $(ACE_ROOT)/ace/Recyclable.inl \
   $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
@@ -1952,18 +2121,26 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/Asynch_Invocation.h \
+  $(TAO_ROOT)/tao/Asynch_Invocation.i \
+  Unknown_User_Exception.h DII_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.i \
   DII_Invocation.inl DII_ClientRequestInfo.h \
   $(TAO_ROOT)/tao/ClientRequestInfo_i.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1988,7 +2165,6 @@ endif
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -2087,7 +2263,8 @@ endif
   $(ACE_ROOT)/ace/Exception_Macros.h \
   dynamicinterface_export.h $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -2118,7 +2295,8 @@ endif
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2187,6 +2365,16 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -2195,15 +2383,21 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/GIOPC.i \
   $(TAO_ROOT)/tao/Tagged_Profile.i \
   $(TAO_ROOT)/tao/OctetSeqC.h \
@@ -2218,10 +2412,10 @@ endif
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -2236,13 +2430,11 @@ endif
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/TAO_Server_Request.i Server_Request.inl \
-  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+  Server_Request.inl $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/GIOP_Utils.h \
-  $(TAO_ROOT)/tao/GIOP_Utils.i \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i
+  $(TAO_ROOT)/tao/GIOP_Utils.i
 
 .obj/Unknown_User_Exception.o .obj/Unknown_User_Exception.so .shobj/Unknown_User_Exception.o .shobj/Unknown_User_Exception.so: Unknown_User_Exception.cpp \
   Unknown_User_Exception.h $(ACE_ROOT)/ace/pre.h \
@@ -2305,7 +2497,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2334,7 +2527,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2360,15 +2554,44 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 0b3adee0ffd..b4c488f0231 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -1,11 +1,11 @@
-#include "Request.h"
+// $Id$
 
+#include "Request.h"
 
 ACE_RCSID (DynamicInterface,
            Request,
            "$Id$")
 
-
 #include "ExceptionList.h"
 #include "DII_Invocation.h"
 #include "tao/Object.h"
@@ -248,8 +248,9 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
 
   if (this->result_ != 0)
     {
-      this->result_->value ()->_tao_decode (call.inp_stream ()
-                                            ACE_ENV_ARG_PARAMETER);
+      // We can be sure that the impl is a TAO::Unknown_IDL_Type.
+      this->result_->value ()->impl ()->_tao_decode (call.inp_stream ()
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -430,8 +431,9 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming,
     case TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION:
       if (this->result_ != 0)
         {
-          this->result_->value ()->_tao_decode (incoming
-                                                ACE_ENV_ARG_PARAMETER);
+          // We can be sure that the impl is a TAO::Unknown_IDL_Type.
+          this->result_->value ()->impl ()->_tao_decode (incoming
+                                                         ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index f678bfb8a9d..730890705f3 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -108,7 +108,8 @@ CORBA::Request::add_out_arg (const CORBA::Char *name)
 ACE_INLINE void
 CORBA::Request::set_return_type (CORBA::TypeCode_ptr tc)
 {
-  CORBA::Any newtype (tc);
+  CORBA::Any newtype (tc,
+                      0);
   this->result_->any_ = newtype;
 }
 
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 2be1c6c1c96..8981cb2a7a4 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 // Implementation of the Dynamic Server Skeleton Interface.
 
 #include "Server_Request.h"
@@ -172,12 +174,9 @@ CORBA::ServerRequest::dsi_marshal (ACE_ENV_SINGLE_ARG_DECL)
       // Send the return value, if any.
       if (this->retval_ != 0)
         {
-          this->retval_->_tao_encode (
-                             this->orb_server_request_.outgoing (),
-                             this->orb_server_request_.orb_core ()
-                             ACE_ENV_ARG_PARAMETER
-                           );
-          ACE_CHECK;
+          this->retval_->impl ()->marshal_value (
+                                      this->orb_server_request_.outgoing ()
+                                    );
         }
 
       // Send the "inout" and "out" parameters.
@@ -200,12 +199,9 @@ CORBA::ServerRequest::dsi_marshal (ACE_ENV_SINGLE_ARG_DECL)
       // Write the reply header to the ORB request's outgoing CDR stream.
       this->orb_server_request_.init_reply ();
 
-      this->exception_->_tao_encode (
-                            this->orb_server_request_.outgoing (),
-                            this->orb_server_request_.orb_core ()
-                            ACE_ENV_ARG_PARAMETER
-                          );
-      ACE_CHECK;
+      this->exception_->impl ()->marshal_value (
+                                     this->orb_server_request_.outgoing ()
+                                   );
     }
 
   this->orb_server_request_.tao_send_reply ();
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index f55b610beb5..f1f74e12972 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -1,7 +1,8 @@
+// $Id$
+
 #include "Unknown_User_Exception.h"
 #include "tao/Any.h"
 
-
 ACE_RCSID (DynamicInterface,
            Unknown_User_Exception,
            "$Id$")
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index 76436a3d341..13a831541b1 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -99,6 +99,7 @@ namespace CORBA
   };
 } // End CORBA namespace.
 
+
 #include "ace/post.h"
 
 #endif /* TAO_UNKNOWN_USER_EXCEPTION_H */
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 8f87164baa7..c987f7db0d4 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -1147,6 +1147,7 @@ CORBA::name ::_is_a (const char* interface_id) const \
                "IDL:omg.org/CORBA/" #name ":1.0") == 0) \
           || this->SystemException::_is_a (interface_id)); \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -1158,6 +1159,7 @@ CORBA::name ::_downcast (CORBA::Exception* exception) \
     return ACE_dynamic_cast (CORBA::name *, exception); \
   return 0; \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -1167,6 +1169,7 @@ CORBA::name ::_raise (void) \
 { \
   TAO_RAISE (*this); \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -1187,6 +1190,7 @@ CORBA::name ::name (CORBA::ULong code, CORBA::CompletionStatus completed) \
                             completed) \
 { \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -1196,6 +1200,7 @@ CORBA::name ::_type (void) const \
 { \
   return CORBA::_tc_ ## name; \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -1206,6 +1211,7 @@ CORBA::name ::_tao_any_destructor (void *x) \
   CORBA::name *tmp = ACE_static_cast (CORBA::name *, x); \
   delete tmp; \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -1217,181 +1223,114 @@ CORBA::name ::_tao_duplicate (void) const \
   ACE_NEW_RETURN (result, CORBA::name (*this), 0); \
   return result; \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
-static void
-tao_insert_for_insertion_system_exception (CORBA::Any &any,
-                                           const CORBA::SystemException &ex,
-                                           const char *msg)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO_OutputCDR stream;
-      ex._tao_encode (stream ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      any._tao_replace (ex._type (),
-                        TAO_ENCAP_BYTE_ORDER,
-                        stream.begin ());
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          msg);
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
 #define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::operator<<= (CORBA::Any &any, const CORBA::name &ex) \
+CORBA::Boolean \
+TAO::Any_Dual_Impl_T<CORBA::name >::marshal_value (TAO_OutputCDR &cdr) \
 { \
-  tao_insert_for_insertion_system_exception (any, ex, \
-            "\tCORBA::Any insertion (non-copy) of CORBA::" #name "\n" \
-                               ); \
+  ACE_TRY_NEW_ENV \
+    { \
+      this->value_->_tao_encode (cdr \
+                                 ACE_ENV_ARG_PARAMETER); \
+      ACE_TRY_CHECK; \
+      return 1; \
+    } \
+  ACE_CATCHANY \
+    { \
+    } \
+  ACE_ENDTRY; \
+  return 0; \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
-static void
-tao_insert_system_exception (CORBA::Any &any,
-                             CORBA::SystemException *ex,
-                             CORBA::Any::_tao_destructor destructor,
-                             const char *msg)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO_OutputCDR stream;
-      ex->_tao_encode (stream ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      any._tao_replace (ex->_type (),
-                        TAO_ENCAP_BYTE_ORDER,
-                        stream.begin (),
-                        1,
-                        ex,
-                        destructor);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          msg
-        );
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
 #define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::operator<<= (CORBA::Any &any, CORBA::name *ex) \
+CORBA::Boolean \
+TAO::Any_Dual_Impl_T<CORBA::name >::demarshal_value (TAO_InputCDR &cdr) \
 { \
-  tao_insert_system_exception (any, ex, \
-          CORBA::name ::_tao_any_destructor, \
-          "\tCORBA::Any insertion (non-copy) of CORBA::" #name "\n" \
-                               ); \
+  ACE_TRY_NEW_ENV \
+    { \
+      this->value_->_tao_decode (cdr \
+                                 ACE_ENV_ARG_PARAMETER); \
+      ACE_TRY_CHECK; \
+      return 1; \
+    } \
+  ACE_CATCHANY \
+    { \
+    } \
+  ACE_ENDTRY; \
+  return 0; \
 }
 
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
 #define TAO_SYSTEM_EXCEPTION(name) \
-static CORBA::SystemException* _tao_allocator_CORBA_ ## name (void) \
+void operator<<= (CORBA::Any &any, const CORBA::name &ex) \
 { \
-  return new CORBA::name; \
+  TAO::Any_Dual_Impl_T<CORBA::name >::insert_copy ( \
+      any, \
+      CORBA::name ::_tao_any_destructor, \
+      CORBA::_tc_ ## name, \
+      ex \
+    ); \
 }
+
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
-static CORBA::Boolean
-tao_insert_in_extractor_system_exception (
-  const CORBA::Any &any,
-  CORBA::SystemException *&tmp,
-  CORBA::SystemException * (*allocator)(void),
-  CORBA::TypeCode_ptr tc_name,
-  CORBA::Any::_tao_destructor destructor,
-  const char *compare_IR_Id,
-  const char *msg)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::TypeCode_var type = any.type ();
-      CORBA::Boolean equiv =
-        type->equivalent (tc_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (!equiv)
-        return 0;
-      if (any.any_owns_data ())
-        {
-          tmp = (CORBA::SystemException *)any.value ();
-          return 1;
-        }
-      else
-        {
-          TAO_InputCDR stream (
-              any._tao_get_cdr (),
-              any._tao_byte_order ()
-            );
-          CORBA::String_var interface_repository_id;
-          if (!(stream >> interface_repository_id.out ()))
-            return 0;
-          if (ACE_OS_String::strcmp (interface_repository_id.in (),
-                                     compare_IR_Id))
-            return 0;
-          CORBA::SystemException *tmp = allocator ();
-          tmp->_tao_decode (stream ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ((CORBA::Any *)&any)->_tao_replace (
-              tc_name,
-              1,
-              tmp,
-              destructor
-            );
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          msg
-        );
-    }
-  ACE_ENDTRY;
-  return 0;
+#define TAO_SYSTEM_EXCEPTION(name) \
+void operator<<= (CORBA::Any &any, CORBA::name *ex) \
+{ \
+  TAO::Any_Dual_Impl_T<CORBA::name >::insert ( \
+      any, \
+      CORBA::name ::_tao_any_destructor, \
+      CORBA::_tc_ ## name, \
+      ex \
+    ); \
 }
 
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
 #define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::Boolean \
-CORBA::operator>>= (const CORBA::Any &any, \
-                    const CORBA::name *&ex) \
+CORBA::Boolean operator>>= (const CORBA::Any &any, \
+                            const CORBA::name *&ex) \
 { \
-  ex = 0; \
-  CORBA::SystemException *tmp; \
-  if (tao_insert_in_extractor_system_exception ( \
+  return \
+    TAO::Any_Dual_Impl_T<CORBA::name >::extract ( \
         any, \
-        tmp, \
-        _tao_allocator_CORBA_ ## name, \
-        CORBA::_tc_ ## name, \
         CORBA::name ::_tao_any_destructor, \
-        "IDL:omg.org/CORBA/" #name ":1.0", \
-        "\tCORBA::Any extraction of CORBA::" #name "\n") == 0) \
-    { \
-      ex = 0; \
-      return 0; \
-    } \
-  ex = (CORBA::name *) tmp; \
-  return 1; \
+        CORBA::_tc_ ## name, \
+        ex \
+      ); \
 }
 
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+template class TAO::Any_Dual_Impl_T<CORBA::name >;
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+#pragma instantiate TAO::Any_Dual_Impl_T<CORBA::name >
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #undef STANDARD_EXCEPTION_LIST
 
 #if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
index e9da0b786da..a09e1f2cdbc 100644
--- a/TAO/tao/GIOP.pidl
+++ b/TAO/tao/GIOP.pidl
@@ -14,7 +14,7 @@
 //   is:
 //
 //     tao_idl
-//        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+//        -o orig -Gp -Gd -Ge 1
 //          -Wb,export_macro=TAO_Export
 //          -Wb,export_include="tao/TAO_Export.h"
 //          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index 73dbf1111fa..df2c8fe857d 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -1,4 +1,27 @@
-/* -*- C++ -*- $Id$ */
+// -*- 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
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
 // ================================================================
 //
@@ -17,81 +40,228 @@
 // ================================================================
 
 
-#include "tao/GIOPC.h"
+#include "GIOPC.h"
 #include "tao/Environment.h"
-#include "tao/Any.h"
-#include "tao/Typecode.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
+#endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
 #include "GIOPC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_GIOP_AddressingDisposition[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f416464), ACE_NTOHL (0x72657373), ACE_NTOHL (0x696e6744), ACE_NTOHL (0x6973706f), ACE_NTOHL (0x73697469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/AddressingDisposition:1.0
-  22, ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737369), ACE_NTOHL (0x6e674469), ACE_NTOHL (0x73706f73), ACE_NTOHL (0x6974696f), ACE_NTOHL (0x6e000000),  // name = AddressingDisposition
-  CORBA::tk_short,
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  43,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f416464), 
+  ACE_NTOHL (0x72657373), 
+  ACE_NTOHL (0x696e6744), 
+  ACE_NTOHL (0x6973706f), 
+  ACE_NTOHL (0x73697469), 
+  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/AddressingDisposition:1.0
+    22,
+  ACE_NTOHL (0x41646472), 
+  ACE_NTOHL (0x65737369), 
+  ACE_NTOHL (0x6e674469), 
+  ACE_NTOHL (0x73706f73), 
+  ACE_NTOHL (0x6974696f), 
+  ACE_NTOHL (0x6e000000),  // name = AddressingDisposition
+    CORBA::tk_short,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_GIOP_AddressingDisposition (CORBA::tk_alias, sizeof (_oc_GIOP_AddressingDisposition), (char *) &_oc_GIOP_AddressingDisposition, 0, sizeof (GIOP::AddressingDisposition));
+
+static CORBA::TypeCode _tc_TAO_tc_GIOP_AddressingDisposition (
+    CORBA::tk_alias,
+    sizeof (_oc_GIOP_AddressingDisposition),
+    (char *) &_oc_GIOP_AddressingDisposition,
+    0,
+    sizeof (GIOP::AddressingDisposition)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AddressingDisposition, &_tc_TAO_tc_GIOP_AddressingDisposition)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, KeyAddr, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ProfileAddr, 1)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_AddressingDisposition,
+    &_tc_TAO_tc_GIOP_AddressingDisposition
+  )
 TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_GIOP_Version[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  29,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f566572), 
+  ACE_NTOHL (0x73696f6e), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/GIOP/Version:1.0
+    8,
+  ACE_NTOHL (0x56657273), 
+  ACE_NTOHL (0x696f6e00),  // name = Version
+  2, // member count
+    6,
+  ACE_NTOHL (0x6d616a6f), 
+  ACE_NTOHL (0x72000000),  // name = major
+    CORBA::tk_octet,
+
+  6,
+  ACE_NTOHL (0x6d696e6f), 
+  ACE_NTOHL (0x72000000),  // name = minor
+    CORBA::tk_octet,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_GIOP_Version (
+    CORBA::tk_struct,
+    sizeof (_oc_GIOP_Version),
+    (char *) &_oc_GIOP_Version,
+    0,
+    sizeof (GIOP::Version)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ReferenceAddr, 2)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Version,
+    &_tc_TAO_tc_GIOP_Version
+  )
 TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void GIOP::Version::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Version *tmp = ACE_static_cast (Version*, _tao_void_pointer);
+  delete tmp;
+}
+
+// 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[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f494f52), ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737369), ACE_NTOHL (0x6e67496e), ACE_NTOHL (0x666f3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
-  18, ACE_NTOHL (0x494f5241), ACE_NTOHL (0x64647265), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67496e66), ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f494f52), 
+  ACE_NTOHL (0x41646472), 
+  ACE_NTOHL (0x65737369), 
+  ACE_NTOHL (0x6e67496e), 
+  ACE_NTOHL (0x666f3a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
+    18,
+  ACE_NTOHL (0x494f5241), 
+  ACE_NTOHL (0x64647265), 
+  ACE_NTOHL (0x7373696e), 
+  ACE_NTOHL (0x67496e66), 
+  ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
   2, // member count
-  23, ACE_NTOHL (0x73656c65), ACE_NTOHL (0x63746564), ACE_NTOHL (0x5f70726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x5f696e64), ACE_NTOHL (0x65780000),  // name = selected_profile_index
-  CORBA::tk_ulong,
+    23,
+  ACE_NTOHL (0x73656c65), 
+  ACE_NTOHL (0x63746564), 
+  ACE_NTOHL (0x5f70726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x5f696e64), 
+  ACE_NTOHL (0x65780000),  // name = selected_profile_index
+    CORBA::tk_ulong,
 
-  4, ACE_NTOHL (0x696f7200),  // name = ior
-  CORBA::tk_struct, // typecode kind
+  4,
+  ACE_NTOHL (0x696f7200),  // name = ior
+    CORBA::tk_struct, // typecode kind
   288, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    24, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x494f523a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-    4, ACE_NTOHL (0x494f5200),  // name = IOR
+    24,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x494f523a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
+        4,
+    ACE_NTOHL (0x494f5200),  // name = IOR
     2, // member count
-    8, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400),  // name = type_id
-    CORBA::tk_string,
+        8,
+    ACE_NTOHL (0x74797065), 
+    ACE_NTOHL (0x5f696400),  // name = type_id
+        CORBA::tk_string, 
     0U, // string length
-    9, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0),  // name = profiles
-    CORBA::tk_sequence, // typecode kind
+    9,
+    ACE_NTOHL (0x70726f66), 
+    ACE_NTOHL (0x696c6573), 
+    ACE_NTOHL (0x0),  // name = profiles
+        CORBA::tk_sequence, // typecode kind
     200, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
       184, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-        14, ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000),  // name = TaggedProfile
+        34,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x54616767), 
+        ACE_NTOHL (0x65645072), 
+        ACE_NTOHL (0x6f66696c), 
+        ACE_NTOHL (0x653a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
+                14,
+        ACE_NTOHL (0x54616767), 
+        ACE_NTOHL (0x65645072), 
+        ACE_NTOHL (0x6f66696c), 
+        ACE_NTOHL (0x65000000),  // name = TaggedProfile
         2, // member count
-        4, ACE_NTOHL (0x74616700),  // name = tag
-        CORBA::tk_alias, // typecode kind for typedefs
+                4,
+        ACE_NTOHL (0x74616700),  // name = tag
+                CORBA::tk_alias, // typecode kind for typedefs
         60, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
-          30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-          10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
-          CORBA::tk_ulong,
-
-
-        13, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = profile_data
-        CORBA::tk_sequence, // typecode kind
+          30,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x494f502f), 
+          ACE_NTOHL (0x50726f66), 
+          ACE_NTOHL (0x696c6549), 
+          ACE_NTOHL (0x643a312e), 
+          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
+                    10,
+          ACE_NTOHL (0x50726f66), 
+          ACE_NTOHL (0x696c6549), 
+          ACE_NTOHL (0x64000000),  // name = ProfileId
+                    CORBA::tk_ulong,
+
+
+        13,
+        ACE_NTOHL (0x70726f66), 
+        ACE_NTOHL (0x696c655f), 
+        ACE_NTOHL (0x64617461), 
+        ACE_NTOHL (0x0),  // name = profile_data
+                CORBA::tk_sequence, // typecode kind
         12, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           CORBA::tk_octet,
@@ -103,51 +273,91 @@ static const CORBA::Long _oc_GIOP_IORAddressingInfo[] =
 
 
 };
-static CORBA::TypeCode _tc_TAO_tc_GIOP_IORAddressingInfo (CORBA::tk_struct, sizeof (_oc_GIOP_IORAddressingInfo), (char *) &_oc_GIOP_IORAddressingInfo, 0, sizeof (GIOP::IORAddressingInfo));
+
+static CORBA::TypeCode _tc_TAO_tc_GIOP_IORAddressingInfo (
+    CORBA::tk_struct,
+    sizeof (_oc_GIOP_IORAddressingInfo),
+    (char *) &_oc_GIOP_IORAddressingInfo,
+    0,
+    sizeof (GIOP::IORAddressingInfo)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IORAddressingInfo, &_tc_TAO_tc_GIOP_IORAddressingInfo)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IORAddressingInfo,
+    &_tc_TAO_tc_GIOP_IORAddressingInfo
+  )
 TAO_NAMESPACE_END
 
-// *************************************************************
-// Operations for union GIOP::TargetAddress
-// *************************************************************
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void GIOP::IORAddressingInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  IORAddressingInfo *tmp = ACE_static_cast (IORAddressingInfo*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_cs.cpp:92
 
-// default constructor
 GIOP::TargetAddress::TargetAddress (void)
 {
   ACE_OS::memset (&this->disc_, 0, sizeof (this->disc_));
   ACE_OS::memset (&this->u_, 0, sizeof (this->u_));
+  this->disc_ = 0;
 }
 
-// copy constructor
-GIOP::TargetAddress::TargetAddress (const GIOP::TargetAddress &u)
+GIOP::TargetAddress::TargetAddress (const ::GIOP::TargetAddress &u)
 {
   this->disc_ = u.disc_;
   switch (this->disc_)
   {
     case 0:
     {
-      ACE_NEW (
-          this->u_.object_key_,
-          TAO_ObjectKey (*u.u_.object_key_)
-        );
+      if (u.u_.object_key_ == 0)
+        {
+          this->u_.object_key_ = 0;
+        }
+      else
+        {
+          ACE_NEW (
+              this->u_.object_key_,
+              TAO::ObjectKey (*u.u_.object_key_)
+            );
+        }
     }
     break;
     case 1:
     {
-      ACE_NEW (
-          this->u_.profile_,
-          IOP::TaggedProfile (*u.u_.profile_)
-        );
+      if (u.u_.profile_ == 0)
+        {
+          this->u_.profile_ = 0;
+        }
+      else
+        {
+          ACE_NEW (
+              this->u_.profile_,
+              IOP::TaggedProfile (*u.u_.profile_)
+            );
+        }
     }
     break;
     case 2:
     {
-      ACE_NEW (
-          this->u_.ior_,
-          GIOP::IORAddressingInfo (*u.u_.ior_)
-        );
+      if (u.u_.ior_ == 0)
+        {
+          this->u_.ior_ = 0;
+        }
+      else
+        {
+          ACE_NEW (
+              this->u_.ior_,
+              GIOP::IORAddressingInfo (*u.u_.ior_)
+            );
+        }
     }
     break;
     default:
@@ -155,48 +365,87 @@ GIOP::TargetAddress::TargetAddress (const GIOP::TargetAddress &u)
   }
 }
 
-// assignment operator
+GIOP::TargetAddress::~TargetAddress (void)
+{
+  // Finalize.
+  this->_reset (this->disc_, 1);
+}
+
+void GIOP::TargetAddress::_tao_any_destructor (void *_tao_void_pointer)
+{
+  TargetAddress *tmp = ACE_static_cast (TargetAddress*, _tao_void_pointer);
+  delete tmp;
+}
+
 GIOP::TargetAddress &
-GIOP::TargetAddress::operator= (const GIOP::TargetAddress &u)
+GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
 {
+  if (&u == this)
+    {
+      return *this;
+    }
+  
   this->_reset (u.disc_, 0);
   this->disc_ = u.disc_;
+  
   switch (this->disc_)
   {
     case 0:
     {
-      ACE_NEW_RETURN (
-          this->u_.object_key_,
-          TAO_ObjectKey (*u.u_.object_key_),
-          *this
-        );
+      if (u.u_.object_key_ == 0)
+        {
+          this->u_.object_key_ = 0;
+        }
+      else
+        {
+          ACE_NEW_RETURN (
+              this->u_.object_key_,
+              TAO::ObjectKey (*u.u_.object_key_),
+              *this
+            );
+        }
     }
     break;
     case 1:
     {
-      ACE_NEW_RETURN (
-          this->u_.profile_,
-          IOP::TaggedProfile (*u.u_.profile_),
-          *this
-        );
+      if (u.u_.profile_ == 0)
+        {
+          this->u_.profile_ = 0;
+        }
+      else
+        {
+          ACE_NEW_RETURN (
+              this->u_.profile_,
+              IOP::TaggedProfile (*u.u_.profile_),
+              *this
+            );
+        }
     }
     break;
     case 2:
     {
-      ACE_NEW_RETURN (
-          this->u_.ior_,
-          GIOP::IORAddressingInfo (*u.u_.ior_),
-          *this
-        );
+      if (u.u_.ior_ == 0)
+        {
+          this->u_.ior_ = 0;
+        }
+      else
+        {
+          ACE_NEW_RETURN (
+              this->u_.ior_,
+              GIOP::IORAddressingInfo (*u.u_.ior_),
+              *this
+            );
+        }
     }
     break;
     default:
     break;
   }
-return *this;
+  
+  return *this;
 }
 
-// reset method to reset old values of a union
+// Reset method to reset old values of a union.
 void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/)
 {
   switch (this->disc_)
@@ -218,18 +467,37 @@ void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/)
   }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_GIOP_TargetAddress[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f546172), ACE_NTOHL (0x67657441), ACE_NTOHL (0x64647265), ACE_NTOHL (0x73733a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/TargetAddress:1.0
-  14, ACE_NTOHL (0x54617267), ACE_NTOHL (0x65744164), ACE_NTOHL (0x64726573), ACE_NTOHL (0x73000000),  // name = TargetAddress
-  CORBA::tk_short,
-
-  -1, // default used index
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  35,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f546172), 
+  ACE_NTOHL (0x67657441), 
+  ACE_NTOHL (0x64647265), 
+  ACE_NTOHL (0x73733a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/TargetAddress:1.0
+  14,
+  ACE_NTOHL (0x54617267), 
+  ACE_NTOHL (0x65744164), 
+  ACE_NTOHL (0x64726573), 
+  ACE_NTOHL (0x73000000),  // name = TargetAddress
+    CORBA::tk_short,
+
+-1, // default used index
   3, // member count
-  ACE_IDL_NSTOHL (0x0000), // union case label (evaluated value)
-  11, ACE_NTOHL (0x6f626a65), ACE_NTOHL (0x63745f6b), ACE_NTOHL (0x65790000),  // name = object_key
-  CORBA::tk_sequence, // typecode kind
+    ACE_IDL_NSTOHL (0x0000), // union case label (evaluated value)
+  11,
+  ACE_NTOHL (0x6f626a65), 
+  ACE_NTOHL (0x63745f6b), 
+  ACE_NTOHL (0x65790000),  // name = object_key
+    CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
@@ -237,24 +505,55 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
     0U,
 
   ACE_IDL_NSTOHL (0x0001), // union case label (evaluated value)
-  8, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6500),  // name = profile
-  CORBA::tk_struct, // typecode kind
+  8,
+  ACE_NTOHL (0x70726f66), 
+  ACE_NTOHL (0x696c6500),  // name = profile
+    CORBA::tk_struct, // typecode kind
   184, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-    14, ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000),  // name = TaggedProfile
+    34,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x54616767), 
+    ACE_NTOHL (0x65645072), 
+    ACE_NTOHL (0x6f66696c), 
+    ACE_NTOHL (0x653a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
+        14,
+    ACE_NTOHL (0x54616767), 
+    ACE_NTOHL (0x65645072), 
+    ACE_NTOHL (0x6f66696c), 
+    ACE_NTOHL (0x65000000),  // name = TaggedProfile
     2, // member count
-    4, ACE_NTOHL (0x74616700),  // name = tag
-    CORBA::tk_alias, // typecode kind for typedefs
+        4,
+    ACE_NTOHL (0x74616700),  // name = tag
+        CORBA::tk_alias, // typecode kind for typedefs
     60, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-      10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
-      CORBA::tk_ulong,
+      30,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x50726f66), 
+      ACE_NTOHL (0x696c6549), 
+      ACE_NTOHL (0x643a312e), 
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
+            10,
+      ACE_NTOHL (0x50726f66), 
+      ACE_NTOHL (0x696c6549), 
+      ACE_NTOHL (0x64000000),  // name = ProfileId
+            CORBA::tk_ulong,
 
 
-    13, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = profile_data
-    CORBA::tk_sequence, // typecode kind
+    13,
+    ACE_NTOHL (0x70726f66), 
+    ACE_NTOHL (0x696c655f), 
+    ACE_NTOHL (0x64617461), 
+    ACE_NTOHL (0x0),  // name = profile_data
+        CORBA::tk_sequence, // typecode kind
     12, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_octet,
@@ -263,301 +562,284 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
 
 
   ACE_IDL_NSTOHL (0x0002), // union case label (evaluated value)
-  4, ACE_NTOHL (0x696f7200),  // name = ior
-  CORBA::tk_struct, // typecode kind
-  412, // encapsulation length
+  4,
+  ACE_NTOHL (0x696f7200),  // name = ior
+    CORBA::tk_struct, // typecode kind
+  228, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f494f52), ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737369), ACE_NTOHL (0x6e67496e), ACE_NTOHL (0x666f3a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
-    18, ACE_NTOHL (0x494f5241), ACE_NTOHL (0x64647265), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67496e66), ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
+    39,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x47494f50), 
+    ACE_NTOHL (0x2f494f52), 
+    ACE_NTOHL (0x41646472), 
+    ACE_NTOHL (0x65737369), 
+    ACE_NTOHL (0x6e67496e), 
+    ACE_NTOHL (0x666f3a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
+        18,
+    ACE_NTOHL (0x494f5241), 
+    ACE_NTOHL (0x64647265), 
+    ACE_NTOHL (0x7373696e), 
+    ACE_NTOHL (0x67496e66), 
+    ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
     2, // member count
-    23, ACE_NTOHL (0x73656c65), ACE_NTOHL (0x63746564), ACE_NTOHL (0x5f70726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x5f696e64), ACE_NTOHL (0x65780000),  // name = selected_profile_index
-    CORBA::tk_ulong,
-
-    4, ACE_NTOHL (0x696f7200),  // name = ior
-    CORBA::tk_struct, // typecode kind
-    288, // encapsulation length
+        23,
+    ACE_NTOHL (0x73656c65), 
+    ACE_NTOHL (0x63746564), 
+    ACE_NTOHL (0x5f70726f), 
+    ACE_NTOHL (0x66696c65), 
+    ACE_NTOHL (0x5f696e64), 
+    ACE_NTOHL (0x65780000),  // name = selected_profile_index
+        CORBA::tk_ulong,
+
+    4,
+    ACE_NTOHL (0x696f7200),  // name = ior
+        CORBA::tk_struct, // typecode kind
+    104, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      24, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x494f523a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-      4, ACE_NTOHL (0x494f5200),  // name = IOR
+      24,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x494f523a), 
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
+            4,
+      ACE_NTOHL (0x494f5200),  // name = IOR
       2, // member count
-      8, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400),  // name = type_id
-      CORBA::tk_string,
+            8,
+      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x5f696400),  // name = type_id
+            CORBA::tk_string, 
       0U, // string length
-      9, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0),  // name = profiles
-      CORBA::tk_sequence, // typecode kind
-      200, // encapsulation length
+      9,
+      ACE_NTOHL (0x70726f66), 
+      ACE_NTOHL (0x696c6573), 
+      ACE_NTOHL (0x0),  // name = profiles
+            CORBA::tk_sequence, // typecode kind
+      16, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_struct, // typecode kind
-        184, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-          14, ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000),  // name = TaggedProfile
-          2, // member count
-          4, ACE_NTOHL (0x74616700),  // name = tag
-          CORBA::tk_alias, // typecode kind for typedefs
-          60, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-            10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
-            CORBA::tk_ulong,
-
-
-          13, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = profile_data
-          CORBA::tk_sequence, // typecode kind
-          12, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_octet,
-
-            0U,
-
-
+        0xffffffff, // indirection
+        0xfffffe50, // negative offset (-432)
         0U,
 
 
 
 };
-static CORBA::TypeCode _tc_TAO_tc_GIOP_TargetAddress (CORBA::tk_union, sizeof (_oc_GIOP_TargetAddress), (char *) &_oc_GIOP_TargetAddress, 0, sizeof (GIOP::TargetAddress));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TargetAddress, &_tc_TAO_tc_GIOP_TargetAddress)
-TAO_NAMESPACE_END
-
-static const CORBA::Long _oc_GIOP_Version[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x47494f50),
-  ACE_NTOHL (0x2f566572),
-  ACE_NTOHL (0x73696f6e),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/GIOP/Version:1.0
-  8,
-  ACE_NTOHL (0x56657273),
-  ACE_NTOHL (0x696f6e00),  // name = Version
-  2, // member count
-  6,
-  ACE_NTOHL (0x6d616a6f),
-  ACE_NTOHL (0x72000000),  // name = major
-  CORBA::tk_octet,
-
-  6,
-  ACE_NTOHL (0x6d696e6f),
-  ACE_NTOHL (0x72000000),  // name = minor
-  CORBA::tk_octet,
-
-};
 
-static CORBA::TypeCode _tc_TAO_tc_GIOP_Version (
-    CORBA::tk_struct,
-    sizeof (_oc_GIOP_Version),
-    (char *) &_oc_GIOP_Version,
+static CORBA::TypeCode _tc_TAO_tc_GIOP_TargetAddress (
+    CORBA::tk_union,
+    sizeof (_oc_GIOP_TargetAddress),
+    (char *) &_oc_GIOP_TargetAddress,
     0,
-    sizeof (GIOP::Version)
+    sizeof (GIOP::TargetAddress)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (GIOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Version, &_tc_TAO_tc_GIOP_Version)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TargetAddress,
+    &_tc_TAO_tc_GIOP_TargetAddress
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
-void
-GIOP::IORAddressingInfo::_tao_any_destructor (void *x)
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const GIOP::Version &_tao_elem
+  )
 {
-  GIOP::IORAddressingInfo *tmp = ACE_static_cast (GIOP::IORAddressingInfo*,x);
-  delete tmp;
+  TAO::Any_Dual_Impl_T<GIOP::Version>::insert_copy (
+      _tao_any,
+      GIOP::Version::_tao_any_destructor,
+      GIOP::_tc_Version,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, const GIOP::IORAddressingInfo &_tao_elem) // copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    GIOP::Version *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      GIOP::_tc_IORAddressingInfo,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+  TAO::Any_Dual_Impl_T<GIOP::Version>::insert (
+      _tao_any,
+      GIOP::Version::_tao_any_destructor,
+      GIOP::_tc_Version,
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, GIOP::IORAddressingInfo *_tao_elem) // non copying
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    GIOP::Version *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const GIOP::Version *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const GIOP::Version *&_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  return
+    TAO::Any_Dual_Impl_T<GIOP::Version>::extract (
+        _tao_any,
+        GIOP::Version::_tao_any_destructor,
+        GIOP::_tc_Version,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<GIOP::Version>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<GIOP::Version>
+#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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const GIOP::IORAddressingInfo &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::insert_copy (
+      _tao_any,
+      GIOP::IORAddressingInfo::_tao_any_destructor,
       GIOP::_tc_IORAddressingInfo,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      GIOP::IORAddressingInfo::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, GIOP::IORAddressingInfo *&_tao_elem)
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    GIOP::IORAddressingInfo *_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (GIOP::_tc_IORAddressingInfo ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (GIOP::IORAddressingInfo *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, GIOP::IORAddressingInfo, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            GIOP::_tc_IORAddressingInfo,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            GIOP::IORAddressingInfo::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::insert (
+      _tao_any,
+      GIOP::IORAddressingInfo::_tao_any_destructor,
+      GIOP::_tc_IORAddressingInfo,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const GIOP::IORAddressingInfo *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    GIOP::IORAddressingInfo *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(GIOP::IORAddressingInfo*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const GIOP::IORAddressingInfo *&,
+      _tao_elem
+    );
 }
 
-void
-GIOP::TargetAddress::_tao_any_destructor (void *x)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const GIOP::IORAddressingInfo *&_tao_elem
+  )
 {
-  GIOP::TargetAddress *tmp = ACE_static_cast (GIOP::TargetAddress*,x);
-  delete tmp;
+  return
+    TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::extract (
+        _tao_any,
+        GIOP::IORAddressingInfo::_tao_any_destructor,
+        GIOP::_tc_IORAddressingInfo,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/any_op_cs.cpp:54
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const GIOP::TargetAddress &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          GIOP::_tc_TargetAddress,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::insert_copy (
+      _tao_any,
+      GIOP::TargetAddress::_tao_any_destructor,
+      GIOP::_tc_TargetAddress,
+      _tao_elem
+    );
 }
 
+// Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     GIOP::TargetAddress *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          GIOP::_tc_TargetAddress,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          GIOP::IORAddressingInfo::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::insert (
+      _tao_any,
+      GIOP::TargetAddress::_tao_any_destructor,
+      GIOP::_tc_TargetAddress,
+      _tao_elem
+    );
 }
 
+// Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
     GIOP::TargetAddress *&_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (GIOP::_tc_TargetAddress ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (GIOP::TargetAddress *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, GIOP::TargetAddress, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            GIOP::_tc_TargetAddress,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            GIOP::IORAddressingInfo::_tao_any_destructor
-          );
-        return 1;
-      }
-      else
-      {
-        delete  _tao_elem;
-        _tao_elem = 0;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    _tao_elem = 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+  return _tao_any >>= ACE_const_cast (
+      const GIOP::TargetAddress *&,
+      _tao_elem
+    );
 }
 
+// Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
     const GIOP::TargetAddress *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (GIOP::TargetAddress*&,_tao_elem);
+  return
+    TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::extract (
+        _tao_any,
+        GIOP::TargetAddress::_tao_any_destructor,
+        GIOP::_tc_TargetAddress,
+        _tao_elem
+      );
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<GIOP::TargetAddress>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# 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 b4a34b103fa..25fc4b2a83d 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -1,5 +1,6 @@
-/* -*- C++ -*- $Id$ */
-
+// -*- C++ -*-
+//
+// $Id$
 
 //=============================================================================
 /**
@@ -17,12 +18,22 @@
  */
 //=============================================================================
 
-// ******  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.
+// ****  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
 
 // Readers Note:
 // This file is named GIOPC.h intentionally. Shortly the file GIOP.h
@@ -30,10 +41,13 @@
 // pluggable messaging stuff is done. So I would assume that there
 // should be no such name clashes.
 
-#ifndef _TAO_IDL_GIOPC_H_
-#define _TAO_IDL_GIOPC_H_
-#include "ace/pre.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
+#ifndef _TAO_IDL_ORIG_GIOPC_H_
+#define _TAO_IDL_ORIG_GIOPC_H_
+
+#include "ace/pre.h"
 #include "tao/corbafwd.h"
 #include "tao/IOPC.h"
 #include "tao/Object_KeyC.h"
@@ -66,61 +80,93 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  GIOP
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short AddressingDisposition;
   typedef CORBA::Short_out AddressingDisposition_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AddressingDisposition;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short KeyAddr;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ProfileAddr;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ReferenceAddr;
-
-
-  struct IORAddressingInfo;
+  
+  // 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_AddressingDisposition;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short KeyAddr = 0;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short ProfileAddr = 1;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short ReferenceAddr = 2;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class IORAddressingInfo_var;
-
+  
   struct TAO_Export IORAddressingInfo
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IORAddressingInfo_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
     CORBA::ULong selected_profile_index;
     IOP::IOR ior;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export IORAddressingInfo_var
   {
   public:
-    IORAddressingInfo_var (void); // default constructor
+    IORAddressingInfo_var (void);
     IORAddressingInfo_var (IORAddressingInfo *);
-    IORAddressingInfo_var (const IORAddressingInfo_var &); // copy constructor
-    ~IORAddressingInfo_var (void); // destructor
-
+    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;
-    // in, inout, out, _retn
+    
+    // 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;
-
+  
   private:
     IORAddressingInfo *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export IORAddressingInfo_out
   {
   public:
@@ -132,189 +178,270 @@ TAO_NAMESPACE  GIOP
     operator IORAddressingInfo *&();
     IORAddressingInfo *&ptr (void);
     IORAddressingInfo *operator-> (void);
-
+    
   private:
     IORAddressingInfo *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const IORAddressingInfo_var &);
   };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IORAddressingInfo;
-
-
-  class TargetAddress;
+  
+  // 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_IORAddressingInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:53
+
+#if !defined (_GIOP_TARGETADDRESS_CH_)
+#define _GIOP_TARGETADDRESS_CH_
+  
   class TargetAddress_var;
-
+  
   class TAO_Export TargetAddress
   {
   public:
-    TargetAddress (void); // default constructor
-    TargetAddress (const TargetAddress &); // copy constructor
-    ~TargetAddress (void); // destructor
-    TargetAddress &operator= (const TargetAddress &); // copy constructor
-
+    TargetAddress (void);
+    TargetAddress (const TargetAddress &);
+    ~TargetAddress (void);
+    static void _tao_any_destructor (void*);
+    
+    TargetAddress &operator= (const TargetAddress &);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/discriminant_ch.cpp:115
+    
     void _d (CORBA::Short);
     CORBA::Short _d (void) const;
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:111
+    
     typedef TargetAddress_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    static void _tao_any_destructor (void*);
-
-
-    void object_key (const TAO_ObjectKey &);// set
-    const TAO_ObjectKey &object_key (void) const; // get method (read only)
-    TAO_ObjectKey &object_key (void); // get method (read/write only)
-
-    void profile (const IOP::TaggedProfile &);// set
-    const IOP::TaggedProfile &profile (void) const; // get method (read only)
-    IOP::TaggedProfile &profile (void); // get method (read/write only)
 
-    void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &);// set
-    const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const; // get method (read only)
-    ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void); // get method (read/write only)
-
-    void _default ();
+    // 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);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:616
+    
+    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
+    
+    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
+    
+    void _default (void);
   private:
     CORBA::Short disc_;
+    CORBA::Short holder_;
+    
     union
     {
-      TAO_ObjectKey *object_key_;
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:407
+      TAO::ObjectKey *object_key_;
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:482
       IOP::TaggedProfile *profile_;
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:482
       ACE_NESTED_CLASS (GIOP, IORAddressingInfo) *ior_;
-    } u_; // end of union
-  // TAO extensions
-  void _reset (CORBA::Short, CORBA::Boolean);
-  // Frees any allocated storage
+    } u_;
+    
+    // TAO extension - frees any allocated storage.
+    void _reset (CORBA::Short, CORBA::Boolean /* finalize */);
+  };
+  
+  // 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_TargetAddress;
+
+#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_;
+  };
 
-  void _reset (void);
-  // calls the above reset with finalize=1
+#endif /* end #if !defined */
 
-}; // GIOP::TargetAddress
+#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 &);
+  };
 
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TargetAddress;
+#endif /* end #if !defined */
 
-class TAO_Export TargetAddress_var
-{
-public:
-  TargetAddress_var (void); // default constructor
-  TargetAddress_var (TargetAddress *);
-  TargetAddress_var (const TargetAddress_var &); // copy constructor
-  ~TargetAddress_var (void); // destructor
-
-  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;
-  // 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_;
-};
-
-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 &);
-};
-
-// 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
-{
-  CORBA::Octet major;
-  CORBA::Octet minor;
-};
+  // 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;
+  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
 
 }
 TAO_NAMESPACE_CLOSE // module GIOP
 
-TAO_Export void operator<<= (CORBA::Any &,
-                             const GIOP::IORAddressingInfo &); // copying version
-TAO_Export void operator<<= (CORBA::Any &,
-                             GIOP::IORAddressingInfo*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       GIOP::IORAddressingInfo *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const GIOP::IORAddressingInfo *&);
-TAO_Export void operator<<= (CORBA::Any &,
-                             const GIOP::TargetAddress &); // copying version
-TAO_Export void operator<<= (CORBA::Any &,
-                             GIOP::TargetAddress*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       GIOP::TargetAddress *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const GIOP::TargetAddress *&);
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const GIOP::Version &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, GIOP::Version*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::Version *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::Version *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const GIOP::IORAddressingInfo &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, GIOP::IORAddressingInfo*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::IORAddressingInfo *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::IORAddressingInfo *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const GIOP::TargetAddress &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, GIOP::TargetAddress*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::TargetAddress *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::TargetAddress *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::Version &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::Version &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::IORAddressingInfo &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::IORAddressingInfo &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress &); //
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/cdr_op_ch.cpp:54
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::Version &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::Version &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "GIOPC.i"
@@ -324,5 +451,10 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::Version &);
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
 #endif /* ifndef */
+
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;
 }
+
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 3c4837e6fab..96768eed919 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -1057,10 +1057,10 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
                                          CORBA::COMPLETED_NO));
         }
 
-      TAO_ObjectKey tmp_key (locate_request.object_key ().length (),
-                             locate_request.object_key ().length (),
-                             locate_request.object_key ().get_buffer (),
-                             0);
+      TAO::ObjectKey tmp_key (locate_request.object_key ().length (),
+                              locate_request.object_key ().length (),
+                              locate_request.object_key ().get_buffer (),
+                              0);
 
       // Set it to an error state
       parse_error = 1;
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index 180e143c6e3..f5b43e38bf4 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -47,7 +47,8 @@ TAO_GIOP_Message_Generator_Parser_10::write_request_header (
   // In this case we cannot recognise anything other than the Object
   // key as the address disposition variable. But we do a sanity check
   // anyway.
-  const TAO_ObjectKey *key = spec.object_key ();
+  const TAO::ObjectKey *key = spec.object_key ();
+
   if (key)
     {
       // Put in the object key
@@ -97,7 +98,8 @@ TAO_GIOP_Message_Generator_Parser_10::write_locate_request_header (
   // In this case we cannot recognise anything other than the Object
   // key as the address disposition variable. But we do a sanity check
   // anyway.
-  const TAO_ObjectKey *key = spec.object_key ();
+  const TAO::ObjectKey *key = spec.object_key ();
+
   if (key)
     {
       // Everything is fine
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index 6e22db33b79..5dac3aa38ab 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -459,7 +459,8 @@ TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec (
         msg << GIOP::KeyAddr;
 
         // Get the object key
-        const TAO_ObjectKey *key = spec.object_key ();
+        const TAO::ObjectKey *key = spec.object_key ();
+
         if (key)
           {
             // Marshall in the object key
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 351108f2feb..e30a083a8dc 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -924,10 +924,10 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
                                   sizeof repbuf);
       // This output CDR is not used!
 
-      TAO_ObjectKey tmp_key (locate_request.object_key ().length (),
-                             locate_request.object_key ().length (),
-                             locate_request.object_key ().get_buffer (),
-                             0);
+      TAO::ObjectKey tmp_key (locate_request.object_key ().length (),
+                              locate_request.object_key ().length (),
+                              locate_request.object_key ().get_buffer (),
+                              0);
 
       // Set it to an error state
       parse_error = 1;
@@ -1220,7 +1220,7 @@ TAO_GIOP_Message_Lite::write_request_header (
   // In this case we cannot recognise anything other than the Object
   // key as the address disposition variable. But we do a sanity check
   // anyway.
-  const TAO_ObjectKey *key = spec.object_key ();
+  const TAO::ObjectKey *key = spec.object_key ();
 
   if (key != 0)
     {
@@ -1258,7 +1258,7 @@ TAO_GIOP_Message_Lite::write_locate_request_header (
   // In this case we cannot recognise anything other than the Object
   // key as the address disposition variable. But we do a sanity check
   // anyway.
-  const TAO_ObjectKey *key = spec.object_key ();
+  const TAO::ObjectKey *key = spec.object_key ();
 
   if (key)
     {
@@ -1377,7 +1377,7 @@ TAO_GIOP_Message_Lite::parse_locate_header (
   // Store it in the Locate request classes.
   request.request_id (req_id);
 
-  TAO_ObjectKey &object_key =
+  TAO::ObjectKey &object_key =
     request.object_key ();
 
   // Note that here there are no unions and so no problems.
diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h
index 6c46c74ce6b..1f4420151af 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.h
+++ b/TAO/tao/GIOP_Message_Locate_Header.h
@@ -46,10 +46,10 @@ public:
   CORBA::ULong request_id (void);
 
   /// Get the object_key in read mode..
-  const TAO_ObjectKey &object_key (void) const;
+  const TAO::ObjectKey &object_key (void) const;
 
   /// Get the object_key in read/write mode..
-  TAO_ObjectKey &object_key (void);
+  TAO::ObjectKey &object_key (void);
 
   /// Get the reference to the underlying profile
   TAO_Tagged_Profile &profile (void);
@@ -65,7 +65,7 @@ private:
   TAO_Tagged_Profile profile_;
 
   /// Object Key
-  TAO_ObjectKey object_key_;
+  TAO::ObjectKey object_key_;
 
   /// Incoming CDR stream
   TAO_InputCDR *incoming_;
diff --git a/TAO/tao/GIOP_Message_Locate_Header.i b/TAO/tao/GIOP_Message_Locate_Header.i
index 208019a5dea..8b8025c4603 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.i
+++ b/TAO/tao/GIOP_Message_Locate_Header.i
@@ -22,13 +22,13 @@ TAO_GIOP_Locate_Request_Header::request_id (void)
   return this->request_id_;
 }
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_GIOP_Locate_Request_Header::object_key (void) const
 {
   return this->profile_.object_key ();
 }
 
-ACE_INLINE TAO_ObjectKey &
+ACE_INLINE TAO::ObjectKey &
 TAO_GIOP_Locate_Request_Header::object_key (void)
 {
   return this->profile_.object_key ();
diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index e1948a7a139..fd70e09a65f 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -17,59 +17,50 @@
 //   the IFR as well as many of the non-interface data types used
 //   by all other IFR interfaces.
 //
-//   1. Patch this pidl file with
+//   The command used to generate code from this IDL file is:
 //
-//      patch < diffs/IFR_Base.pidl.diff
-//
-//   This will remove the CORBA module, rename most types foo
-//   declared in it as CORBA_foo, unalias the simple typedefs
-//   which don't have a CORBA_ analog in corbafwd.h.
-//
-//   2. Generate the code. The command used to generate code from this
-//   IDL file is:
-//
-//     tao_idl -o orig -Ge 1 -I.. \
+//     tao_idl -Ge 1 -I.. \
 //          -Wb,export_macro=TAO_IFR_Client_Export \
 //          -Wb,export_include=ifr_client_export.h \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
 //          IFR_Base.pidl
 //
-//   3. Copy the generated files to the current directory.
+//   Only the stub files are used in the TAO_IFR_Client library. The
+//   skeleton files can be deleted from this directory.
 //
-//   4. Patch the generated files, using
+//   No patching of the generated stub files is necessary.
 //
-//      patch < diffs/IFR_BaseC.h.diff
-//      patch < diffs/IFR_BaseC.i.diff
-//      patch < diffs/IFR_BaseC.cpp.diff
+//   To generate the skeleton files for the IFR Service, the command is:
 //
-//   If this fails for some reason, the files must be patched
-//   by hand, and the diff files regenerated with
+//     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
+//          -Wb,pre_include="ace/pre.h" \
+//          -Wb,post_include="ace/post.h" \
+//          IFR_Base.pidl
 //
-//      diff -wbu orig/IFR_BaseC.h IFR_BaseC.h > diffs/IFR_BaseC.h.diff
-//      diff -wbu orig/IFR_BaseC.i IFR_BaseC.i > diffs/IFR_BaseC.i.diff
-//      diff -wbu orig/IFR_BaseC.cpp IFR_BaseC.cpp > diffs/IFR_BaseC.cpp.diff
+//   The only modification necessary to the skelton files is to 
+//   change
 //
-//   5. Restore IFR_Base.pidl.
+//   #include "IFR_BaseC.h"
 //
-//   To regenerate the skeleton files IFR_BaseS.{h,i,cpp} and
-//   IFR_BaseS_T.{h,i.cpp} in ACE_ROOT/TAO/orbsvcs/IFR_Service, use the
-//   command
+//   to
 //
-//     tao_idl -o ../../orbsvcs/IFR_Service/orig -Ge 1 \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Base.pidl
+//   #include "tao/IFR_Client/IFR_BaseC.h"
+//
+//   in IFR_BaseS.h. The stub files may be deleted from the IFRService
+//   directory.
 //
 // ================================================================
 
 #ifndef _IFR_BASE_IDL_
 #define _IFR_BASE_IDL_
 
-#pragma prefix "omg.org"
+#include <orb.idl>
 
 module CORBA
 {
+  typeprefix CORBA "omg.org";
+
   typedef string Identifier;
   typedef string ScopedName;
   typedef string RepositoryId;
@@ -101,13 +92,24 @@ module CORBA
     dk_ValueMember,
     dk_Native,
     dk_AbstractInterface,
-    dk_LocalInterface
+    dk_LocalInterface,
+    dk_Component,
+    dk_Home,
+    dk_Factory,
+    dk_Finder,
+    dk_Emits,
+    dk_Publishes,
+    dk_Consumes,
+    dk_Provides,
+    dk_Uses,
+    dk_Event
   };
 
   interface IRObject
   {
     // read interface
     readonly attribute DefinitionKind def_kind;
+
     // write interface
     void destroy ();
   };
@@ -146,8 +148,6 @@ module CORBA
       );
   };
 
-  typedef sequence <Contained> ContainedSeq;
-
   interface ModuleDef;
   interface ConstantDef;
   interface IDLType;
@@ -155,18 +155,41 @@ module CORBA
   interface UnionDef;
   interface EnumDef;
   interface AliasDef;
+
   interface InterfaceDef;
   typedef sequence<InterfaceDef> InterfaceDefSeq;
+
   interface ExceptionDef;
   interface NativeDef;
+
   interface ValueDef;
   typedef sequence<ValueDef> ValueDefSeq;
+
   interface ValueBoxDef;
+
   interface AbstractInterfaceDef;
   typedef sequence<AbstractInterfaceDef> AbstractInterfaceDefSeq;
+
   interface LocalInterfaceDef;
   typedef sequence<LocalInterfaceDef> LocalInterfaceDefSeq;
 
+  interface ExtInterfaceDef;
+  typedef sequence <ExtInterfaceDef> ExtInterfaceDefSeq;
+
+  interface ExtValueDef;
+  typedef sequence <ExtValueDef> ExtValueDefSeq;
+
+  interface ExtAbstractInterfaceDef;
+  typedef sequence <ExtAbstractInterfaceDef>
+
+  ExtAbstractInterfaceDefSeq;
+  interface ExtLocalInterfaceDef;
+
+  typedef sequence <ExtLocalInterfaceDef>
+  ExtLocalInterfaceDefSeq;
+
+  typedef sequence <Contained> ContainedSeq;
+
   struct StructMember
   {
     Identifier name;
@@ -184,6 +207,26 @@ module CORBA
 
   typedef sequence <Initializer> InitializerSeq;
 
+  struct ExceptionDescription 
+  {
+    Identifier name;
+    RepositoryId id;
+    RepositoryId defined_in;
+    VersionSpec version;
+    TypeCode type;
+  };
+
+  typedef sequence <ExceptionDescription> ExcDescriptionSeq;
+
+  struct ExtInitializer 
+  {
+    StructMemberSeq members;
+    ExcDescriptionSeq exceptions;
+    Identifier name;
+  };
+
+  typedef sequence <ExtInitializer> ExtInitializerSeq;
+
   struct UnionMember
   {
     Identifier name;
@@ -225,12 +268,15 @@ module CORBA
         in boolean exclude_inherited,
         in long max_returned_objs
       );
+
     // write interface
+
     ModuleDef create_module (
         in RepositoryId id,
         in Identifier name,
         in VersionSpec version
       );
+
     ConstantDef create_constant (
         in RepositoryId id,
         in Identifier name,
@@ -238,12 +284,14 @@ module CORBA
         in IDLType type,
         in any value
       );
+
     StructDef create_struct (
         in RepositoryId id,
         in Identifier name,
         in VersionSpec version,
         in StructMemberSeq members
       );
+
     UnionDef create_union (
         in RepositoryId id,
         in Identifier name,
@@ -251,25 +299,29 @@ module CORBA
         in IDLType discriminator_type,
         in UnionMemberSeq members
       );
+
     EnumDef create_enum (
         in RepositoryId id,
         in Identifier name,
         in VersionSpec version,
         in EnumMemberSeq members
       );
+
     AliasDef create_alias (
         in RepositoryId id,
         in Identifier name,
         in VersionSpec version,
         in IDLType original_type
       );
+
     InterfaceDef create_interface (
         in RepositoryId id,
         in Identifier name,
         in VersionSpec version,
         in InterfaceDefSeq base_interfaces
       );
-    ValueDef create_value(
+
+    ValueDef create_value (
         in RepositoryId id,
         in Identifier name,
         in VersionSpec version,
@@ -281,35 +333,53 @@ module CORBA
         in InterfaceDefSeq supported_interfaces,
         in InitializerSeq initializers
       );
+
     ValueBoxDef create_value_box(
         in RepositoryId id,
         in Identifier name,
         in VersionSpec version,
         in IDLType original_type_def
       );
+
     ExceptionDef create_exception(
         in RepositoryId id,
         in Identifier name,
         in VersionSpec version,
         in StructMemberSeq members
       );
+
     NativeDef create_native(
         in RepositoryId id,
         in Identifier name,
         in VersionSpec version
       );
+
     AbstractInterfaceDef create_abstract_interface (
         in RepositoryId id,
         in Identifier name,
         in VersionSpec version,
         in AbstractInterfaceDefSeq base_interfaces
       );
+
     LocalInterfaceDef create_local_interface (
         in RepositoryId id,
         in Identifier name,
         in VersionSpec version,
         in InterfaceDefSeq base_interfaces
       );
+
+    ExtValueDef create_ext_value (
+	in RepositoryId id,
+	in Identifier name,
+	in VersionSpec version,
+	in boolean is_custom,
+	in boolean is_abstract,
+	in ValueDef base_value,
+	in boolean is_truncatable,
+	in ValueDefSeq abstract_base_values,
+	in InterfaceDefSeq supported_interfaces,
+	in ExtInitializerSeq initializers
+      );
   };
 
   interface IDLType : IRObject
@@ -331,6 +401,4 @@ module CORBA
   };
 };
 
-#pragma prefix ""
-
 #endif /* _IFR_BASE_IDL_ */
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index 01b99e1fa1f..301c53e3359 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -20,7 +20,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:314
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
 #include "IFR_BaseC.h"
@@ -35,6 +35,7 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -44,7 +45,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_Identifier[] =
 {
@@ -59,11 +60,11 @@ static const CORBA::Long _oc_CORBA_Identifier[] =
   ACE_NTOHL (0x66696572), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-  11,
+    11,
   ACE_NTOHL (0x4964656e), 
   ACE_NTOHL (0x74696669), 
   ACE_NTOHL (0x65720000),  // name = Identifier
-  CORBA::tk_string, 
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -85,7 +86,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ScopedName[] =
 {
@@ -100,11 +101,11 @@ static const CORBA::Long _oc_CORBA_ScopedName[] =
   ACE_NTOHL (0x4e616d65), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ScopedName:1.0
-  11,
+    11,
   ACE_NTOHL (0x53636f70), 
   ACE_NTOHL (0x65644e61), 
   ACE_NTOHL (0x6d650000),  // name = ScopedName
-  CORBA::tk_string, 
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -126,7 +127,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_RepositoryId[] =
 {
@@ -141,12 +142,12 @@ static const CORBA::Long _oc_CORBA_RepositoryId[] =
   ACE_NTOHL (0x746f7279), 
   ACE_NTOHL (0x49643a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-  13,
+    13,
   ACE_NTOHL (0x5265706f), 
   ACE_NTOHL (0x7369746f), 
   ACE_NTOHL (0x72794964), 
   ACE_NTOHL (0x0),  // name = RepositoryId
-  CORBA::tk_string, 
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -168,7 +169,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_DefinitionKind[] =
 {
@@ -184,126 +185,166 @@ static const CORBA::Long _oc_CORBA_DefinitionKind[] =
   ACE_NTOHL (0x4b696e64), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
-15,
+  15,
   ACE_NTOHL (0x44656669), 
   ACE_NTOHL (0x6e697469), 
   ACE_NTOHL (0x6f6e4b69), 
   ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-  26, // member count
-8,
+  36, // member count
+  8,
   ACE_NTOHL (0x646b5f6e), 
   ACE_NTOHL (0x6f6e6500),  // name = dk_none
-7,
+  7,
   ACE_NTOHL (0x646b5f61), 
   ACE_NTOHL (0x6c6c0000),  // name = dk_all
-13,
+  13,
   ACE_NTOHL (0x646b5f41), 
   ACE_NTOHL (0x74747269), 
   ACE_NTOHL (0x62757465), 
   ACE_NTOHL (0x0),  // name = dk_Attribute
-12,
+  12,
   ACE_NTOHL (0x646b5f43), 
   ACE_NTOHL (0x6f6e7374), 
   ACE_NTOHL (0x616e7400),  // name = dk_Constant
-13,
+  13,
   ACE_NTOHL (0x646b5f45), 
   ACE_NTOHL (0x78636570), 
   ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = dk_Exception
-13,
+  13,
   ACE_NTOHL (0x646b5f49), 
   ACE_NTOHL (0x6e746572), 
   ACE_NTOHL (0x66616365), 
   ACE_NTOHL (0x0),  // name = dk_Interface
-10,
+  10,
   ACE_NTOHL (0x646b5f4d), 
   ACE_NTOHL (0x6f64756c), 
   ACE_NTOHL (0x65000000),  // name = dk_Module
-13,
+  13,
   ACE_NTOHL (0x646b5f4f), 
   ACE_NTOHL (0x70657261), 
   ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = dk_Operation
-11,
+  11,
   ACE_NTOHL (0x646b5f54), 
   ACE_NTOHL (0x79706564), 
   ACE_NTOHL (0x65660000),  // name = dk_Typedef
-9,
+  9,
   ACE_NTOHL (0x646b5f41), 
   ACE_NTOHL (0x6c696173), 
   ACE_NTOHL (0x0),  // name = dk_Alias
-10,
+  10,
   ACE_NTOHL (0x646b5f53), 
   ACE_NTOHL (0x74727563), 
   ACE_NTOHL (0x74000000),  // name = dk_Struct
-9,
+  9,
   ACE_NTOHL (0x646b5f55), 
   ACE_NTOHL (0x6e696f6e), 
   ACE_NTOHL (0x0),  // name = dk_Union
-8,
+  8,
   ACE_NTOHL (0x646b5f45), 
   ACE_NTOHL (0x6e756d00),  // name = dk_Enum
-13,
+  13,
   ACE_NTOHL (0x646b5f50), 
   ACE_NTOHL (0x72696d69), 
   ACE_NTOHL (0x74697665), 
   ACE_NTOHL (0x0),  // name = dk_Primitive
-10,
+  10,
   ACE_NTOHL (0x646b5f53), 
   ACE_NTOHL (0x7472696e), 
   ACE_NTOHL (0x67000000),  // name = dk_String
-12,
+  12,
   ACE_NTOHL (0x646b5f53), 
   ACE_NTOHL (0x65717565), 
   ACE_NTOHL (0x6e636500),  // name = dk_Sequence
-9,
+  9,
   ACE_NTOHL (0x646b5f41), 
   ACE_NTOHL (0x72726179), 
   ACE_NTOHL (0x0),  // name = dk_Array
-14,
+  14,
   ACE_NTOHL (0x646b5f52), 
   ACE_NTOHL (0x65706f73), 
   ACE_NTOHL (0x69746f72), 
   ACE_NTOHL (0x79000000),  // name = dk_Repository
-11,
+  11,
   ACE_NTOHL (0x646b5f57), 
   ACE_NTOHL (0x73747269), 
   ACE_NTOHL (0x6e670000),  // name = dk_Wstring
-9,
+  9,
   ACE_NTOHL (0x646b5f46), 
   ACE_NTOHL (0x69786564), 
   ACE_NTOHL (0x0),  // name = dk_Fixed
-9,
+  9,
   ACE_NTOHL (0x646b5f56), 
   ACE_NTOHL (0x616c7565), 
   ACE_NTOHL (0x0),  // name = dk_Value
-12,
+  12,
   ACE_NTOHL (0x646b5f56), 
   ACE_NTOHL (0x616c7565), 
   ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
-15,
+  15,
   ACE_NTOHL (0x646b5f56), 
   ACE_NTOHL (0x616c7565), 
   ACE_NTOHL (0x4d656d62), 
   ACE_NTOHL (0x65720000),  // name = dk_ValueMember
-10,
+  10,
   ACE_NTOHL (0x646b5f4e), 
   ACE_NTOHL (0x61746976), 
   ACE_NTOHL (0x65000000),  // name = dk_Native
-21,
+  21,
   ACE_NTOHL (0x646b5f41), 
   ACE_NTOHL (0x62737472), 
   ACE_NTOHL (0x61637449), 
   ACE_NTOHL (0x6e746572), 
   ACE_NTOHL (0x66616365), 
   ACE_NTOHL (0x0),  // name = dk_AbstractInterface
-18,
+  18,
   ACE_NTOHL (0x646b5f4c), 
   ACE_NTOHL (0x6f63616c), 
   ACE_NTOHL (0x496e7465), 
   ACE_NTOHL (0x72666163), 
   ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
-};
+  13,
+  ACE_NTOHL (0x646b5f43), 
+  ACE_NTOHL (0x6f6d706f), 
+  ACE_NTOHL (0x6e656e74), 
+  ACE_NTOHL (0x0),  // name = dk_Component
+  8,
+  ACE_NTOHL (0x646b5f48), 
+  ACE_NTOHL (0x6f6d6500),  // name = dk_Home
+  11,
+  ACE_NTOHL (0x646b5f46), 
+  ACE_NTOHL (0x6163746f), 
+  ACE_NTOHL (0x72790000),  // name = dk_Factory
+  10,
+  ACE_NTOHL (0x646b5f46), 
+  ACE_NTOHL (0x696e6465), 
+  ACE_NTOHL (0x72000000),  // name = dk_Finder
+  9,
+  ACE_NTOHL (0x646b5f45), 
+  ACE_NTOHL (0x6d697473), 
+  ACE_NTOHL (0x0),  // name = dk_Emits
+  13,
+  ACE_NTOHL (0x646b5f50), 
+  ACE_NTOHL (0x75626c69), 
+  ACE_NTOHL (0x73686573), 
+  ACE_NTOHL (0x0),  // name = dk_Publishes
+  12,
+  ACE_NTOHL (0x646b5f43), 
+  ACE_NTOHL (0x6f6e7375), 
+  ACE_NTOHL (0x6d657300),  // name = dk_Consumes
+  12,
+  ACE_NTOHL (0x646b5f50), 
+  ACE_NTOHL (0x726f7669), 
+  ACE_NTOHL (0x64657300),  // name = dk_Provides
+  8,
+  ACE_NTOHL (0x646b5f55), 
+  ACE_NTOHL (0x73657300),  // name = dk_Uses
+  9,
+  ACE_NTOHL (0x646b5f45), 
+  ACE_NTOHL (0x76656e74), 
+  ACE_NTOHL (0x0),  // name = dk_Event
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_DefinitionKind (
     CORBA::tk_enum,
@@ -323,7 +364,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::IRObject::_tao_class_id = 0;
 
@@ -370,8 +411,17 @@ tao_CORBA_IRObject_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_IRObject_marshal (
+    CORBA::IRObject_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::IRObject_var
@@ -497,7 +547,7 @@ CORBA::IRObject_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::IRObject_out
@@ -559,12 +609,12 @@ CORBA::IRObject_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ClientRequestInfo_i
 {
@@ -593,7 +643,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_IRObject_def_kind_get::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -651,7 +701,7 @@ TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (::CORBA::DefinitionKi
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_IRObject_destroy : public TAO_ClientRequestInfo_i
 {
@@ -676,7 +726,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_IRObject_destroy::TAO_ClientRequestInfo_CORBA_IRObject_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -728,7 +778,7 @@ TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -743,7 +793,7 @@ CORBA::_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::DefinitionKind CORBA::_TAO_IRObject_Remote_Proxy_Impl::def_kind (
     CORBA::Object *_collocated_tao_target_
@@ -810,81 +860,73 @@ CORBA::_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
           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);
+          
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::DefinitionKind _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> _tao_retval)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::DefinitionKind _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -895,7 +937,7 @@ CORBA::_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -919,7 +961,7 @@ CORBA::_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -931,24 +973,26 @@ CORBA::_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
       
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
     CORBA::Object *_collocated_tao_target_
@@ -1014,62 +1058,54 @@ void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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;
+          
+          _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 TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -1080,7 +1116,7 @@ void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -1104,7 +1140,7 @@ void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -1116,17 +1152,19 @@ void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -1135,7 +1173,7 @@ void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -1183,7 +1221,7 @@ CORBA::_TAO_IRObject_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::IRObject::IRObject (int collocated)
 {
@@ -1384,7 +1422,7 @@ const char* CORBA::IRObject::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::DefinitionKind CORBA::IRObject::def_kind (
     ACE_ENV_SINGLE_ARG_DECL
@@ -1404,7 +1442,7 @@ const char* CORBA::IRObject::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::IRObject::destroy (
     ACE_ENV_SINGLE_ARG_DECL
@@ -1424,7 +1462,7 @@ void CORBA::IRObject::destroy (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_IRObject[] =
 {
@@ -1438,11 +1476,11 @@ static const CORBA::Long _oc_CORBA_IRObject[] =
   ACE_NTOHL (0x4f626a65), 
   ACE_NTOHL (0x63743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/IRObject:1.0
-  9,
+    9,
   ACE_NTOHL (0x49524f62), 
   ACE_NTOHL (0x6a656374), 
   ACE_NTOHL (0x0),  // name = IRObject
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_IRObject (
     CORBA::tk_objref,
@@ -1462,7 +1500,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_VersionSpec[] =
 {
@@ -1477,11 +1515,11 @@ static const CORBA::Long _oc_CORBA_VersionSpec[] =
   ACE_NTOHL (0x6e537065), 
   ACE_NTOHL (0x633a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-  12,
+    12,
   ACE_NTOHL (0x56657273), 
   ACE_NTOHL (0x696f6e53), 
   ACE_NTOHL (0x70656300),  // name = VersionSpec
-  CORBA::tk_string, 
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -1503,7 +1541,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::Contained::_tao_class_id = 0;
 
@@ -1550,8 +1588,17 @@ tao_CORBA_Contained_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_Contained_marshal (
+    CORBA::Contained_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::Contained_var
@@ -1677,7 +1724,7 @@ CORBA::Contained_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::Contained_out
@@ -1739,12 +1786,12 @@ CORBA::Contained_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Contained_id_get : public TAO_ClientRequestInfo_i
 {
@@ -1773,7 +1820,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Contained_id_get::TAO_ClientRequestInfo_CORBA_Contained_id_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -1831,7 +1878,7 @@ TAO_ClientRequestInfo_CORBA_Contained_id_get::result (char * result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Contained_id_set : public TAO_ClientRequestInfo_i
 {
@@ -1858,7 +1905,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Contained_id_set::TAO_ClientRequestInfo_CORBA_Contained_id_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -1918,7 +1965,7 @@ TAO_ClientRequestInfo_CORBA_Contained_id_set::result (ACE_ENV_SINGLE_ARG_DECL)
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Contained_name_get : public TAO_ClientRequestInfo_i
 {
@@ -1947,7 +1994,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Contained_name_get::TAO_ClientRequestInfo_CORBA_Contained_name_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -2005,7 +2052,7 @@ TAO_ClientRequestInfo_CORBA_Contained_name_get::result (char * result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Contained_name_set : public TAO_ClientRequestInfo_i
 {
@@ -2032,7 +2079,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Contained_name_set::TAO_ClientRequestInfo_CORBA_Contained_name_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -2092,7 +2139,7 @@ TAO_ClientRequestInfo_CORBA_Contained_name_set::result (ACE_ENV_SINGLE_ARG_DECL)
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Contained_version_get : public TAO_ClientRequestInfo_i
 {
@@ -2121,7 +2168,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Contained_version_get::TAO_ClientRequestInfo_CORBA_Contained_version_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -2179,7 +2226,7 @@ TAO_ClientRequestInfo_CORBA_Contained_version_get::result (char * result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Contained_version_set : public TAO_ClientRequestInfo_i
 {
@@ -2206,7 +2253,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Contained_version_set::TAO_ClientRequestInfo_CORBA_Contained_version_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -2266,7 +2313,7 @@ TAO_ClientRequestInfo_CORBA_Contained_version_set::result (ACE_ENV_SINGLE_ARG_DE
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Contained_defined_in_get : public TAO_ClientRequestInfo_i
 {
@@ -2295,7 +2342,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Contained_defined_in_get::TAO_ClientRequestInfo_CORBA_Contained_defined_in_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -2353,7 +2400,7 @@ TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (::CORBA::Container
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get : public TAO_ClientRequestInfo_i
 {
@@ -2382,7 +2429,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Contained_absolute_name_get::TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -2440,7 +2487,7 @@ TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::result (char * result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get : public TAO_ClientRequestInfo_i
 {
@@ -2469,7 +2516,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Contained_containing_repository_get::TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -2527,7 +2574,7 @@ TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (::CORBA
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Contained_describe : public TAO_ClientRequestInfo_i
 {
@@ -2556,7 +2603,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Contained_describe::TAO_ClientRequestInfo_CORBA_Contained_describe (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -2614,7 +2661,7 @@ TAO_ClientRequestInfo_CORBA_Contained_describe::result (::CORBA::Contained::Desc
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Contained_move : public TAO_ClientRequestInfo_i
 {
@@ -2645,7 +2692,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Contained_move::TAO_ClientRequestInfo_CORBA_Contained_move (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -2719,7 +2766,7 @@ TAO_ClientRequestInfo_CORBA_Contained_move::result (ACE_ENV_SINGLE_ARG_DECL)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -2734,7 +2781,7 @@ CORBA::_TAO_Contained_Remote_Proxy_Impl::_TAO_Contained_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 char * CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
     CORBA::Object *_collocated_tao_target_
@@ -2801,82 +2848,74 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  char * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          char * _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
         {
@@ -2887,7 +2926,7 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -2911,7 +2950,7 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -2923,24 +2962,26 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
     CORBA::Object *_collocated_tao_target_,
@@ -3008,74 +3049,66 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -3086,7 +3119,7 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3110,7 +3143,7 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3122,22 +3155,24 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 char * CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
     CORBA::Object *_collocated_tao_target_
@@ -3204,82 +3239,74 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  char * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          char * _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
         {
@@ -3290,7 +3317,7 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3314,7 +3341,7 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3326,24 +3353,26 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
     CORBA::Object *_collocated_tao_target_,
@@ -3411,74 +3440,66 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << name)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << name)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -3489,7 +3510,7 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3513,7 +3534,7 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3525,22 +3546,24 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 char * CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
     CORBA::Object *_collocated_tao_target_
@@ -3607,82 +3630,74 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  char * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          char * _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
         {
@@ -3693,7 +3708,7 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3717,7 +3732,7 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3729,24 +3744,26 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
     CORBA::Object *_collocated_tao_target_,
@@ -3814,74 +3831,66 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << version)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << version)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -3892,7 +3901,7 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3916,7 +3925,7 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3928,22 +3937,24 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::Container_ptr CORBA::_TAO_Contained_Remote_Proxy_Impl::defined_in (
     CORBA::Object *_collocated_tao_target_
@@ -4010,82 +4021,74 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::Container_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::Container_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
         {
@@ -4096,7 +4099,7 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -4120,7 +4123,7 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -4132,24 +4135,26 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
     CORBA::Object *_collocated_tao_target_
@@ -4216,82 +4221,74 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  char * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          char * _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
         {
@@ -4302,7 +4299,7 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -4326,7 +4323,7 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -4338,24 +4335,26 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::Repository_ptr CORBA::_TAO_Contained_Remote_Proxy_Impl::containing_repository (
     CORBA::Object *_collocated_tao_target_
@@ -4422,82 +4421,74 @@ return _tao_retval._retn ();
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::Repository_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::Repository_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
         {
@@ -4508,7 +4499,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -4532,7 +4523,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -4544,24 +4535,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::Contained::Description * CORBA::_TAO_Contained_Remote_Proxy_Impl::describe (
     CORBA::Object *_collocated_tao_target_
@@ -4634,82 +4627,74 @@ return _tao_retval._retn ();
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::Contained::Description * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::Contained::Description * _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
         {
@@ -4720,7 +4705,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -4744,7 +4729,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -4756,24 +4741,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_Contained_Remote_Proxy_Impl::move (
     CORBA::Object *_collocated_tao_target_,
@@ -4845,76 +4832,68 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::move (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << new_container) &&
+              (_tao_out << new_name) &&
+              (_tao_out << new_version)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << new_container) &&
-                  (_tao_out << new_name) &&
-                  (_tao_out << new_version)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -4925,7 +4904,7 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::move (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -4949,7 +4928,7 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::move (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -4961,17 +4940,19 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::move (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -4980,7 +4961,7 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::move (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -5028,7 +5009,7 @@ CORBA::_TAO_Contained_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::Contained::Contained (int collocated)
 {
@@ -5249,7 +5230,7 @@ const char* CORBA::Contained::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 char * CORBA::Contained::id (
     ACE_ENV_SINGLE_ARG_DECL
@@ -5269,7 +5250,7 @@ char * CORBA::Contained::id (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::Contained::id (
     const char * id
@@ -5291,7 +5272,7 @@ void CORBA::Contained::id (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 char * CORBA::Contained::name (
     ACE_ENV_SINGLE_ARG_DECL
@@ -5311,7 +5292,7 @@ char * CORBA::Contained::name (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::Contained::name (
     const char * name
@@ -5333,7 +5314,7 @@ void CORBA::Contained::name (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 char * CORBA::Contained::version (
     ACE_ENV_SINGLE_ARG_DECL
@@ -5353,7 +5334,7 @@ char * CORBA::Contained::version (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::Contained::version (
     const char * version
@@ -5375,7 +5356,7 @@ void CORBA::Contained::version (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::Container_ptr CORBA::Contained::defined_in (
     ACE_ENV_SINGLE_ARG_DECL
@@ -5395,7 +5376,7 @@ void CORBA::Contained::version (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 char * CORBA::Contained::absolute_name (
     ACE_ENV_SINGLE_ARG_DECL
@@ -5415,7 +5396,7 @@ char * CORBA::Contained::absolute_name (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::Repository_ptr CORBA::Contained::containing_repository (
     ACE_ENV_SINGLE_ARG_DECL
@@ -5435,7 +5416,7 @@ char * CORBA::Contained::absolute_name (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_Contained_Description[] =
 {
@@ -5452,16 +5433,16 @@ static const CORBA::Long _oc_CORBA_Contained_Description[] =
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained/Description:1.0
-  12,
+    12,
   ACE_NTOHL (0x44657363), 
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = Description
   2, // member count
-  5,
+    5,
   ACE_NTOHL (0x6b696e64), 
   ACE_NTOHL (0x0),  // name = kind
-  CORBA::tk_enum, // typecode kind
-  524, // encapsulation length
+    CORBA::tk_enum, // typecode kind
+  684, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     37,
     ACE_NTOHL (0x49444c3a), 
@@ -5474,130 +5455,170 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x4b696e64), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
-15,
+    15,
     ACE_NTOHL (0x44656669), 
     ACE_NTOHL (0x6e697469), 
     ACE_NTOHL (0x6f6e4b69), 
     ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-    26, // member count
-8,
+    36, // member count
+    8,
     ACE_NTOHL (0x646b5f6e), 
     ACE_NTOHL (0x6f6e6500),  // name = dk_none
-7,
+    7,
     ACE_NTOHL (0x646b5f61), 
     ACE_NTOHL (0x6c6c0000),  // name = dk_all
-13,
+    13,
     ACE_NTOHL (0x646b5f41), 
     ACE_NTOHL (0x74747269), 
     ACE_NTOHL (0x62757465), 
     ACE_NTOHL (0x0),  // name = dk_Attribute
-12,
+    12,
     ACE_NTOHL (0x646b5f43), 
     ACE_NTOHL (0x6f6e7374), 
     ACE_NTOHL (0x616e7400),  // name = dk_Constant
-13,
+    13,
     ACE_NTOHL (0x646b5f45), 
     ACE_NTOHL (0x78636570), 
     ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x0),  // name = dk_Exception
-13,
+    13,
     ACE_NTOHL (0x646b5f49), 
     ACE_NTOHL (0x6e746572), 
     ACE_NTOHL (0x66616365), 
     ACE_NTOHL (0x0),  // name = dk_Interface
-10,
+    10,
     ACE_NTOHL (0x646b5f4d), 
     ACE_NTOHL (0x6f64756c), 
     ACE_NTOHL (0x65000000),  // name = dk_Module
-13,
+    13,
     ACE_NTOHL (0x646b5f4f), 
     ACE_NTOHL (0x70657261), 
     ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x0),  // name = dk_Operation
-11,
+    11,
     ACE_NTOHL (0x646b5f54), 
     ACE_NTOHL (0x79706564), 
     ACE_NTOHL (0x65660000),  // name = dk_Typedef
-9,
+    9,
     ACE_NTOHL (0x646b5f41), 
     ACE_NTOHL (0x6c696173), 
     ACE_NTOHL (0x0),  // name = dk_Alias
-10,
+    10,
     ACE_NTOHL (0x646b5f53), 
     ACE_NTOHL (0x74727563), 
     ACE_NTOHL (0x74000000),  // name = dk_Struct
-9,
+    9,
     ACE_NTOHL (0x646b5f55), 
     ACE_NTOHL (0x6e696f6e), 
     ACE_NTOHL (0x0),  // name = dk_Union
-8,
+    8,
     ACE_NTOHL (0x646b5f45), 
     ACE_NTOHL (0x6e756d00),  // name = dk_Enum
-13,
+    13,
     ACE_NTOHL (0x646b5f50), 
     ACE_NTOHL (0x72696d69), 
     ACE_NTOHL (0x74697665), 
     ACE_NTOHL (0x0),  // name = dk_Primitive
-10,
+    10,
     ACE_NTOHL (0x646b5f53), 
     ACE_NTOHL (0x7472696e), 
     ACE_NTOHL (0x67000000),  // name = dk_String
-12,
+    12,
     ACE_NTOHL (0x646b5f53), 
     ACE_NTOHL (0x65717565), 
     ACE_NTOHL (0x6e636500),  // name = dk_Sequence
-9,
+    9,
     ACE_NTOHL (0x646b5f41), 
     ACE_NTOHL (0x72726179), 
     ACE_NTOHL (0x0),  // name = dk_Array
-14,
+    14,
     ACE_NTOHL (0x646b5f52), 
     ACE_NTOHL (0x65706f73), 
     ACE_NTOHL (0x69746f72), 
     ACE_NTOHL (0x79000000),  // name = dk_Repository
-11,
+    11,
     ACE_NTOHL (0x646b5f57), 
     ACE_NTOHL (0x73747269), 
     ACE_NTOHL (0x6e670000),  // name = dk_Wstring
-9,
+    9,
     ACE_NTOHL (0x646b5f46), 
     ACE_NTOHL (0x69786564), 
     ACE_NTOHL (0x0),  // name = dk_Fixed
-9,
+    9,
     ACE_NTOHL (0x646b5f56), 
     ACE_NTOHL (0x616c7565), 
     ACE_NTOHL (0x0),  // name = dk_Value
-12,
+    12,
     ACE_NTOHL (0x646b5f56), 
     ACE_NTOHL (0x616c7565), 
     ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
-15,
+    15,
     ACE_NTOHL (0x646b5f56), 
     ACE_NTOHL (0x616c7565), 
     ACE_NTOHL (0x4d656d62), 
     ACE_NTOHL (0x65720000),  // name = dk_ValueMember
-10,
+    10,
     ACE_NTOHL (0x646b5f4e), 
     ACE_NTOHL (0x61746976), 
     ACE_NTOHL (0x65000000),  // name = dk_Native
-21,
+    21,
     ACE_NTOHL (0x646b5f41), 
     ACE_NTOHL (0x62737472), 
     ACE_NTOHL (0x61637449), 
     ACE_NTOHL (0x6e746572), 
     ACE_NTOHL (0x66616365), 
     ACE_NTOHL (0x0),  // name = dk_AbstractInterface
-18,
+    18,
     ACE_NTOHL (0x646b5f4c), 
     ACE_NTOHL (0x6f63616c), 
     ACE_NTOHL (0x496e7465), 
     ACE_NTOHL (0x72666163), 
     ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
-
+    13,
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6d706f), 
+    ACE_NTOHL (0x6e656e74), 
+    ACE_NTOHL (0x0),  // name = dk_Component
+    8,
+    ACE_NTOHL (0x646b5f48), 
+    ACE_NTOHL (0x6f6d6500),  // name = dk_Home
+    11,
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x6163746f), 
+    ACE_NTOHL (0x72790000),  // name = dk_Factory
+    10,
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x696e6465), 
+    ACE_NTOHL (0x72000000),  // name = dk_Finder
+    9,
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x6d697473), 
+    ACE_NTOHL (0x0),  // name = dk_Emits
+    13,
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x75626c69), 
+    ACE_NTOHL (0x73686573), 
+    ACE_NTOHL (0x0),  // name = dk_Publishes
+    12,
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6e7375), 
+    ACE_NTOHL (0x6d657300),  // name = dk_Consumes
+    12,
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x726f7669), 
+    ACE_NTOHL (0x64657300),  // name = dk_Provides
+    8,
+    ACE_NTOHL (0x646b5f55), 
+    ACE_NTOHL (0x73657300),  // name = dk_Uses
+    9,
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x76656e74), 
+    ACE_NTOHL (0x0),  // name = dk_Event
+    
   6,
   ACE_NTOHL (0x76616c75), 
   ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_any,
+    CORBA::tk_any,
 
 };
 
@@ -5613,7 +5634,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Contained_Description (
   &_tc_TAO_tc_CORBA_Contained_Description;
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::Contained::Description::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -5622,7 +5643,7 @@ void CORBA::Contained::Description::_tao_any_destructor (void *_tao_void_pointer
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::Contained::Description * CORBA::Contained::describe (
     ACE_ENV_SINGLE_ARG_DECL
@@ -5642,7 +5663,7 @@ void CORBA::Contained::Description::_tao_any_destructor (void *_tao_void_pointer
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::Contained::move (
     CORBA::Container_ptr new_container,
@@ -5668,7 +5689,7 @@ void CORBA::Contained::move (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_Contained[] =
 {
@@ -5682,11 +5703,11 @@ static const CORBA::Long _oc_CORBA_Contained[] =
   ACE_NTOHL (0x6e746169), 
   ACE_NTOHL (0x6e65643a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
-  10,
+    10,
   ACE_NTOHL (0x436f6e74), 
   ACE_NTOHL (0x61696e65), 
   ACE_NTOHL (0x64000000),  // name = Contained
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_Contained (
     CORBA::tk_objref,
@@ -5706,234 +5727,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::Contained **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::Contained **old = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = CORBA::Contained::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::Contained **tmp = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Contained::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::Contained **tmp = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Contained::_nil ();
-    }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::Contained **tmp = ACE_static_cast (CORBA::Contained**, target);
-  *tmp = CORBA::Contained::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_upcast (void *src) const
-{
-  CORBA::Contained **tmp = ACE_static_cast (CORBA::Contained**, src);
-  return *tmp;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_CONTAINEDSEQ_CS_)
-#define _CORBA_CONTAINEDSEQ_CS_
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CORBA::ContainedSeq
-// *************************************************************
-
-CORBA::ContainedSeq::ContainedSeq (void)
-{}
-
-CORBA::ContainedSeq::ContainedSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::ContainedSeq::ContainedSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Contained_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::ContainedSeq::ContainedSeq (const ContainedSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::ContainedSeq::~ContainedSeq (void) // dtor
-{}
-
-void CORBA::ContainedSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ContainedSeq *tmp = ACE_static_cast (ContainedSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ContainedSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e746169), 
-  ACE_NTOHL (0x6e656453), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContainedSeq:1.0
-  13,
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x61696e65), 
-  ACE_NTOHL (0x64536571), 
-  ACE_NTOHL (0x0),  // name = ContainedSeq
-  CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      32,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f436f), 
-      ACE_NTOHL (0x6e746169), 
-      ACE_NTOHL (0x6e65643a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
-      10,
-      ACE_NTOHL (0x436f6e74), 
-      ACE_NTOHL (0x61696e65), 
-      ACE_NTOHL (0x64000000),  // name = Contained
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ContainedSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ContainedSeq),
-    (char *) &_oc_CORBA_ContainedSeq,
-    0,
-    sizeof (CORBA::ContainedSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ContainedSeq,
-    &_tc_TAO_tc_CORBA_ContainedSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -6035,7 +5829,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_upcast (void *src)
 #define _CORBA_INTERFACEDEFSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::InterfaceDefSeq
@@ -6097,7 +5891,7 @@ void CORBA::InterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_InterfaceDefSeq[] =
 {
@@ -6113,12 +5907,12 @@ static const CORBA::Long _oc_CORBA_InterfaceDefSeq[] =
   ACE_NTOHL (0x65665365), 
   ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InterfaceDefSeq:1.0
-  16,
+    16,
   ACE_NTOHL (0x496e7465), 
   ACE_NTOHL (0x72666163), 
   ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x53657100),  // name = InterfaceDefSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_objref, // typecode kind
@@ -6134,12 +5928,12 @@ static const CORBA::Long _oc_CORBA_InterfaceDefSeq[] =
       ACE_NTOHL (0x61636544), 
       ACE_NTOHL (0x65663a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-      13,
+            13,
       ACE_NTOHL (0x496e7465), 
       ACE_NTOHL (0x72666163), 
       ACE_NTOHL (0x65446566), 
       ACE_NTOHL (0x0),  // name = InterfaceDef
-
+      
     0U,
 
 };
@@ -6162,7 +5956,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -6264,7 +6058,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_upcast (void *src) con
 #define _CORBA_VALUEDEFSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::ValueDefSeq
@@ -6326,7 +6120,7 @@ void CORBA::ValueDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ValueDefSeq[] =
 {
@@ -6341,11 +6135,11 @@ static const CORBA::Long _oc_CORBA_ValueDefSeq[] =
   ACE_NTOHL (0x65665365), 
   ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueDefSeq:1.0
-  12,
+    12,
   ACE_NTOHL (0x56616c75), 
   ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x53657100),  // name = ValueDefSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_objref, // typecode kind
@@ -6360,11 +6154,11 @@ static const CORBA::Long _oc_CORBA_ValueDefSeq[] =
       ACE_NTOHL (0x6c756544), 
       ACE_NTOHL (0x65663a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-      9,
+            9,
       ACE_NTOHL (0x56616c75), 
       ACE_NTOHL (0x65446566), 
       ACE_NTOHL (0x0),  // name = ValueDef
-
+      
     0U,
 
 };
@@ -6387,7 +6181,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -6489,7 +6283,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_upcast (vo
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::AbstractInterfaceDefSeq
@@ -6551,7 +6345,7 @@ void CORBA::AbstractInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointe
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_AbstractInterfaceDefSeq[] =
 {
@@ -6569,14 +6363,14 @@ static const CORBA::Long _oc_CORBA_AbstractInterfaceDefSeq[] =
   ACE_NTOHL (0x65665365), 
   ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0
-  24,
+    24,
   ACE_NTOHL (0x41627374), 
   ACE_NTOHL (0x72616374), 
   ACE_NTOHL (0x496e7465), 
   ACE_NTOHL (0x72666163), 
   ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x53657100),  // name = AbstractInterfaceDefSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   96, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_objref, // typecode kind
@@ -6594,14 +6388,14 @@ static const CORBA::Long _oc_CORBA_AbstractInterfaceDefSeq[] =
       ACE_NTOHL (0x61636544), 
       ACE_NTOHL (0x65663a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDef:1.0
-      21,
+            21,
       ACE_NTOHL (0x41627374), 
       ACE_NTOHL (0x72616374), 
       ACE_NTOHL (0x496e7465), 
       ACE_NTOHL (0x72666163), 
       ACE_NTOHL (0x65446566), 
       ACE_NTOHL (0x0),  // name = AbstractInterfaceDef
-
+      
     0U,
 
 };
@@ -6624,7 +6418,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -6726,7 +6520,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_upcast (void
 #define _CORBA_LOCALINTERFACEDEFSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::LocalInterfaceDefSeq
@@ -6788,7 +6582,7 @@ void CORBA::LocalInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_LocalInterfaceDefSeq[] =
 {
@@ -6805,14 +6599,14 @@ static const CORBA::Long _oc_CORBA_LocalInterfaceDefSeq[] =
   ACE_NTOHL (0x44656653), 
   ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0
-  21,
+    21,
   ACE_NTOHL (0x4c6f6361), 
   ACE_NTOHL (0x6c496e74), 
   ACE_NTOHL (0x65726661), 
   ACE_NTOHL (0x63654465), 
   ACE_NTOHL (0x66536571), 
   ACE_NTOHL (0x0),  // name = LocalInterfaceDefSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   88, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_objref, // typecode kind
@@ -6829,13 +6623,13 @@ static const CORBA::Long _oc_CORBA_LocalInterfaceDefSeq[] =
       ACE_NTOHL (0x66616365), 
       ACE_NTOHL (0x4465663a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDef:1.0
-      18,
+            18,
       ACE_NTOHL (0x4c6f6361), 
       ACE_NTOHL (0x6c496e74), 
       ACE_NTOHL (0x65726661), 
       ACE_NTOHL (0x63654465), 
       ACE_NTOHL (0x66000000),  // name = LocalInterfaceDef
-
+      
     0U,
 
 };
@@ -6858,7 +6652,1171 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTINTERFACEDEFSEQ_CS_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTINTERFACEDEFSEQ_CS_
+
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::ExtInterfaceDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::ExtInterfaceDef **old = ACE_reinterpret_cast (CORBA::ExtInterfaceDef**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = tao_CORBA_ExtInterfaceDef_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
+
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ExtInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::ExtInterfaceDef**, this->buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tao_CORBA_ExtInterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_ExtInterfaceDef_nil ();
+    }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  CORBA::ExtInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::ExtInterfaceDef**, this->buffer_);
+  
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      tao_CORBA_ExtInterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_ExtInterfaceDef_nil ();
+    }
+}
+
+void 
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_downcast (
+    void* target,
+    CORBA::Object *src
+    ACE_ENV_ARG_DECL
+  )
+{
+  CORBA::ExtInterfaceDef **tmp = ACE_static_cast (CORBA::ExtInterfaceDef**, target);
+  *tmp = tao_CORBA_ExtInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+CORBA::Object*
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_upcast (void *src) const
+{
+  return tao_CORBA_ExtInterfaceDef_upcast (src);
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTINTERFACEDEFSEQ_CS_)
+#define _CORBA_EXTINTERFACEDEFSEQ_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
+
+// *************************************************************
+// CORBA::ExtInterfaceDefSeq
+// *************************************************************
+
+CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (void)
+{}
+
+CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::ExtInterfaceDef,CORBA::ExtInterfaceDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ExtInterfaceDef_ptr *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::ExtInterfaceDef,CORBA::ExtInterfaceDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (const ExtInterfaceDefSeq &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::ExtInterfaceDef,CORBA::ExtInterfaceDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ExtInterfaceDefSeq::~ExtInterfaceDefSeq (void) // dtor
+{}
+
+void CORBA::ExtInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtInterfaceDefSeq *tmp = ACE_static_cast (ExtInterfaceDefSeq*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExtInterfaceDefSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  41,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63654465), 
+  ACE_NTOHL (0x66536571), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInterfaceDefSeq:1.0
+    19,
+  ACE_NTOHL (0x45787449), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x44656653), 
+  ACE_NTOHL (0x65710000),  // name = ExtInterfaceDefSeq
+    CORBA::tk_sequence, // typecode kind
+  84, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_objref, // typecode kind
+    68, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      38,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x74496e74), 
+      ACE_NTOHL (0x65726661), 
+      ACE_NTOHL (0x63654465), 
+      ACE_NTOHL (0x663a312e), 
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtInterfaceDef:1.0
+            16,
+      ACE_NTOHL (0x45787449), 
+      ACE_NTOHL (0x6e746572), 
+      ACE_NTOHL (0x66616365), 
+      ACE_NTOHL (0x44656600),  // name = ExtInterfaceDef
+      
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInterfaceDefSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ExtInterfaceDefSeq),
+    (char *) &_oc_CORBA_ExtInterfaceDefSeq,
+    0,
+    sizeof (CORBA::ExtInterfaceDefSeq)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtInterfaceDefSeq,
+    &_tc_TAO_tc_CORBA_ExtInterfaceDefSeq
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTVALUEDEFSEQ_CS_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTVALUEDEFSEQ_CS_
+
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::ExtValueDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::ExtValueDef **old = ACE_reinterpret_cast (CORBA::ExtValueDef**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = tao_CORBA_ExtValueDef_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
+
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ExtValueDef **tmp = ACE_reinterpret_cast (CORBA::ExtValueDef**, this->buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tao_CORBA_ExtValueDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_ExtValueDef_nil ();
+    }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  CORBA::ExtValueDef **tmp = ACE_reinterpret_cast (CORBA::ExtValueDef**, this->buffer_);
+  
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      tao_CORBA_ExtValueDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_ExtValueDef_nil ();
+    }
+}
+
+void 
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_downcast (
+    void* target,
+    CORBA::Object *src
+    ACE_ENV_ARG_DECL
+  )
+{
+  CORBA::ExtValueDef **tmp = ACE_static_cast (CORBA::ExtValueDef**, target);
+  *tmp = tao_CORBA_ExtValueDef_narrow (src ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+CORBA::Object*
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_upcast (void *src) const
+{
+  return tao_CORBA_ExtValueDef_upcast (src);
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTVALUEDEFSEQ_CS_)
+#define _CORBA_EXTVALUEDEFSEQ_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
+
+// *************************************************************
+// CORBA::ExtValueDefSeq
+// *************************************************************
+
+CORBA::ExtValueDefSeq::ExtValueDefSeq (void)
+{}
+
+CORBA::ExtValueDefSeq::ExtValueDefSeq (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::ExtValueDef,CORBA::ExtValueDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ExtValueDefSeq::ExtValueDefSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ExtValueDef_ptr *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::ExtValueDef,CORBA::ExtValueDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ExtValueDefSeq::ExtValueDefSeq (const ExtValueDefSeq &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::ExtValueDef,CORBA::ExtValueDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ExtValueDefSeq::~ExtValueDefSeq (void) // dtor
+{}
+
+void CORBA::ExtValueDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtValueDefSeq *tmp = ACE_static_cast (ExtValueDefSeq*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExtValueDefSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x7456616c), 
+  ACE_NTOHL (0x75654465), 
+  ACE_NTOHL (0x66536571), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtValueDefSeq:1.0
+    15,
+  ACE_NTOHL (0x45787456), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x44656653), 
+  ACE_NTOHL (0x65710000),  // name = ExtValueDefSeq
+    CORBA::tk_sequence, // typecode kind
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_objref, // typecode kind
+    60, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      34,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x7456616c), 
+      ACE_NTOHL (0x75654465), 
+      ACE_NTOHL (0x663a312e), 
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtValueDef:1.0
+            12,
+      ACE_NTOHL (0x45787456), 
+      ACE_NTOHL (0x616c7565), 
+      ACE_NTOHL (0x44656600),  // name = ExtValueDef
+      
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtValueDefSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ExtValueDefSeq),
+    (char *) &_oc_CORBA_ExtValueDefSeq,
+    0,
+    sizeof (CORBA::ExtValueDefSeq)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtValueDefSeq,
+    &_tc_TAO_tc_CORBA_ExtValueDefSeq
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CS_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CS_
+
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::ExtAbstractInterfaceDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::ExtAbstractInterfaceDef **old = ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = tao_CORBA_ExtAbstractInterfaceDef_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
+
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ExtAbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef**, this->buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tao_CORBA_ExtAbstractInterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_ExtAbstractInterfaceDef_nil ();
+    }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  CORBA::ExtAbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef**, this->buffer_);
+  
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      tao_CORBA_ExtAbstractInterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_ExtAbstractInterfaceDef_nil ();
+    }
+}
+
+void 
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_downcast (
+    void* target,
+    CORBA::Object *src
+    ACE_ENV_ARG_DECL
+  )
+{
+  CORBA::ExtAbstractInterfaceDef **tmp = ACE_static_cast (CORBA::ExtAbstractInterfaceDef**, target);
+  *tmp = tao_CORBA_ExtAbstractInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+CORBA::Object*
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_upcast (void *src) const
+{
+  return tao_CORBA_ExtAbstractInterfaceDef_upcast (src);
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CS_)
+#define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
+
+// *************************************************************
+// CORBA::ExtAbstractInterfaceDefSeq
+// *************************************************************
+
+CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (void)
+{}
+
+CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ExtAbstractInterfaceDef_ptr *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (const ExtAbstractInterfaceDefSeq &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ExtAbstractInterfaceDefSeq::~ExtAbstractInterfaceDefSeq (void) // dtor
+{}
+
+void CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtAbstractInterfaceDefSeq *tmp = ACE_static_cast (ExtAbstractInterfaceDefSeq*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExtAbstractInterfaceDefSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  49,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74416273), 
+  ACE_NTOHL (0x74726163), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63654465), 
+  ACE_NTOHL (0x66536571), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtAbstractInterfaceDefSeq:1.0
+    27,
+  ACE_NTOHL (0x45787441), 
+  ACE_NTOHL (0x62737472), 
+  ACE_NTOHL (0x61637449), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x44656653), 
+  ACE_NTOHL (0x65710000),  // name = ExtAbstractInterfaceDefSeq
+    CORBA::tk_sequence, // typecode kind
+  100, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_objref, // typecode kind
+    84, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      46,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x74416273), 
+      ACE_NTOHL (0x74726163), 
+      ACE_NTOHL (0x74496e74), 
+      ACE_NTOHL (0x65726661), 
+      ACE_NTOHL (0x63654465), 
+      ACE_NTOHL (0x663a312e), 
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0
+            24,
+      ACE_NTOHL (0x45787441), 
+      ACE_NTOHL (0x62737472), 
+      ACE_NTOHL (0x61637449), 
+      ACE_NTOHL (0x6e746572), 
+      ACE_NTOHL (0x66616365), 
+      ACE_NTOHL (0x44656600),  // name = ExtAbstractInterfaceDef
+      
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtAbstractInterfaceDefSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ExtAbstractInterfaceDefSeq),
+    (char *) &_oc_CORBA_ExtAbstractInterfaceDefSeq,
+    0,
+    sizeof (CORBA::ExtAbstractInterfaceDefSeq)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtAbstractInterfaceDefSeq,
+    &_tc_TAO_tc_CORBA_ExtAbstractInterfaceDefSeq
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTLOCALINTERFACEDEFSEQ_CS_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTLOCALINTERFACEDEFSEQ_CS_
+
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::ExtLocalInterfaceDef **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::ExtLocalInterfaceDef **old = ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = tao_CORBA_ExtLocalInterfaceDef_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
+
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ExtLocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef**, this->buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tao_CORBA_ExtLocalInterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_ExtLocalInterfaceDef_nil ();
+    }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  CORBA::ExtLocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef**, this->buffer_);
+  
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      tao_CORBA_ExtLocalInterfaceDef_release (tmp[i]);
+      tmp[i] = tao_CORBA_ExtLocalInterfaceDef_nil ();
+    }
+}
+
+void 
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_downcast (
+    void* target,
+    CORBA::Object *src
+    ACE_ENV_ARG_DECL
+  )
+{
+  CORBA::ExtLocalInterfaceDef **tmp = ACE_static_cast (CORBA::ExtLocalInterfaceDef**, target);
+  *tmp = tao_CORBA_ExtLocalInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+CORBA::Object*
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_upcast (void *src) const
+{
+  return tao_CORBA_ExtLocalInterfaceDef_upcast (src);
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CS_)
+#define _CORBA_EXTLOCALINTERFACEDEFSEQ_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
+
+// *************************************************************
+// CORBA::ExtLocalInterfaceDefSeq
+// *************************************************************
+
+CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (void)
+{}
+
+CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ExtLocalInterfaceDef_ptr *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (const ExtLocalInterfaceDefSeq &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ExtLocalInterfaceDefSeq::~ExtLocalInterfaceDefSeq (void) // dtor
+{}
+
+void CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtLocalInterfaceDefSeq *tmp = ACE_static_cast (ExtLocalInterfaceDefSeq*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExtLocalInterfaceDefSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  46,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x744c6f63), 
+  ACE_NTOHL (0x616c496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636544), 
+  ACE_NTOHL (0x65665365), 
+  ACE_NTOHL (0x713a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtLocalInterfaceDefSeq:1.0
+    24,
+  ACE_NTOHL (0x4578744c), 
+  ACE_NTOHL (0x6f63616c), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65446566), 
+  ACE_NTOHL (0x53657100),  // name = ExtLocalInterfaceDefSeq
+    CORBA::tk_sequence, // typecode kind
+  96, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_objref, // typecode kind
+    80, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      43,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x744c6f63), 
+      ACE_NTOHL (0x616c496e), 
+      ACE_NTOHL (0x74657266), 
+      ACE_NTOHL (0x61636544), 
+      ACE_NTOHL (0x65663a31), 
+      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0
+            21,
+      ACE_NTOHL (0x4578744c), 
+      ACE_NTOHL (0x6f63616c), 
+      ACE_NTOHL (0x496e7465), 
+      ACE_NTOHL (0x72666163), 
+      ACE_NTOHL (0x65446566), 
+      ACE_NTOHL (0x0),  // name = ExtLocalInterfaceDef
+      
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtLocalInterfaceDefSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ExtLocalInterfaceDefSeq),
+    (char *) &_oc_CORBA_ExtLocalInterfaceDefSeq,
+    0,
+    sizeof (CORBA::ExtLocalInterfaceDefSeq)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtLocalInterfaceDefSeq,
+    &_tc_TAO_tc_CORBA_ExtLocalInterfaceDefSeq
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_
+
+// The Base_Sequence functions, please see tao/Sequence.h
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::Contained **tmp = 0;
+  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::Contained **old = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = CORBA::Contained::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
+
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::Contained **tmp = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = CORBA::Contained::_nil ();
+    }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+void
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+{
+  CORBA::Contained **tmp = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
+  
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = CORBA::Contained::_nil ();
+    }
+}
+
+void 
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_downcast (
+    void* target,
+    CORBA::Object *src
+    ACE_ENV_ARG_DECL
+  )
+{
+  CORBA::Contained **tmp = ACE_static_cast (CORBA::Contained**, target);
+  *tmp = CORBA::Contained::_narrow (src ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+CORBA::Object*
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_upcast (void *src) const
+{
+  CORBA::Contained **tmp = ACE_static_cast (CORBA::Contained**, src);
+  return *tmp;
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_CONTAINEDSEQ_CS_)
+#define _CORBA_CONTAINEDSEQ_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
+
+// *************************************************************
+// CORBA::ContainedSeq
+// *************************************************************
+
+CORBA::ContainedSeq::ContainedSeq (void)
+{}
+
+CORBA::ContainedSeq::ContainedSeq (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ContainedSeq::ContainedSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Contained_ptr *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ContainedSeq::ContainedSeq (const ContainedSeq &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ContainedSeq::~ContainedSeq (void) // dtor
+{}
+
+void CORBA::ContainedSeq::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ContainedSeq *tmp = ACE_static_cast (ContainedSeq*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ContainedSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  35,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e746169), 
+  ACE_NTOHL (0x6e656453), 
+  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContainedSeq:1.0
+    13,
+  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x61696e65), 
+  ACE_NTOHL (0x64536571), 
+  ACE_NTOHL (0x0),  // name = ContainedSeq
+    CORBA::tk_sequence, // typecode kind
+  72, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_objref, // typecode kind
+    56, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      32,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f436f), 
+      ACE_NTOHL (0x6e746169), 
+      ACE_NTOHL (0x6e65643a), 
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
+            10,
+      ACE_NTOHL (0x436f6e74), 
+      ACE_NTOHL (0x61696e65), 
+      ACE_NTOHL (0x64000000),  // name = Contained
+      
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ContainedSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ContainedSeq),
+    (char *) &_oc_CORBA_ContainedSeq,
+    0,
+    sizeof (CORBA::ContainedSeq)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ContainedSeq,
+    &_tc_TAO_tc_CORBA_ContainedSeq
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_StructMember[] =
 {
@@ -6873,16 +7831,16 @@ static const CORBA::Long _oc_CORBA_StructMember[] =
   ACE_NTOHL (0x4d656d62), 
   ACE_NTOHL (0x65723a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-  13,
+    13,
   ACE_NTOHL (0x53747275), 
   ACE_NTOHL (0x63744d65), 
   ACE_NTOHL (0x6d626572), 
   ACE_NTOHL (0x0),  // name = StructMember
   3, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -6895,23 +7853,23 @@ static const CORBA::Long _oc_CORBA_StructMember[] =
     ACE_NTOHL (0x66696572), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   5,
   ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
+    CORBA::tk_TypeCode,
 
   9,
   ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x5f646566), 
   ACE_NTOHL (0x0),  // name = type_def
-  CORBA::tk_objref, // typecode kind
+    CORBA::tk_objref, // typecode kind
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
@@ -6923,10 +7881,10 @@ static const CORBA::Long _oc_CORBA_StructMember[] =
     ACE_NTOHL (0x4c547970), 
     ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-    8,
+        8,
     ACE_NTOHL (0x49444c54), 
     ACE_NTOHL (0x79706500),  // name = IDLType
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMember (
@@ -6947,7 +7905,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::StructMember::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -6956,7 +7914,7 @@ void CORBA::StructMember::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -7015,7 +7973,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::~_TAO_Unbounded_Sequence_C
 #define _CORBA_STRUCTMEMBERSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::StructMemberSeq
@@ -7077,7 +8035,7 @@ void CORBA::StructMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
 {
@@ -7093,12 +8051,12 @@ static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
   ACE_NTOHL (0x65725365), 
   ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-  16,
+    16,
   ACE_NTOHL (0x53747275), 
   ACE_NTOHL (0x63744d65), 
   ACE_NTOHL (0x6d626572), 
   ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   264, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
@@ -7114,16 +8072,16 @@ static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
       ACE_NTOHL (0x4d656d62), 
       ACE_NTOHL (0x65723a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-      13,
+            13,
       ACE_NTOHL (0x53747275), 
       ACE_NTOHL (0x63744d65), 
       ACE_NTOHL (0x6d626572), 
       ACE_NTOHL (0x0),  // name = StructMember
       3, // member count
-      5,
+            5,
       ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
@@ -7136,23 +8094,23 @@ static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
         ACE_NTOHL (0x66696572), 
         ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
+                11,
         ACE_NTOHL (0x4964656e), 
         ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+                CORBA::tk_string, 
         0U, // string length
 
       5,
       ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
+            CORBA::tk_TypeCode,
 
       9,
       ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x5f646566), 
       ACE_NTOHL (0x0),  // name = type_def
-      CORBA::tk_objref, // typecode kind
+            CORBA::tk_objref, // typecode kind
       52, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
@@ -7164,10 +8122,10 @@ static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
         ACE_NTOHL (0x4c547970), 
         ACE_NTOHL (0x653a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8,
+                8,
         ACE_NTOHL (0x49444c54), 
         ACE_NTOHL (0x79706500),  // name = IDLType
-
+        
 
     0U,
 
@@ -7191,7 +8149,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_Initializer[] =
 {
@@ -7206,15 +8164,15 @@ static const CORBA::Long _oc_CORBA_Initializer[] =
   ACE_NTOHL (0x6c697a65), 
   ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
-  12,
+    12,
   ACE_NTOHL (0x496e6974), 
   ACE_NTOHL (0x69616c69), 
   ACE_NTOHL (0x7a657200),  // name = Initializer
   2, // member count
-  8,
+    8,
   ACE_NTOHL (0x6d656d62), 
   ACE_NTOHL (0x65727300),  // name = members
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   340, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
@@ -7228,12 +8186,12 @@ static const CORBA::Long _oc_CORBA_Initializer[] =
     ACE_NTOHL (0x65725365), 
     ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-    16,
+        16,
     ACE_NTOHL (0x53747275), 
     ACE_NTOHL (0x63744d65), 
     ACE_NTOHL (0x6d626572), 
     ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     264, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
@@ -7249,16 +8207,16 @@ static const CORBA::Long _oc_CORBA_Initializer[] =
         ACE_NTOHL (0x4d656d62), 
         ACE_NTOHL (0x65723a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-        13,
+                13,
         ACE_NTOHL (0x53747275), 
         ACE_NTOHL (0x63744d65), 
         ACE_NTOHL (0x6d626572), 
         ACE_NTOHL (0x0),  // name = StructMember
         3, // member count
-        5,
+                5,
         ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
@@ -7271,23 +8229,23 @@ static const CORBA::Long _oc_CORBA_Initializer[] =
           ACE_NTOHL (0x66696572), 
           ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11,
+                    11,
           ACE_NTOHL (0x4964656e), 
           ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
         ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
+                CORBA::tk_TypeCode,
 
         9,
         ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x5f646566), 
         ACE_NTOHL (0x0),  // name = type_def
-        CORBA::tk_objref, // typecode kind
+                CORBA::tk_objref, // typecode kind
         52, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           30,
@@ -7299,10 +8257,10 @@ static const CORBA::Long _oc_CORBA_Initializer[] =
           ACE_NTOHL (0x4c547970), 
           ACE_NTOHL (0x653a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-          8,
+                    8,
           ACE_NTOHL (0x49444c54), 
           ACE_NTOHL (0x79706500),  // name = IDLType
-
+          
 
       0U,
 
@@ -7310,7 +8268,7 @@ static const CORBA::Long _oc_CORBA_Initializer[] =
   5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff44, // negative offset (-188)
 };
 
@@ -7332,7 +8290,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::Initializer::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -7341,7 +8299,7 @@ void CORBA::Initializer::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -7400,7 +8358,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::~_TAO_Unbounded_Sequence_CO
 #define _CORBA_INITIALIZERSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::InitializerSeq
@@ -7462,7 +8420,7 @@ void CORBA::InitializerSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_InitializerSeq[] =
 {
@@ -7478,12 +8436,12 @@ static const CORBA::Long _oc_CORBA_InitializerSeq[] =
   ACE_NTOHL (0x72536571), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InitializerSeq:1.0
-  15,
+    15,
   ACE_NTOHL (0x496e6974), 
   ACE_NTOHL (0x69616c69), 
   ACE_NTOHL (0x7a657253), 
   ACE_NTOHL (0x65710000),  // name = InitializerSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   460, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
@@ -7499,15 +8457,15 @@ static const CORBA::Long _oc_CORBA_InitializerSeq[] =
       ACE_NTOHL (0x6c697a65), 
       ACE_NTOHL (0x723a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
-      12,
+            12,
       ACE_NTOHL (0x496e6974), 
       ACE_NTOHL (0x69616c69), 
       ACE_NTOHL (0x7a657200),  // name = Initializer
       2, // member count
-      8,
+            8,
       ACE_NTOHL (0x6d656d62), 
       ACE_NTOHL (0x65727300),  // name = members
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       340, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         38,
@@ -7521,12 +8479,12 @@ static const CORBA::Long _oc_CORBA_InitializerSeq[] =
         ACE_NTOHL (0x65725365), 
         ACE_NTOHL (0x713a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-        16,
+                16,
         ACE_NTOHL (0x53747275), 
         ACE_NTOHL (0x63744d65), 
         ACE_NTOHL (0x6d626572), 
         ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-        CORBA::tk_sequence, // typecode kind
+                CORBA::tk_sequence, // typecode kind
         264, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           CORBA::tk_struct, // typecode kind
@@ -7542,16 +8500,16 @@ static const CORBA::Long _oc_CORBA_InitializerSeq[] =
             ACE_NTOHL (0x4d656d62), 
             ACE_NTOHL (0x65723a31), 
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-            13,
+                        13,
             ACE_NTOHL (0x53747275), 
             ACE_NTOHL (0x63744d65), 
             ACE_NTOHL (0x6d626572), 
             ACE_NTOHL (0x0),  // name = StructMember
             3, // member count
-            5,
+                        5,
             ACE_NTOHL (0x6e616d65), 
             ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_alias, // typecode kind for typedefs
+                        CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               33,
@@ -7564,23 +8522,23 @@ static const CORBA::Long _oc_CORBA_InitializerSeq[] =
               ACE_NTOHL (0x66696572), 
               ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-              11,
+                            11,
               ACE_NTOHL (0x4964656e), 
               ACE_NTOHL (0x74696669), 
               ACE_NTOHL (0x65720000),  // name = Identifier
-              CORBA::tk_string, 
+                            CORBA::tk_string, 
               0U, // string length
 
             5,
             ACE_NTOHL (0x74797065), 
             ACE_NTOHL (0x0),  // name = type
-            CORBA::tk_TypeCode,
+                        CORBA::tk_TypeCode,
 
             9,
             ACE_NTOHL (0x74797065), 
             ACE_NTOHL (0x5f646566), 
             ACE_NTOHL (0x0),  // name = type_def
-            CORBA::tk_objref, // typecode kind
+                        CORBA::tk_objref, // typecode kind
             52, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               30,
@@ -7592,10 +8550,10 @@ static const CORBA::Long _oc_CORBA_InitializerSeq[] =
               ACE_NTOHL (0x4c547970), 
               ACE_NTOHL (0x653a312e), 
               ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-              8,
+                            8,
               ACE_NTOHL (0x49444c54), 
               ACE_NTOHL (0x79706500),  // name = IDLType
-
+              
 
           0U,
 
@@ -7603,7 +8561,7 @@ static const CORBA::Long _oc_CORBA_InitializerSeq[] =
       5,
       ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
-      0xffffffff, // indirection
+            0xffffffff, // indirection
       0xffffff44, // negative offset (-188)
 
     0U,
@@ -7628,7 +8586,1087 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExceptionDescription[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  43,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x696f6e44), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+    21,
+  ACE_NTOHL (0x45786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x0),  // name = ExceptionDescription
+  5, // member count
+    5,
+  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x0),  // name = name
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    33,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+        11,
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x65720000),  // name = Identifier
+        CORBA::tk_string, 
+    0U, // string length
+
+  3,
+  ACE_NTOHL (0x69640000),  // name = id
+    CORBA::tk_alias, // typecode kind for typedefs
+  72, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    35,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+        13,
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x0),  // name = RepositoryId
+        CORBA::tk_string, 
+    0U, // string length
+
+  11,
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x696e0000),  // name = defined_in
+    0xffffffff, // indirection
+  0xffffff9c, // negative offset (-100)
+  8,
+  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x696f6e00),  // name = version
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    34,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+        12,
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x70656300),  // name = VersionSpec
+        CORBA::tk_string, 
+    0U, // string length
+
+  5,
+  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x0),  // name = type
+    CORBA::tk_TypeCode,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDescription (
+    CORBA::tk_struct,
+    sizeof (_oc_CORBA_ExceptionDescription),
+    (char *) &_oc_CORBA_ExceptionDescription,
+    0,
+    sizeof (CORBA::ExceptionDescription)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExceptionDescription,
+    &_tc_TAO_tc_CORBA_ExceptionDescription
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
+
+void CORBA::ExceptionDescription::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExceptionDescription *tmp = ACE_static_cast (ExceptionDescription*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CS_
+
+void
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::ExceptionDescription* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::ExceptionDescription *old =
+        ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (old);
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
+
+void
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ExceptionDescription *tmp =
+    ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
+  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CS_)
+#define _CORBA_EXCDESCRIPTIONSEQ_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
+
+// *************************************************************
+// CORBA::ExcDescriptionSeq
+// *************************************************************
+
+CORBA::ExcDescriptionSeq::ExcDescriptionSeq (void)
+{}
+
+CORBA::ExcDescriptionSeq::ExcDescriptionSeq (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ExceptionDescription *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ExcDescriptionSeq::ExcDescriptionSeq (const ExcDescriptionSeq &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ExcDescriptionSeq::~ExcDescriptionSeq (void) // dtor
+{}
+
+void CORBA::ExcDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExcDescriptionSeq *tmp = ACE_static_cast (ExcDescriptionSeq*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExcDescriptionSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x63446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x5365713a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+    18,
+  ACE_NTOHL (0x45786344), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e5365), 
+  ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+    CORBA::tk_sequence, // typecode kind
+  404, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    388, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      43,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x63657074), 
+      ACE_NTOHL (0x696f6e44), 
+      ACE_NTOHL (0x65736372), 
+      ACE_NTOHL (0x69707469), 
+      ACE_NTOHL (0x6f6e3a31), 
+      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+            21,
+      ACE_NTOHL (0x45786365), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e446573), 
+      ACE_NTOHL (0x63726970), 
+      ACE_NTOHL (0x74696f6e), 
+      ACE_NTOHL (0x0),  // name = ExceptionDescription
+      5, // member count
+            5,
+      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x0),  // name = name
+            CORBA::tk_alias, // typecode kind for typedefs
+      68, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        33,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                11,
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x65720000),  // name = Identifier
+                CORBA::tk_string, 
+        0U, // string length
+
+      3,
+      ACE_NTOHL (0x69640000),  // name = id
+            CORBA::tk_alias, // typecode kind for typedefs
+      72, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        35,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                13,
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x0),  // name = RepositoryId
+                CORBA::tk_string, 
+        0U, // string length
+
+      11,
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x696e0000),  // name = defined_in
+            0xffffffff, // indirection
+      0xffffff9c, // negative offset (-100)
+      8,
+      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x696f6e00),  // name = version
+            CORBA::tk_alias, // typecode kind for typedefs
+      68, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        34,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                12,
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x70656300),  // name = VersionSpec
+                CORBA::tk_string, 
+        0U, // string length
+
+      5,
+      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x0),  // name = type
+            CORBA::tk_TypeCode,
+
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExcDescriptionSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ExcDescriptionSeq),
+    (char *) &_oc_CORBA_ExcDescriptionSeq,
+    0,
+    sizeof (CORBA::ExcDescriptionSeq)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExcDescriptionSeq,
+    &_tc_TAO_tc_CORBA_ExcDescriptionSeq
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExtInitializer[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74496e69), 
+  ACE_NTOHL (0x7469616c), 
+  ACE_NTOHL (0x697a6572), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInitializer:1.0
+    15,
+  ACE_NTOHL (0x45787449), 
+  ACE_NTOHL (0x6e697469), 
+  ACE_NTOHL (0x616c697a), 
+  ACE_NTOHL (0x65720000),  // name = ExtInitializer
+  3, // member count
+    8,
+  ACE_NTOHL (0x6d656d62), 
+  ACE_NTOHL (0x65727300),  // name = members
+    CORBA::tk_alias, // typecode kind for typedefs
+  340, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    38,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5374), 
+    ACE_NTOHL (0x72756374), 
+    ACE_NTOHL (0x4d656d62), 
+    ACE_NTOHL (0x65725365), 
+    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
+        16,
+    ACE_NTOHL (0x53747275), 
+    ACE_NTOHL (0x63744d65), 
+    ACE_NTOHL (0x6d626572), 
+    ACE_NTOHL (0x53657100),  // name = StructMemberSeq
+        CORBA::tk_sequence, // typecode kind
+    264, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      248, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        35,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5374), 
+        ACE_NTOHL (0x72756374), 
+        ACE_NTOHL (0x4d656d62), 
+        ACE_NTOHL (0x65723a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
+                13,
+        ACE_NTOHL (0x53747275), 
+        ACE_NTOHL (0x63744d65), 
+        ACE_NTOHL (0x6d626572), 
+        ACE_NTOHL (0x0),  // name = StructMember
+        3, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                CORBA::tk_alias, // typecode kind for typedefs
+        68, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          33,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                    11,
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
+          ACE_NTOHL (0x65720000),  // name = Identifier
+                    CORBA::tk_string, 
+          0U, // string length
+
+        5,
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x0),  // name = type
+                CORBA::tk_TypeCode,
+
+        9,
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x5f646566), 
+        ACE_NTOHL (0x0),  // name = type_def
+                CORBA::tk_objref, // typecode kind
+        52, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          30,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4944), 
+          ACE_NTOHL (0x4c547970), 
+          ACE_NTOHL (0x653a312e), 
+          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                    8,
+          ACE_NTOHL (0x49444c54), 
+          ACE_NTOHL (0x79706500),  // name = IDLType
+          
+
+      0U,
+
+
+  11,
+  ACE_NTOHL (0x65786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e730000),  // name = exceptions
+    CORBA::tk_alias, // typecode kind for typedefs
+  416, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    40,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x63446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+        18,
+    ACE_NTOHL (0x45786344), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+        CORBA::tk_sequence, // typecode kind
+    336, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      320, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        43,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x63657074), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                21,
+        ACE_NTOHL (0x45786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x0),  // name = ExceptionDescription
+        5, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                0xffffffff, // indirection
+        0xfffffe7c, // negative offset (-388)
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                CORBA::tk_alias, // typecode kind for typedefs
+        72, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          35,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                    13,
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x0),  // name = RepositoryId
+                    CORBA::tk_string, 
+          0U, // string length
+
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                0xffffffff, // indirection
+        0xffffff9c, // negative offset (-100)
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                CORBA::tk_alias, // typecode kind for typedefs
+        68, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          34,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
+          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                    12,
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
+          ACE_NTOHL (0x70656300),  // name = VersionSpec
+                    CORBA::tk_string, 
+          0U, // string length
+
+        5,
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x0),  // name = type
+                CORBA::tk_TypeCode,
+
+
+      0U,
+
+
+  5,
+  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x0),  // name = name
+    0xffffffff, // indirection
+  0xfffffd8c, // negative offset (-628)
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInitializer (
+    CORBA::tk_struct,
+    sizeof (_oc_CORBA_ExtInitializer),
+    (char *) &_oc_CORBA_ExtInitializer,
+    0,
+    sizeof (CORBA::ExtInitializer)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtInitializer,
+    &_tc_TAO_tc_CORBA_ExtInitializer
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
+
+void CORBA::ExtInitializer::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtInitializer *tmp = ACE_static_cast (ExtInitializer*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXTINITIALIZERSEQ_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXTINITIALIZERSEQ_CS_
+
+void
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::ExtInitializer* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::ExtInitializer *old =
+        ACE_reinterpret_cast (CORBA::ExtInitializer *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::freebuf (old);
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
+
+void
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ExtInitializer *tmp =
+    ACE_reinterpret_cast (CORBA::ExtInitializer *, this->buffer_);
+  _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::~_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTINITIALIZERSEQ_CS_)
+#define _CORBA_EXTINITIALIZERSEQ_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
+
+// *************************************************************
+// CORBA::ExtInitializerSeq
+// *************************************************************
+
+CORBA::ExtInitializerSeq::ExtInitializerSeq (void)
+{}
+
+CORBA::ExtInitializerSeq::ExtInitializerSeq (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ExtInitializer>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ExtInitializerSeq::ExtInitializerSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ExtInitializer *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ExtInitializer>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ExtInitializerSeq::ExtInitializerSeq (const ExtInitializerSeq &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ExtInitializer>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ExtInitializerSeq::~ExtInitializerSeq (void) // dtor
+{}
+
+void CORBA::ExtInitializerSeq::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtInitializerSeq *tmp = ACE_static_cast (ExtInitializerSeq*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExtInitializerSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74496e69), 
+  ACE_NTOHL (0x7469616c), 
+  ACE_NTOHL (0x697a6572), 
+  ACE_NTOHL (0x5365713a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtInitializerSeq:1.0
+    18,
+  ACE_NTOHL (0x45787449), 
+  ACE_NTOHL (0x6e697469), 
+  ACE_NTOHL (0x616c697a), 
+  ACE_NTOHL (0x65725365), 
+  ACE_NTOHL (0x71000000),  // name = ExtInitializerSeq
+    CORBA::tk_sequence, // typecode kind
+  908, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    892, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      37,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x74496e69), 
+      ACE_NTOHL (0x7469616c), 
+      ACE_NTOHL (0x697a6572), 
+      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInitializer:1.0
+            15,
+      ACE_NTOHL (0x45787449), 
+      ACE_NTOHL (0x6e697469), 
+      ACE_NTOHL (0x616c697a), 
+      ACE_NTOHL (0x65720000),  // name = ExtInitializer
+      3, // member count
+            8,
+      ACE_NTOHL (0x6d656d62), 
+      ACE_NTOHL (0x65727300),  // name = members
+            CORBA::tk_alias, // typecode kind for typedefs
+      340, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        38,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5374), 
+        ACE_NTOHL (0x72756374), 
+        ACE_NTOHL (0x4d656d62), 
+        ACE_NTOHL (0x65725365), 
+        ACE_NTOHL (0x713a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
+                16,
+        ACE_NTOHL (0x53747275), 
+        ACE_NTOHL (0x63744d65), 
+        ACE_NTOHL (0x6d626572), 
+        ACE_NTOHL (0x53657100),  // name = StructMemberSeq
+                CORBA::tk_sequence, // typecode kind
+        264, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          CORBA::tk_struct, // typecode kind
+          248, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            35,
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x434f5242), 
+            ACE_NTOHL (0x412f5374), 
+            ACE_NTOHL (0x72756374), 
+            ACE_NTOHL (0x4d656d62), 
+            ACE_NTOHL (0x65723a31), 
+            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
+                        13,
+            ACE_NTOHL (0x53747275), 
+            ACE_NTOHL (0x63744d65), 
+            ACE_NTOHL (0x6d626572), 
+            ACE_NTOHL (0x0),  // name = StructMember
+            3, // member count
+                        5,
+            ACE_NTOHL (0x6e616d65), 
+            ACE_NTOHL (0x0),  // name = name
+                        CORBA::tk_alias, // typecode kind for typedefs
+            68, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              33,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4964), 
+              ACE_NTOHL (0x656e7469), 
+              ACE_NTOHL (0x66696572), 
+              ACE_NTOHL (0x3a312e30), 
+              ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                            11,
+              ACE_NTOHL (0x4964656e), 
+              ACE_NTOHL (0x74696669), 
+              ACE_NTOHL (0x65720000),  // name = Identifier
+                            CORBA::tk_string, 
+              0U, // string length
+
+            5,
+            ACE_NTOHL (0x74797065), 
+            ACE_NTOHL (0x0),  // name = type
+                        CORBA::tk_TypeCode,
+
+            9,
+            ACE_NTOHL (0x74797065), 
+            ACE_NTOHL (0x5f646566), 
+            ACE_NTOHL (0x0),  // name = type_def
+                        CORBA::tk_objref, // typecode kind
+            52, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              30,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4944), 
+              ACE_NTOHL (0x4c547970), 
+              ACE_NTOHL (0x653a312e), 
+              ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                            8,
+              ACE_NTOHL (0x49444c54), 
+              ACE_NTOHL (0x79706500),  // name = IDLType
+              
+
+          0U,
+
+
+      11,
+      ACE_NTOHL (0x65786365), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e730000),  // name = exceptions
+            CORBA::tk_alias, // typecode kind for typedefs
+      416, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        40,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x63446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x5365713a), 
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+                18,
+        ACE_NTOHL (0x45786344), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e5365), 
+        ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+                CORBA::tk_sequence, // typecode kind
+        336, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          CORBA::tk_struct, // typecode kind
+          320, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            43,
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x434f5242), 
+            ACE_NTOHL (0x412f4578), 
+            ACE_NTOHL (0x63657074), 
+            ACE_NTOHL (0x696f6e44), 
+            ACE_NTOHL (0x65736372), 
+            ACE_NTOHL (0x69707469), 
+            ACE_NTOHL (0x6f6e3a31), 
+            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                        21,
+            ACE_NTOHL (0x45786365), 
+            ACE_NTOHL (0x7074696f), 
+            ACE_NTOHL (0x6e446573), 
+            ACE_NTOHL (0x63726970), 
+            ACE_NTOHL (0x74696f6e), 
+            ACE_NTOHL (0x0),  // name = ExceptionDescription
+            5, // member count
+                        5,
+            ACE_NTOHL (0x6e616d65), 
+            ACE_NTOHL (0x0),  // name = name
+                        0xffffffff, // indirection
+            0xfffffe7c, // negative offset (-388)
+            3,
+            ACE_NTOHL (0x69640000),  // name = id
+                        CORBA::tk_alias, // typecode kind for typedefs
+            72, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              35,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x49643a31), 
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                            13,
+              ACE_NTOHL (0x5265706f), 
+              ACE_NTOHL (0x7369746f), 
+              ACE_NTOHL (0x72794964), 
+              ACE_NTOHL (0x0),  // name = RepositoryId
+                            CORBA::tk_string, 
+              0U, // string length
+
+            11,
+            ACE_NTOHL (0x64656669), 
+            ACE_NTOHL (0x6e65645f), 
+            ACE_NTOHL (0x696e0000),  // name = defined_in
+                        0xffffffff, // indirection
+            0xffffff9c, // negative offset (-100)
+            8,
+            ACE_NTOHL (0x76657273), 
+            ACE_NTOHL (0x696f6e00),  // name = version
+                        CORBA::tk_alias, // typecode kind for typedefs
+            68, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              34,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5665), 
+              ACE_NTOHL (0x7273696f), 
+              ACE_NTOHL (0x6e537065), 
+              ACE_NTOHL (0x633a312e), 
+              ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                            12,
+              ACE_NTOHL (0x56657273), 
+              ACE_NTOHL (0x696f6e53), 
+              ACE_NTOHL (0x70656300),  // name = VersionSpec
+                            CORBA::tk_string, 
+              0U, // string length
+
+            5,
+            ACE_NTOHL (0x74797065), 
+            ACE_NTOHL (0x0),  // name = type
+                        CORBA::tk_TypeCode,
+
+
+          0U,
+
+
+      5,
+      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x0),  // name = name
+            0xffffffff, // indirection
+      0xfffffd8c, // negative offset (-628)
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInitializerSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ExtInitializerSeq),
+    (char *) &_oc_CORBA_ExtInitializerSeq,
+    0,
+    sizeof (CORBA::ExtInitializerSeq)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtInitializerSeq,
+    &_tc_TAO_tc_CORBA_ExtInitializerSeq
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_UnionMember[] =
 {
@@ -7643,15 +9681,15 @@ static const CORBA::Long _oc_CORBA_UnionMember[] =
   ACE_NTOHL (0x656d6265), 
   ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
-  12,
+    12,
   ACE_NTOHL (0x556e696f), 
   ACE_NTOHL (0x6e4d656d), 
   ACE_NTOHL (0x62657200),  // name = UnionMember
   4, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -7664,28 +9702,28 @@ static const CORBA::Long _oc_CORBA_UnionMember[] =
     ACE_NTOHL (0x66696572), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   6,
   ACE_NTOHL (0x6c616265), 
   ACE_NTOHL (0x6c000000),  // name = label
-  CORBA::tk_any,
+    CORBA::tk_any,
 
   5,
   ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
+    CORBA::tk_TypeCode,
 
   9,
   ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x5f646566), 
   ACE_NTOHL (0x0),  // name = type_def
-  CORBA::tk_objref, // typecode kind
+    CORBA::tk_objref, // typecode kind
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
@@ -7697,10 +9735,10 @@ static const CORBA::Long _oc_CORBA_UnionMember[] =
     ACE_NTOHL (0x4c547970), 
     ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-    8,
+        8,
     ACE_NTOHL (0x49444c54), 
     ACE_NTOHL (0x79706500),  // name = IDLType
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMember (
@@ -7721,7 +9759,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::UnionMember::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -7730,7 +9768,7 @@ void CORBA::UnionMember::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -7789,7 +9827,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::~_TAO_Unbounded_Sequence_CO
 #define _CORBA_UNIONMEMBERSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::UnionMemberSeq
@@ -7851,7 +9889,7 @@ void CORBA::UnionMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_UnionMemberSeq[] =
 {
@@ -7867,12 +9905,12 @@ static const CORBA::Long _oc_CORBA_UnionMemberSeq[] =
   ACE_NTOHL (0x72536571), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/UnionMemberSeq:1.0
-  15,
+    15,
   ACE_NTOHL (0x556e696f), 
   ACE_NTOHL (0x6e4d656d), 
   ACE_NTOHL (0x62657253), 
   ACE_NTOHL (0x65710000),  // name = UnionMemberSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   276, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
@@ -7888,15 +9926,15 @@ static const CORBA::Long _oc_CORBA_UnionMemberSeq[] =
       ACE_NTOHL (0x656d6265), 
       ACE_NTOHL (0x723a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
-      12,
+            12,
       ACE_NTOHL (0x556e696f), 
       ACE_NTOHL (0x6e4d656d), 
       ACE_NTOHL (0x62657200),  // name = UnionMember
       4, // member count
-      5,
+            5,
       ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
@@ -7909,28 +9947,28 @@ static const CORBA::Long _oc_CORBA_UnionMemberSeq[] =
         ACE_NTOHL (0x66696572), 
         ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
+                11,
         ACE_NTOHL (0x4964656e), 
         ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+                CORBA::tk_string, 
         0U, // string length
 
       6,
       ACE_NTOHL (0x6c616265), 
       ACE_NTOHL (0x6c000000),  // name = label
-      CORBA::tk_any,
+            CORBA::tk_any,
 
       5,
       ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
+            CORBA::tk_TypeCode,
 
       9,
       ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x5f646566), 
       ACE_NTOHL (0x0),  // name = type_def
-      CORBA::tk_objref, // typecode kind
+            CORBA::tk_objref, // typecode kind
       52, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
@@ -7942,10 +9980,10 @@ static const CORBA::Long _oc_CORBA_UnionMemberSeq[] =
         ACE_NTOHL (0x4c547970), 
         ACE_NTOHL (0x653a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8,
+                8,
         ACE_NTOHL (0x49444c54), 
         ACE_NTOHL (0x79706500),  // name = IDLType
-
+        
 
     0U,
 
@@ -7972,7 +10010,7 @@ TAO_NAMESPACE_END
 #define _CORBA_ENUMMEMBERSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::EnumMemberSeq
@@ -8034,7 +10072,7 @@ void CORBA::EnumMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_EnumMemberSeq[] =
 {
@@ -8049,12 +10087,12 @@ static const CORBA::Long _oc_CORBA_EnumMemberSeq[] =
   ACE_NTOHL (0x6d626572), 
   ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/EnumMemberSeq:1.0
-  14,
+    14,
   ACE_NTOHL (0x456e756d), 
   ACE_NTOHL (0x4d656d62), 
   ACE_NTOHL (0x65725365), 
   ACE_NTOHL (0x71000000),  // name = EnumMemberSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   84, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
@@ -8070,11 +10108,11 @@ static const CORBA::Long _oc_CORBA_EnumMemberSeq[] =
       ACE_NTOHL (0x66696572), 
       ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-      11,
+            11,
       ACE_NTOHL (0x4964656e), 
       ACE_NTOHL (0x74696669), 
       ACE_NTOHL (0x65720000),  // name = Identifier
-      CORBA::tk_string, 
+            CORBA::tk_string, 
       0U, // string length
 
     0U,
@@ -8099,7 +10137,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::Container::_tao_class_id = 0;
 
@@ -8146,8 +10184,17 @@ tao_CORBA_Container_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_Container_marshal (
+    CORBA::Container_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::Container_var
@@ -8273,7 +10320,7 @@ CORBA::Container_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::Container_out
@@ -8335,12 +10382,12 @@ CORBA::Container_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_lookup : public TAO_ClientRequestInfo_i
 {
@@ -8371,7 +10418,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_lookup::TAO_ClientRequestInfo_CORBA_Container_lookup (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -8439,7 +10486,7 @@ TAO_ClientRequestInfo_CORBA_Container_lookup::result (::CORBA::Contained_ptr res
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_contents : public TAO_ClientRequestInfo_i
 {
@@ -8472,7 +10519,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_contents::TAO_ClientRequestInfo_CORBA_Container_contents (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -8546,7 +10593,7 @@ TAO_ClientRequestInfo_CORBA_Container_contents::result (::CORBA::ContainedSeq *
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_lookup_name : public TAO_ClientRequestInfo_i
 {
@@ -8583,7 +10630,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_lookup_name::TAO_ClientRequestInfo_CORBA_Container_lookup_name (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -8669,7 +10716,7 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (::CORBA::ContainedSeq
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_describe_contents : public TAO_ClientRequestInfo_i
 {
@@ -8704,7 +10751,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_describe_contents::TAO_ClientRequestInfo_CORBA_Container_describe_contents (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -8784,7 +10831,7 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (::CORBA::Contai
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_module : public TAO_ClientRequestInfo_i
 {
@@ -8819,7 +10866,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_module::TAO_ClientRequestInfo_CORBA_Container_create_module (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -8899,7 +10946,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::result (::CORBA::ModuleDef_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_constant : public TAO_ClientRequestInfo_i
 {
@@ -8938,7 +10985,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_constant::TAO_ClientRequestInfo_CORBA_Container_create_constant (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -9030,7 +11077,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::result (::CORBA::Constant
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_struct : public TAO_ClientRequestInfo_i
 {
@@ -9067,7 +11114,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_struct::TAO_ClientRequestInfo_CORBA_Container_create_struct (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -9153,7 +11200,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::result (::CORBA::StructDef_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_union : public TAO_ClientRequestInfo_i
 {
@@ -9192,7 +11239,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_union::TAO_ClientRequestInfo_CORBA_Container_create_union (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -9284,7 +11331,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::result (::CORBA::UnionDef_pt
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_enum : public TAO_ClientRequestInfo_i
 {
@@ -9321,7 +11368,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_enum::TAO_ClientRequestInfo_CORBA_Container_create_enum (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -9407,7 +11454,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::result (::CORBA::EnumDef_ptr
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_alias : public TAO_ClientRequestInfo_i
 {
@@ -9444,7 +11491,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_alias::TAO_ClientRequestInfo_CORBA_Container_create_alias (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -9530,7 +11577,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::result (::CORBA::AliasDef_pt
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_interface : public TAO_ClientRequestInfo_i
 {
@@ -9567,7 +11614,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_interface::TAO_ClientRequestInfo_CORBA_Container_create_interface (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -9653,7 +11700,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::result (::CORBA::Interfa
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_value : public TAO_ClientRequestInfo_i
 {
@@ -9702,7 +11749,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_value::TAO_ClientRequestInfo_CORBA_Container_create_value (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -9824,7 +11871,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::result (::CORBA::ValueDef_pt
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_value_box : public TAO_ClientRequestInfo_i
 {
@@ -9861,7 +11908,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_value_box::TAO_ClientRequestInfo_CORBA_Container_create_value_box (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -9947,7 +11994,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (::CORBA::ValueBo
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_exception : public TAO_ClientRequestInfo_i
 {
@@ -9984,7 +12031,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_exception::TAO_ClientRequestInfo_CORBA_Container_create_exception (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -10070,7 +12117,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::result (::CORBA::Excepti
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_native : public TAO_ClientRequestInfo_i
 {
@@ -10105,7 +12152,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_native::TAO_ClientRequestInfo_CORBA_Container_create_native (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -10185,7 +12232,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::result (::CORBA::NativeDef_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface : public TAO_ClientRequestInfo_i
 {
@@ -10222,7 +12269,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_abstract_interface::TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -10308,7 +12355,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (::CORBA
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Container_create_local_interface : public TAO_ClientRequestInfo_i
 {
@@ -10345,7 +12392,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Container_create_local_interface::TAO_ClientRequestInfo_CORBA_Container_create_local_interface (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -10430,10 +12477,181 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (::CORBA::L
   this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_Container_create_ext_value : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_Container_create_ext_value (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA::Boolean & is_custom,
+      const CORBA::Boolean & is_abstract,
+      CORBA::ValueDef_ptr base_value,
+      const CORBA::Boolean & is_truncatable,
+      const CORBA::ValueDefSeq & abstract_base_values,
+      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA::ExtInitializerSeq & initializers
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::ExtValueDef_ptr result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_Container_create_ext_value (const TAO_ClientRequestInfo_CORBA_Container_create_ext_value &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_ext_value &);
+    const char * id_;
+    const char * name_;
+    const char * version_;
+    const CORBA::Boolean & is_custom_;
+    const CORBA::Boolean & is_abstract_;
+    CORBA::ValueDef_ptr base_value_;
+    const CORBA::Boolean & is_truncatable_;
+    const CORBA::ValueDefSeq & abstract_base_values_;
+    const CORBA::InterfaceDefSeq & supported_interfaces_;
+    const CORBA::ExtInitializerSeq & initializers_;
+    
+    ::CORBA::ExtValueDef_ptr _result;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_Container_create_ext_value::TAO_ClientRequestInfo_CORBA_Container_create_ext_value (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA::Boolean & is_custom,
+      const CORBA::Boolean & is_abstract,
+      CORBA::ValueDef_ptr base_value,
+      const CORBA::Boolean & is_truncatable,
+      const CORBA::ValueDefSeq & abstract_base_values,
+      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA::ExtInitializerSeq & initializers
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      id_ (id),
+      name_ (name),
+      version_ (version),
+      is_custom_ (is_custom),
+      is_abstract_ (is_abstract),
+      base_value_ (base_value),
+      is_truncatable_ (is_truncatable),
+      abstract_base_values_ (abstract_base_values),
+      supported_interfaces_ (supported_interfaces),
+      initializers_ (initializers)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_Container_create_ext_value::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (10);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_custom_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->base_value_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->abstract_base_values_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->supported_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->initializers_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_Container_create_ext_value::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_ext_value::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
+void 
+TAO_ClientRequestInfo_CORBA_Container_create_ext_value::result (::CORBA::ExtValueDef_ptr result)
+{
+  // Update the result. 
+  this->_result = result;
+}
+
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -10448,7 +12666,7 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::Contained_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::lookup (
     CORBA::Object *_collocated_tao_target_,
@@ -10517,95 +12735,87 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << search_name)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << search_name)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::Contained_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::Contained_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
         {
@@ -10616,7 +12826,7 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -10640,7 +12850,7 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -10652,24 +12862,26 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ContainedSeq * CORBA::_TAO_Container_Remote_Proxy_Impl::contents (
     CORBA::Object *_collocated_tao_target_,
@@ -10746,96 +12958,88 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << limit_type) &&
+              (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << limit_type) &&
-                  (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ContainedSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ContainedSeq * _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
         {
@@ -10846,7 +13050,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -10870,7 +13074,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -10882,24 +13086,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ContainedSeq * CORBA::_TAO_Container_Remote_Proxy_Impl::lookup_name (
     CORBA::Object *_collocated_tao_target_,
@@ -10980,98 +13186,90 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << search_name) &&
+              (_tao_out << levels_to_search) &&
+              (_tao_out << limit_type) &&
+              (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << search_name) &&
-                  (_tao_out << levels_to_search) &&
-                  (_tao_out << limit_type) &&
-                  (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ContainedSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ContainedSeq * _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
         {
@@ -11082,7 +13280,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -11106,7 +13304,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -11118,24 +13316,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::Container::DescriptionSeq * CORBA::_TAO_Container_Remote_Proxy_Impl::describe_contents (
     CORBA::Object *_collocated_tao_target_,
@@ -11214,97 +13414,89 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << limit_type) &&
+              (_tao_out << CORBA::Any::from_boolean (exclude_inherited)) &&
+              (_tao_out << max_returned_objs)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << limit_type) &&
-                  (_tao_out << CORBA::Any::from_boolean (exclude_inherited)) &&
-                  (_tao_out << max_returned_objs)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::Container::DescriptionSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::Container::DescriptionSeq * _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
         {
@@ -11315,7 +13507,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -11339,7 +13531,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -11351,24 +13543,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ModuleDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_module (
     CORBA::Object *_collocated_tao_target_,
@@ -11441,97 +13635,89 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ModuleDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ModuleDef_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
         {
@@ -11542,7 +13728,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -11566,7 +13752,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -11578,24 +13764,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ConstantDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_constant (
     CORBA::Object *_collocated_tao_target_,
@@ -11672,99 +13860,91 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << type) &&
+              (_tao_out << value)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << type) &&
-                  (_tao_out << value)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ConstantDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ConstantDef_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
         {
@@ -11775,7 +13955,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -11799,7 +13979,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -11811,24 +13991,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::StructDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_struct (
     CORBA::Object *_collocated_tao_target_,
@@ -11903,98 +14085,90 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << members)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << members)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::StructDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::StructDef_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
         {
@@ -12005,7 +14179,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12029,7 +14203,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12041,24 +14215,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::UnionDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_union (
     CORBA::Object *_collocated_tao_target_,
@@ -12135,99 +14311,91 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << discriminator_type) &&
+              (_tao_out << members)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << discriminator_type) &&
-                  (_tao_out << members)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::UnionDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::UnionDef_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
         {
@@ -12238,7 +14406,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12262,7 +14430,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12274,24 +14442,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::EnumDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_enum (
     CORBA::Object *_collocated_tao_target_,
@@ -12366,98 +14536,90 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << members)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << members)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::EnumDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::EnumDef_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
         {
@@ -12468,7 +14630,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12492,7 +14654,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12504,24 +14666,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::AliasDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_alias (
     CORBA::Object *_collocated_tao_target_,
@@ -12596,98 +14760,90 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << original_type)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << original_type)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::AliasDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::AliasDef_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
         {
@@ -12698,7 +14854,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12722,7 +14878,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12734,24 +14890,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::InterfaceDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_interface (
     CORBA::Object *_collocated_tao_target_,
@@ -12826,98 +14984,90 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << base_interfaces)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << base_interfaces)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::InterfaceDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::InterfaceDef_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
         {
@@ -12928,7 +15078,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12952,7 +15102,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12964,24 +15114,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ValueDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_value (
     CORBA::Object *_collocated_tao_target_,
@@ -13068,104 +15220,96 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
+              (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
+              (_tao_out << base_value) &&
+              (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
+              (_tao_out << abstract_base_values) &&
+              (_tao_out << supported_interfaces) &&
+              (_tao_out << initializers)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
-                  (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
-                  (_tao_out << base_value) &&
-                  (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
-                  (_tao_out << abstract_base_values) &&
-                  (_tao_out << supported_interfaces) &&
-                  (_tao_out << initializers)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ValueDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ValueDef_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
         {
@@ -13176,7 +15320,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13200,7 +15344,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13212,24 +15356,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ValueBoxDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_value_box (
     CORBA::Object *_collocated_tao_target_,
@@ -13304,98 +15450,90 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << original_type_def)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << original_type_def)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ValueBoxDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ValueBoxDef_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
         {
@@ -13406,7 +15544,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13430,7 +15568,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13442,24 +15580,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ExceptionDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_exception (
     CORBA::Object *_collocated_tao_target_,
@@ -13534,98 +15674,90 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << members)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << members)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ExceptionDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ExceptionDef_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
         {
@@ -13636,7 +15768,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13660,7 +15792,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13672,24 +15804,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::NativeDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_native (
     CORBA::Object *_collocated_tao_target_,
@@ -13762,97 +15896,89 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::NativeDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::NativeDef_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
         {
@@ -13863,7 +15989,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13887,7 +16013,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13899,24 +16025,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::AbstractInterfaceDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_abstract_interface (
     CORBA::Object *_collocated_tao_target_,
@@ -13991,98 +16119,90 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << base_interfaces)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << base_interfaces)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::AbstractInterfaceDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::AbstractInterfaceDef_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
         {
@@ -14093,7 +16213,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14117,7 +16237,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14129,24 +16249,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::LocalInterfaceDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_local_interface (
     CORBA::Object *_collocated_tao_target_,
@@ -14221,98 +16343,332 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << base_interfaces)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << base_interfaces)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
+          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_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
                     );
-                }
+                  ACE_TRY_CHECK;
+                )
               
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::LocalInterfaceDef_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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+::CORBA::ExtValueDef_ptr CORBA::_TAO_Container_Remote_Proxy_Impl::create_ext_value (
+    CORBA::Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA::Boolean is_custom,
+    CORBA::Boolean is_abstract,
+    CORBA::ValueDef_ptr base_value,
+    CORBA::Boolean is_truncatable,
+    const CORBA::ValueDefSeq & abstract_base_values,
+    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA::ExtInitializerSeq & initializers
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::ExtValueDef_var _tao_retval ( tao_CORBA_ExtValueDef_nil ());
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+    
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_ext_value",
+      16,
+      10,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_ext_value _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_,
+          id,
+          name,
+          version,
+          is_custom,
+          is_abstract,
+          base_value,
+          is_truncatable,
+          abstract_base_values,
+          supported_interfaces,
+          initializers
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
 #if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::LocalInterfaceDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
+              (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
+              (_tao_out << base_value) &&
+              (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
+              (_tao_out << abstract_base_values) &&
+              (_tao_out << supported_interfaces) &&
+              (_tao_out << initializers)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
+                );
+            }
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ExtValueDef_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
         {
@@ -14323,7 +16679,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14347,7 +16703,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14359,20 +16715,22 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 //
@@ -14380,7 +16738,7 @@ return _tao_retval._retn ();
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -14428,7 +16786,7 @@ CORBA::_TAO_Container_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::Container::Container (int collocated)
 {
@@ -14649,7 +17007,7 @@ const char* CORBA::Container::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::Contained_ptr CORBA::Container::lookup (
     const char * search_name
@@ -14671,7 +17029,7 @@ const char* CORBA::Container::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ContainedSeq * CORBA::Container::contents (
     CORBA::DefinitionKind limit_type,
@@ -14695,7 +17053,7 @@ const char* CORBA::Container::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ContainedSeq * CORBA::Container::lookup_name (
     const char * search_name,
@@ -14723,7 +17081,7 @@ const char* CORBA::Container::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_Container_Description[] =
 {
@@ -14740,18 +17098,18 @@ static const CORBA::Long _oc_CORBA_Container_Description[] =
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container/Description:1.0
-  12,
+    12,
   ACE_NTOHL (0x44657363), 
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = Description
   3, // member count
-  17,
+    17,
   ACE_NTOHL (0x636f6e74), 
   ACE_NTOHL (0x61696e65), 
   ACE_NTOHL (0x645f6f62), 
   ACE_NTOHL (0x6a656374), 
   ACE_NTOHL (0x0),  // name = contained_object
-  CORBA::tk_objref, // typecode kind
+    CORBA::tk_objref, // typecode kind
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
@@ -14763,16 +17121,16 @@ static const CORBA::Long _oc_CORBA_Container_Description[] =
     ACE_NTOHL (0x6e746169), 
     ACE_NTOHL (0x6e65643a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
-    10,
+        10,
     ACE_NTOHL (0x436f6e74), 
     ACE_NTOHL (0x61696e65), 
     ACE_NTOHL (0x64000000),  // name = Contained
-
+    
   5,
   ACE_NTOHL (0x6b696e64), 
   ACE_NTOHL (0x0),  // name = kind
-  CORBA::tk_enum, // typecode kind
-  524, // encapsulation length
+    CORBA::tk_enum, // typecode kind
+  684, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     37,
     ACE_NTOHL (0x49444c3a), 
@@ -14785,130 +17143,170 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x4b696e64), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
-15,
+    15,
     ACE_NTOHL (0x44656669), 
     ACE_NTOHL (0x6e697469), 
     ACE_NTOHL (0x6f6e4b69), 
     ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-    26, // member count
-8,
+    36, // member count
+    8,
     ACE_NTOHL (0x646b5f6e), 
     ACE_NTOHL (0x6f6e6500),  // name = dk_none
-7,
+    7,
     ACE_NTOHL (0x646b5f61), 
     ACE_NTOHL (0x6c6c0000),  // name = dk_all
-13,
+    13,
     ACE_NTOHL (0x646b5f41), 
     ACE_NTOHL (0x74747269), 
     ACE_NTOHL (0x62757465), 
     ACE_NTOHL (0x0),  // name = dk_Attribute
-12,
+    12,
     ACE_NTOHL (0x646b5f43), 
     ACE_NTOHL (0x6f6e7374), 
     ACE_NTOHL (0x616e7400),  // name = dk_Constant
-13,
+    13,
     ACE_NTOHL (0x646b5f45), 
     ACE_NTOHL (0x78636570), 
     ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x0),  // name = dk_Exception
-13,
+    13,
     ACE_NTOHL (0x646b5f49), 
     ACE_NTOHL (0x6e746572), 
     ACE_NTOHL (0x66616365), 
     ACE_NTOHL (0x0),  // name = dk_Interface
-10,
+    10,
     ACE_NTOHL (0x646b5f4d), 
     ACE_NTOHL (0x6f64756c), 
     ACE_NTOHL (0x65000000),  // name = dk_Module
-13,
+    13,
     ACE_NTOHL (0x646b5f4f), 
     ACE_NTOHL (0x70657261), 
     ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x0),  // name = dk_Operation
-11,
+    11,
     ACE_NTOHL (0x646b5f54), 
     ACE_NTOHL (0x79706564), 
     ACE_NTOHL (0x65660000),  // name = dk_Typedef
-9,
+    9,
     ACE_NTOHL (0x646b5f41), 
     ACE_NTOHL (0x6c696173), 
     ACE_NTOHL (0x0),  // name = dk_Alias
-10,
+    10,
     ACE_NTOHL (0x646b5f53), 
     ACE_NTOHL (0x74727563), 
     ACE_NTOHL (0x74000000),  // name = dk_Struct
-9,
+    9,
     ACE_NTOHL (0x646b5f55), 
     ACE_NTOHL (0x6e696f6e), 
     ACE_NTOHL (0x0),  // name = dk_Union
-8,
+    8,
     ACE_NTOHL (0x646b5f45), 
     ACE_NTOHL (0x6e756d00),  // name = dk_Enum
-13,
+    13,
     ACE_NTOHL (0x646b5f50), 
     ACE_NTOHL (0x72696d69), 
     ACE_NTOHL (0x74697665), 
     ACE_NTOHL (0x0),  // name = dk_Primitive
-10,
+    10,
     ACE_NTOHL (0x646b5f53), 
     ACE_NTOHL (0x7472696e), 
     ACE_NTOHL (0x67000000),  // name = dk_String
-12,
+    12,
     ACE_NTOHL (0x646b5f53), 
     ACE_NTOHL (0x65717565), 
     ACE_NTOHL (0x6e636500),  // name = dk_Sequence
-9,
+    9,
     ACE_NTOHL (0x646b5f41), 
     ACE_NTOHL (0x72726179), 
     ACE_NTOHL (0x0),  // name = dk_Array
-14,
+    14,
     ACE_NTOHL (0x646b5f52), 
     ACE_NTOHL (0x65706f73), 
     ACE_NTOHL (0x69746f72), 
     ACE_NTOHL (0x79000000),  // name = dk_Repository
-11,
+    11,
     ACE_NTOHL (0x646b5f57), 
     ACE_NTOHL (0x73747269), 
     ACE_NTOHL (0x6e670000),  // name = dk_Wstring
-9,
+    9,
     ACE_NTOHL (0x646b5f46), 
     ACE_NTOHL (0x69786564), 
     ACE_NTOHL (0x0),  // name = dk_Fixed
-9,
+    9,
     ACE_NTOHL (0x646b5f56), 
     ACE_NTOHL (0x616c7565), 
     ACE_NTOHL (0x0),  // name = dk_Value
-12,
+    12,
     ACE_NTOHL (0x646b5f56), 
     ACE_NTOHL (0x616c7565), 
     ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
-15,
+    15,
     ACE_NTOHL (0x646b5f56), 
     ACE_NTOHL (0x616c7565), 
     ACE_NTOHL (0x4d656d62), 
     ACE_NTOHL (0x65720000),  // name = dk_ValueMember
-10,
+    10,
     ACE_NTOHL (0x646b5f4e), 
     ACE_NTOHL (0x61746976), 
     ACE_NTOHL (0x65000000),  // name = dk_Native
-21,
+    21,
     ACE_NTOHL (0x646b5f41), 
     ACE_NTOHL (0x62737472), 
     ACE_NTOHL (0x61637449), 
     ACE_NTOHL (0x6e746572), 
     ACE_NTOHL (0x66616365), 
     ACE_NTOHL (0x0),  // name = dk_AbstractInterface
-18,
+    18,
     ACE_NTOHL (0x646b5f4c), 
     ACE_NTOHL (0x6f63616c), 
     ACE_NTOHL (0x496e7465), 
     ACE_NTOHL (0x72666163), 
     ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
-
+    13,
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6d706f), 
+    ACE_NTOHL (0x6e656e74), 
+    ACE_NTOHL (0x0),  // name = dk_Component
+    8,
+    ACE_NTOHL (0x646b5f48), 
+    ACE_NTOHL (0x6f6d6500),  // name = dk_Home
+    11,
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x6163746f), 
+    ACE_NTOHL (0x72790000),  // name = dk_Factory
+    10,
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x696e6465), 
+    ACE_NTOHL (0x72000000),  // name = dk_Finder
+    9,
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x6d697473), 
+    ACE_NTOHL (0x0),  // name = dk_Emits
+    13,
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x75626c69), 
+    ACE_NTOHL (0x73686573), 
+    ACE_NTOHL (0x0),  // name = dk_Publishes
+    12,
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6e7375), 
+    ACE_NTOHL (0x6d657300),  // name = dk_Consumes
+    12,
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x726f7669), 
+    ACE_NTOHL (0x64657300),  // name = dk_Provides
+    8,
+    ACE_NTOHL (0x646b5f55), 
+    ACE_NTOHL (0x73657300),  // name = dk_Uses
+    9,
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x76656e74), 
+    ACE_NTOHL (0x0),  // name = dk_Event
+    
   6,
   ACE_NTOHL (0x76616c75), 
   ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_any,
+    CORBA::tk_any,
 
 };
 
@@ -14924,7 +17322,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_Description (
   &_tc_TAO_tc_CORBA_Container_Description;
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::Container::Description::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -14933,7 +17331,7 @@ void CORBA::Container::Description::_tao_any_destructor (void *_tao_void_pointer
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -14992,7 +17390,7 @@ CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::~_TAO_
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::Container::DescriptionSeq
@@ -15054,7 +17452,7 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (void *_tao_void_poin
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
 {
@@ -15072,16 +17470,16 @@ static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
   ACE_NTOHL (0x696f6e53), 
   ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/Container/DescriptionSeq:1.0
-  15,
+    15,
   ACE_NTOHL (0x44657363), 
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e53), 
   ACE_NTOHL (0x65710000),  // name = DescriptionSeq
-  CORBA::tk_sequence, // typecode kind
-  736, // encapsulation length
+    CORBA::tk_sequence, // typecode kind
+  896, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
-    720, // encapsulation length
+    880, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       44,
       ACE_NTOHL (0x49444c3a), 
@@ -15095,18 +17493,18 @@ static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
       ACE_NTOHL (0x72697074), 
       ACE_NTOHL (0x696f6e3a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container/Description:1.0
-      12,
+            12,
       ACE_NTOHL (0x44657363), 
       ACE_NTOHL (0x72697074), 
       ACE_NTOHL (0x696f6e00),  // name = Description
       3, // member count
-      17,
+            17,
       ACE_NTOHL (0x636f6e74), 
       ACE_NTOHL (0x61696e65), 
       ACE_NTOHL (0x645f6f62), 
       ACE_NTOHL (0x6a656374), 
       ACE_NTOHL (0x0),  // name = contained_object
-      CORBA::tk_objref, // typecode kind
+            CORBA::tk_objref, // typecode kind
       56, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
@@ -15118,16 +17516,16 @@ static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
         ACE_NTOHL (0x6e746169), 
         ACE_NTOHL (0x6e65643a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
-        10,
+                10,
         ACE_NTOHL (0x436f6e74), 
         ACE_NTOHL (0x61696e65), 
         ACE_NTOHL (0x64000000),  // name = Contained
-
+        
       5,
       ACE_NTOHL (0x6b696e64), 
       ACE_NTOHL (0x0),  // name = kind
-      CORBA::tk_enum, // typecode kind
-      524, // encapsulation length
+            CORBA::tk_enum, // typecode kind
+      684, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         37,
         ACE_NTOHL (0x49444c3a), 
@@ -15140,130 +17538,170 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x4b696e64), 
         ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
-15,
+        15,
         ACE_NTOHL (0x44656669), 
         ACE_NTOHL (0x6e697469), 
         ACE_NTOHL (0x6f6e4b69), 
         ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-        26, // member count
-8,
+        36, // member count
+        8,
         ACE_NTOHL (0x646b5f6e), 
         ACE_NTOHL (0x6f6e6500),  // name = dk_none
-7,
+        7,
         ACE_NTOHL (0x646b5f61), 
         ACE_NTOHL (0x6c6c0000),  // name = dk_all
-13,
+        13,
         ACE_NTOHL (0x646b5f41), 
         ACE_NTOHL (0x74747269), 
         ACE_NTOHL (0x62757465), 
         ACE_NTOHL (0x0),  // name = dk_Attribute
-12,
+        12,
         ACE_NTOHL (0x646b5f43), 
         ACE_NTOHL (0x6f6e7374), 
         ACE_NTOHL (0x616e7400),  // name = dk_Constant
-13,
+        13,
         ACE_NTOHL (0x646b5f45), 
         ACE_NTOHL (0x78636570), 
         ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = dk_Exception
-13,
+        13,
         ACE_NTOHL (0x646b5f49), 
         ACE_NTOHL (0x6e746572), 
         ACE_NTOHL (0x66616365), 
         ACE_NTOHL (0x0),  // name = dk_Interface
-10,
+        10,
         ACE_NTOHL (0x646b5f4d), 
         ACE_NTOHL (0x6f64756c), 
         ACE_NTOHL (0x65000000),  // name = dk_Module
-13,
+        13,
         ACE_NTOHL (0x646b5f4f), 
         ACE_NTOHL (0x70657261), 
         ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = dk_Operation
-11,
+        11,
         ACE_NTOHL (0x646b5f54), 
         ACE_NTOHL (0x79706564), 
         ACE_NTOHL (0x65660000),  // name = dk_Typedef
-9,
+        9,
         ACE_NTOHL (0x646b5f41), 
         ACE_NTOHL (0x6c696173), 
         ACE_NTOHL (0x0),  // name = dk_Alias
-10,
+        10,
         ACE_NTOHL (0x646b5f53), 
         ACE_NTOHL (0x74727563), 
         ACE_NTOHL (0x74000000),  // name = dk_Struct
-9,
+        9,
         ACE_NTOHL (0x646b5f55), 
         ACE_NTOHL (0x6e696f6e), 
         ACE_NTOHL (0x0),  // name = dk_Union
-8,
+        8,
         ACE_NTOHL (0x646b5f45), 
         ACE_NTOHL (0x6e756d00),  // name = dk_Enum
-13,
+        13,
         ACE_NTOHL (0x646b5f50), 
         ACE_NTOHL (0x72696d69), 
         ACE_NTOHL (0x74697665), 
         ACE_NTOHL (0x0),  // name = dk_Primitive
-10,
+        10,
         ACE_NTOHL (0x646b5f53), 
         ACE_NTOHL (0x7472696e), 
         ACE_NTOHL (0x67000000),  // name = dk_String
-12,
+        12,
         ACE_NTOHL (0x646b5f53), 
         ACE_NTOHL (0x65717565), 
         ACE_NTOHL (0x6e636500),  // name = dk_Sequence
-9,
+        9,
         ACE_NTOHL (0x646b5f41), 
         ACE_NTOHL (0x72726179), 
         ACE_NTOHL (0x0),  // name = dk_Array
-14,
+        14,
         ACE_NTOHL (0x646b5f52), 
         ACE_NTOHL (0x65706f73), 
         ACE_NTOHL (0x69746f72), 
         ACE_NTOHL (0x79000000),  // name = dk_Repository
-11,
+        11,
         ACE_NTOHL (0x646b5f57), 
         ACE_NTOHL (0x73747269), 
         ACE_NTOHL (0x6e670000),  // name = dk_Wstring
-9,
+        9,
         ACE_NTOHL (0x646b5f46), 
         ACE_NTOHL (0x69786564), 
         ACE_NTOHL (0x0),  // name = dk_Fixed
-9,
+        9,
         ACE_NTOHL (0x646b5f56), 
         ACE_NTOHL (0x616c7565), 
         ACE_NTOHL (0x0),  // name = dk_Value
-12,
+        12,
         ACE_NTOHL (0x646b5f56), 
         ACE_NTOHL (0x616c7565), 
         ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
-15,
+        15,
         ACE_NTOHL (0x646b5f56), 
         ACE_NTOHL (0x616c7565), 
         ACE_NTOHL (0x4d656d62), 
         ACE_NTOHL (0x65720000),  // name = dk_ValueMember
-10,
+        10,
         ACE_NTOHL (0x646b5f4e), 
         ACE_NTOHL (0x61746976), 
         ACE_NTOHL (0x65000000),  // name = dk_Native
-21,
+        21,
         ACE_NTOHL (0x646b5f41), 
         ACE_NTOHL (0x62737472), 
         ACE_NTOHL (0x61637449), 
         ACE_NTOHL (0x6e746572), 
         ACE_NTOHL (0x66616365), 
         ACE_NTOHL (0x0),  // name = dk_AbstractInterface
-18,
+        18,
         ACE_NTOHL (0x646b5f4c), 
         ACE_NTOHL (0x6f63616c), 
         ACE_NTOHL (0x496e7465), 
         ACE_NTOHL (0x72666163), 
         ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
-
+        13,
+        ACE_NTOHL (0x646b5f43), 
+        ACE_NTOHL (0x6f6d706f), 
+        ACE_NTOHL (0x6e656e74), 
+        ACE_NTOHL (0x0),  // name = dk_Component
+        8,
+        ACE_NTOHL (0x646b5f48), 
+        ACE_NTOHL (0x6f6d6500),  // name = dk_Home
+        11,
+        ACE_NTOHL (0x646b5f46), 
+        ACE_NTOHL (0x6163746f), 
+        ACE_NTOHL (0x72790000),  // name = dk_Factory
+        10,
+        ACE_NTOHL (0x646b5f46), 
+        ACE_NTOHL (0x696e6465), 
+        ACE_NTOHL (0x72000000),  // name = dk_Finder
+        9,
+        ACE_NTOHL (0x646b5f45), 
+        ACE_NTOHL (0x6d697473), 
+        ACE_NTOHL (0x0),  // name = dk_Emits
+        13,
+        ACE_NTOHL (0x646b5f50), 
+        ACE_NTOHL (0x75626c69), 
+        ACE_NTOHL (0x73686573), 
+        ACE_NTOHL (0x0),  // name = dk_Publishes
+        12,
+        ACE_NTOHL (0x646b5f43), 
+        ACE_NTOHL (0x6f6e7375), 
+        ACE_NTOHL (0x6d657300),  // name = dk_Consumes
+        12,
+        ACE_NTOHL (0x646b5f50), 
+        ACE_NTOHL (0x726f7669), 
+        ACE_NTOHL (0x64657300),  // name = dk_Provides
+        8,
+        ACE_NTOHL (0x646b5f55), 
+        ACE_NTOHL (0x73657300),  // name = dk_Uses
+        9,
+        ACE_NTOHL (0x646b5f45), 
+        ACE_NTOHL (0x76656e74), 
+        ACE_NTOHL (0x0),  // name = dk_Event
+        
       6,
       ACE_NTOHL (0x76616c75), 
       ACE_NTOHL (0x65000000),  // name = value
-      CORBA::tk_any,
+            CORBA::tk_any,
 
 
     0U,
@@ -15282,7 +17720,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
   &_tc_TAO_tc_CORBA_Container_DescriptionSeq;
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::Container::DescriptionSeq * CORBA::Container::describe_contents (
     CORBA::DefinitionKind limit_type,
@@ -15308,7 +17746,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ModuleDef_ptr CORBA::Container::create_module (
     const char * id,
@@ -15334,7 +17772,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ConstantDef_ptr CORBA::Container::create_constant (
     const char * id,
@@ -15364,7 +17802,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::StructDef_ptr CORBA::Container::create_struct (
     const char * id,
@@ -15392,7 +17830,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::UnionDef_ptr CORBA::Container::create_union (
     const char * id,
@@ -15422,7 +17860,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::EnumDef_ptr CORBA::Container::create_enum (
     const char * id,
@@ -15450,7 +17888,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::AliasDef_ptr CORBA::Container::create_alias (
     const char * id,
@@ -15478,7 +17916,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::InterfaceDef_ptr CORBA::Container::create_interface (
     const char * id,
@@ -15506,7 +17944,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ValueDef_ptr CORBA::Container::create_value (
     const char * id,
@@ -15546,7 +17984,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ValueBoxDef_ptr CORBA::Container::create_value_box (
     const char * id,
@@ -15574,7 +18012,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ExceptionDef_ptr CORBA::Container::create_exception (
     const char * id,
@@ -15602,7 +18040,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::NativeDef_ptr CORBA::Container::create_native (
     const char * id,
@@ -15628,7 +18066,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::AbstractInterfaceDef_ptr CORBA::Container::create_abstract_interface (
     const char * id,
@@ -15656,7 +18094,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::LocalInterfaceDef_ptr CORBA::Container::create_local_interface (
     const char * id,
@@ -15684,7 +18122,47 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::ExtValueDef_ptr CORBA::Container::create_ext_value (
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA::Boolean is_custom,
+    CORBA::Boolean is_abstract,
+    CORBA::ValueDef_ptr base_value,
+    CORBA::Boolean is_truncatable,
+    const CORBA::ValueDefSeq & abstract_base_values,
+    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA::ExtInitializerSeq & initializers
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_Container_Proxy_Impl &proxy = 
+    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return proxy.create_ext_value (
+      this,
+      id,
+      name,
+      version,
+      is_custom,
+      is_abstract,
+      base_value,
+      is_truncatable,
+      abstract_base_values,
+      supported_interfaces,
+      initializers
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_Container[] =
 {
@@ -15698,11 +18176,11 @@ static const CORBA::Long _oc_CORBA_Container[] =
   ACE_NTOHL (0x6e746169), 
   ACE_NTOHL (0x6e65723a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container:1.0
-  10,
+    10,
   ACE_NTOHL (0x436f6e74), 
   ACE_NTOHL (0x61696e65), 
   ACE_NTOHL (0x72000000),  // name = Container
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_Container (
     CORBA::tk_objref,
@@ -15722,7 +18200,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::IDLType::_tao_class_id = 0;
 
@@ -15769,8 +18247,17 @@ tao_CORBA_IDLType_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_IDLType_marshal (
+    CORBA::IDLType_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::IDLType_var
@@ -15896,7 +18383,7 @@ CORBA::IDLType_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::IDLType_out
@@ -15958,12 +18445,12 @@ CORBA::IDLType_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_IDLType_type_get : public TAO_ClientRequestInfo_i
 {
@@ -15992,7 +18479,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_IDLType_type_get::TAO_ClientRequestInfo_CORBA_IDLType_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -16052,7 +18539,7 @@ TAO_ClientRequestInfo_CORBA_IDLType_type_get::result (CORBA::TypeCode_ptr result
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -16067,7 +18554,7 @@ CORBA::_TAO_IDLType_Remote_Proxy_Impl::_TAO_IDLType_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::TypeCode_ptr CORBA::_TAO_IDLType_Remote_Proxy_Impl::type (
     CORBA::Object *_collocated_tao_target_
@@ -16134,82 +18621,74 @@ CORBA::TypeCode_ptr CORBA::_TAO_IDLType_Remote_Proxy_Impl::type (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::TypeCode_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::TypeCode_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
         {
@@ -16220,7 +18699,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_IDLType_Remote_Proxy_Impl::type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -16244,7 +18723,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_IDLType_Remote_Proxy_Impl::type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -16256,20 +18735,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_IDLType_Remote_Proxy_Impl::type (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 //
@@ -16277,7 +18758,7 @@ return _tao_retval._retn ();
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -16325,7 +18806,7 @@ CORBA::_TAO_IDLType_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::IDLType::IDLType (int collocated)
 {
@@ -16546,7 +19027,7 @@ const char* CORBA::IDLType::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::TypeCode_ptr CORBA::IDLType::type (
     ACE_ENV_SINGLE_ARG_DECL
@@ -16566,7 +19047,7 @@ CORBA::TypeCode_ptr CORBA::IDLType::type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_IDLType[] =
 {
@@ -16580,10 +19061,10 @@ static const CORBA::Long _oc_CORBA_IDLType[] =
   ACE_NTOHL (0x4c547970), 
   ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-  8,
+    8,
   ACE_NTOHL (0x49444c54), 
   ACE_NTOHL (0x79706500),  // name = IDLType
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_IDLType (
     CORBA::tk_objref,
@@ -16603,7 +19084,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::TypedefDef::_tao_class_id = 0;
 
@@ -16650,8 +19131,17 @@ tao_CORBA_TypedefDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_TypedefDef_marshal (
+    CORBA::TypedefDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::TypedefDef_var
@@ -16777,7 +19267,7 @@ CORBA::TypedefDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::TypedefDef_out
@@ -16839,14 +19329,14 @@ CORBA::TypedefDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -16865,7 +19355,7 @@ CORBA::_TAO_TypedefDef_Remote_Proxy_Impl::_TAO_TypedefDef_Remote_Proxy_Impl (voi
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -16913,7 +19403,7 @@ CORBA::_TAO_TypedefDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::TypedefDef::TypedefDef (int collocated)
 {
@@ -17171,7 +19661,7 @@ const char* CORBA::TypedefDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_TypedefDef[] =
 {
@@ -17186,11 +19676,11 @@ static const CORBA::Long _oc_CORBA_TypedefDef[] =
   ACE_NTOHL (0x66446566), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/TypedefDef:1.0
-  11,
+    11,
   ACE_NTOHL (0x54797065), 
   ACE_NTOHL (0x64656644), 
   ACE_NTOHL (0x65660000),  // name = TypedefDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_TypedefDef (
     CORBA::tk_objref,
@@ -17210,7 +19700,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_TypeDescription[] =
 {
@@ -17226,16 +19716,16 @@ static const CORBA::Long _oc_CORBA_TypeDescription[] =
   ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/TypeDescription:1.0
-  16,
+    16,
   ACE_NTOHL (0x54797065), 
   ACE_NTOHL (0x44657363), 
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = TypeDescription
   5, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -17248,16 +19738,16 @@ static const CORBA::Long _oc_CORBA_TypeDescription[] =
     ACE_NTOHL (0x66696572), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
@@ -17270,24 +19760,24 @@ static const CORBA::Long _oc_CORBA_TypeDescription[] =
     ACE_NTOHL (0x746f7279), 
     ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
+        13,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x64656669), 
   ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
   ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
@@ -17300,17 +19790,17 @@ static const CORBA::Long _oc_CORBA_TypeDescription[] =
     ACE_NTOHL (0x6e537065), 
     ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
+        12,
     ACE_NTOHL (0x56657273), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   5,
   ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
+    CORBA::tk_TypeCode,
 
 };
 
@@ -17332,7 +19822,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::TypeDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -17341,52 +19831,44 @@ void CORBA::TypeDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::DefinitionKind _tao_elem)
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::DefinitionKind _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::insert (
+      _tao_any,
       CORBA::_tc_DefinitionKind,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DefinitionKind &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::DefinitionKind &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result = type->equivalent (CORBA::_tc_DefinitionKind ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      return 0; // not equivalent
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::extract (
+        _tao_any,
+        CORBA::_tc_DefinitionKind,
+        _tao_elem 
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -17398,26 +19880,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::IRObject_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_IRObject, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::IRObject::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::IRObject>::insert (
+      _tao_any,
+      CORBA::IRObject::_tao_any_destructor,
+      CORBA::_tc_IRObject,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -17426,62 +19901,37 @@ operator>>= (
     CORBA::IRObject_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::IRObject::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_IRObject
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::IRObject>::extract (
+        _tao_any,
+        CORBA::IRObject::_tao_any_destructor,
+        CORBA::_tc_IRObject,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_IRObject,
-            1,
-            _tao_elem,
-            CORBA::IRObject::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::IRObject::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::IRObject::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::IRObject>::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::IRObject,CORBA::IRObject_var>;
+  template class TAO::Any_Impl_T<CORBA::IRObject>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>
+# pragma instantiate TAO_Object_Manager<CORBA::IRObject, CORBA::IRObject_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::IRObject>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -17493,26 +19943,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::Contained_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_Contained, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::Contained::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::Contained>::insert (
+      _tao_any,
+      CORBA::Contained::_tao_any_destructor,
+      CORBA::_tc_Contained,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -17521,60 +19964,35 @@ operator>>= (
     CORBA::Contained_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::Contained::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_Contained
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::Contained>::extract (
+        _tao_any,
+        CORBA::Contained::_tao_any_destructor,
+        CORBA::_tc_Contained,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_Contained,
-            1,
-            _tao_elem,
-            CORBA::Contained::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::Contained::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::Contained::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::Contained>::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::Contained,CORBA::Contained_var>;
+  template class TAO::Any_Impl_T<CORBA::Contained>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var>
+# pragma instantiate TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::Contained>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -17582,16 +20000,12 @@ void operator<<= (
     const CORBA::Contained::Description &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::Contained::_tc_Description,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::insert_copy (
+      _tao_any,
+      CORBA::Contained::Description::_tao_any_destructor,
+      CORBA::Contained::_tc_Description,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -17600,19 +20014,12 @@ void operator<<= (
     CORBA::Contained::Description *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::Contained::_tc_Description,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::Contained::Description::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::insert (
+      _tao_any,
+      CORBA::Contained::Description::_tao_any_destructor,
+      CORBA::Contained::_tc_Description,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -17633,123 +20040,61 @@ CORBA::Boolean operator>>= (
     const CORBA::Contained::Description *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::Contained::_tc_Description
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::Contained::Description*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::Contained::Description *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::Contained::Description,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::Contained::_tc_Description,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::Contained::Description::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::extract (
+        _tao_any,
+        CORBA::Contained::Description::_tao_any_destructor,
+        CORBA::Contained::_tc_Description,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::Contained::Description>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Contained::Description>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::ContainedSeq &_tao_elem
+    const CORBA::InterfaceDefSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ContainedSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::InterfaceDefSeq::_tao_any_destructor,
+      CORBA::_tc_InterfaceDefSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    CORBA::ContainedSeq *_tao_elem
+    CORBA::InterfaceDefSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ContainedSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ContainedSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::InterfaceDefSeq::_tao_any_destructor,
+      CORBA::_tc_InterfaceDefSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    CORBA::ContainedSeq *&_tao_elem
+    CORBA::InterfaceDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::ContainedSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::InterfaceDefSeq *&,
       _tao_elem
     );
 }
@@ -17757,126 +20102,57 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const CORBA::ContainedSeq *&_tao_elem
+    const CORBA::InterfaceDefSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ContainedSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::ContainedSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::ContainedSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ContainedSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ContainedSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ContainedSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::InterfaceDefSeq::_tao_any_destructor,
+        CORBA::_tc_InterfaceDefSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::InterfaceDefSeq &_tao_elem
+    const CORBA::ValueDefSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_InterfaceDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ValueDefSeq::_tao_any_destructor,
+      CORBA::_tc_ValueDefSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    CORBA::InterfaceDefSeq *_tao_elem
+    CORBA::ValueDefSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_InterfaceDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::InterfaceDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert (
+      _tao_any,
+      CORBA::ValueDefSeq::_tao_any_destructor,
+      CORBA::_tc_ValueDefSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    CORBA::InterfaceDefSeq *&_tao_elem
+    CORBA::ValueDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::InterfaceDefSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ValueDefSeq *&,
       _tao_elem
     );
 }
@@ -17884,126 +20160,57 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const CORBA::InterfaceDefSeq *&_tao_elem
+    const CORBA::ValueDefSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_InterfaceDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::InterfaceDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::InterfaceDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::InterfaceDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_InterfaceDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::InterfaceDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::extract (
+        _tao_any,
+        CORBA::ValueDefSeq::_tao_any_destructor,
+        CORBA::_tc_ValueDefSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::ValueDefSeq &_tao_elem
+    const CORBA::AbstractInterfaceDefSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ValueDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
+      CORBA::_tc_AbstractInterfaceDefSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    CORBA::ValueDefSeq *_tao_elem
+    CORBA::AbstractInterfaceDefSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ValueDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ValueDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
+      CORBA::_tc_AbstractInterfaceDefSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    CORBA::ValueDefSeq *&_tao_elem
+    CORBA::AbstractInterfaceDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::ValueDefSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::AbstractInterfaceDefSeq *&,
       _tao_elem
     );
 }
@@ -18011,126 +20218,57 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const CORBA::ValueDefSeq *&_tao_elem
+    const CORBA::AbstractInterfaceDefSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ValueDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::ValueDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::ValueDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ValueDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ValueDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ValueDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
+        CORBA::_tc_AbstractInterfaceDefSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::AbstractInterfaceDefSeq &_tao_elem
+    const CORBA::LocalInterfaceDefSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_AbstractInterfaceDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
+      CORBA::_tc_LocalInterfaceDefSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDefSeq *_tao_elem
+    CORBA::LocalInterfaceDefSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_AbstractInterfaceDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::AbstractInterfaceDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
+      CORBA::_tc_LocalInterfaceDefSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDefSeq *&_tao_elem
+    CORBA::LocalInterfaceDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::AbstractInterfaceDefSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::LocalInterfaceDefSeq *&,
       _tao_elem
     );
 }
@@ -18138,126 +20276,57 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const CORBA::AbstractInterfaceDefSeq *&_tao_elem
+    const CORBA::LocalInterfaceDefSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_AbstractInterfaceDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::AbstractInterfaceDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::AbstractInterfaceDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::AbstractInterfaceDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_AbstractInterfaceDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::AbstractInterfaceDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
+        CORBA::_tc_LocalInterfaceDefSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::LocalInterfaceDefSeq &_tao_elem
+    const CORBA::ExtInterfaceDefSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_LocalInterfaceDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
+      CORBA::_tc_ExtInterfaceDefSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDefSeq *_tao_elem
+    CORBA::ExtInterfaceDefSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_LocalInterfaceDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::LocalInterfaceDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
+      CORBA::_tc_ExtInterfaceDefSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDefSeq *&_tao_elem
+    CORBA::ExtInterfaceDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::LocalInterfaceDefSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ExtInterfaceDefSeq *&,
       _tao_elem
     );
 }
@@ -18265,78 +20334,252 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const CORBA::LocalInterfaceDefSeq *&_tao_elem
+    const CORBA::ExtInterfaceDefSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_LocalInterfaceDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::LocalInterfaceDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::LocalInterfaceDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::LocalInterfaceDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_LocalInterfaceDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::LocalInterfaceDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
+        CORBA::_tc_ExtInterfaceDefSeq,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtValueDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtValueDefSeq::_tao_any_destructor,
+      CORBA::_tc_ExtValueDefSeq,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtValueDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::insert (
+      _tao_any,
+      CORBA::ExtValueDefSeq::_tao_any_destructor,
+      CORBA::_tc_ExtValueDefSeq,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtValueDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ExtValueDefSeq *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtValueDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::extract (
+        _tao_any,
+        CORBA::ExtValueDefSeq::_tao_any_destructor,
+        CORBA::_tc_ExtValueDefSeq,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtAbstractInterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
+      CORBA::_tc_ExtAbstractInterfaceDefSeq,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAbstractInterfaceDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
+      CORBA::_tc_ExtAbstractInterfaceDefSeq,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtAbstractInterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ExtAbstractInterfaceDefSeq *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtAbstractInterfaceDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
+        CORBA::_tc_ExtAbstractInterfaceDefSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtLocalInterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
+      CORBA::_tc_ExtLocalInterfaceDefSeq,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtLocalInterfaceDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
+      CORBA::_tc_ExtLocalInterfaceDefSeq,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtLocalInterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ExtLocalInterfaceDefSeq *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtLocalInterfaceDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
+        CORBA::_tc_ExtLocalInterfaceDefSeq,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ContainedSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::insert_copy (
+      _tao_any,
+      CORBA::ContainedSeq::_tao_any_destructor,
+      CORBA::_tc_ContainedSeq,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ContainedSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::insert (
+      _tao_any,
+      CORBA::ContainedSeq::_tao_any_destructor,
+      CORBA::_tc_ContainedSeq,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ContainedSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ContainedSeq *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ContainedSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::extract (
+        _tao_any,
+        CORBA::ContainedSeq::_tao_any_destructor,
+        CORBA::_tc_ContainedSeq,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -18344,16 +20587,12 @@ void operator<<= (
     const CORBA::StructMember &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_StructMember,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::StructMember>::insert_copy (
+      _tao_any,
+      CORBA::StructMember::_tao_any_destructor,
+      CORBA::_tc_StructMember,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -18362,19 +20601,12 @@ void operator<<= (
     CORBA::StructMember *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_StructMember,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::StructMember::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::StructMember>::insert (
+      _tao_any,
+      CORBA::StructMember::_tao_any_destructor,
+      CORBA::_tc_StructMember,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -18395,75 +20627,24 @@ CORBA::Boolean operator>>= (
     const CORBA::StructMember *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_StructMember
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::StructMember*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::StructMember *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::StructMember,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_StructMember,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::StructMember::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::StructMember>::extract (
+        _tao_any,
+        CORBA::StructMember::_tao_any_destructor,
+        CORBA::_tc_StructMember,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::StructMember>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::StructMember>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -18471,16 +20652,12 @@ void operator<<= (
     const CORBA::StructMemberSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_StructMemberSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert_copy (
+      _tao_any,
+      CORBA::StructMemberSeq::_tao_any_destructor,
+      CORBA::_tc_StructMemberSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -18489,19 +20666,12 @@ void operator<<= (
     CORBA::StructMemberSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_StructMemberSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::StructMemberSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert (
+      _tao_any,
+      CORBA::StructMemberSeq::_tao_any_destructor,
+      CORBA::_tc_StructMemberSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -18510,8 +20680,8 @@ CORBA::Boolean operator>>= (
     CORBA::StructMemberSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::StructMemberSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::StructMemberSeq *&,
       _tao_elem
     );
 }
@@ -18522,75 +20692,17 @@ CORBA::Boolean operator>>= (
     const CORBA::StructMemberSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_StructMemberSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::StructMemberSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::StructMemberSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::StructMemberSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_StructMemberSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::StructMemberSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::extract (
+        _tao_any,
+        CORBA::StructMemberSeq::_tao_any_destructor,
+        CORBA::_tc_StructMemberSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -18598,16 +20710,12 @@ void operator<<= (
     const CORBA::Initializer &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_Initializer,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::Initializer>::insert_copy (
+      _tao_any,
+      CORBA::Initializer::_tao_any_destructor,
+      CORBA::_tc_Initializer,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -18616,19 +20724,12 @@ void operator<<= (
     CORBA::Initializer *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_Initializer,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::Initializer::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::Initializer>::insert (
+      _tao_any,
+      CORBA::Initializer::_tao_any_destructor,
+      CORBA::_tc_Initializer,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -18649,75 +20750,24 @@ CORBA::Boolean operator>>= (
     const CORBA::Initializer *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_Initializer
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::Initializer*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::Initializer *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::Initializer,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_Initializer,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::Initializer::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Initializer>::extract (
+        _tao_any,
+        CORBA::Initializer::_tao_any_destructor,
+        CORBA::_tc_Initializer,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::Initializer>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Initializer>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -18725,16 +20775,12 @@ void operator<<= (
     const CORBA::InitializerSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_InitializerSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert_copy (
+      _tao_any,
+      CORBA::InitializerSeq::_tao_any_destructor,
+      CORBA::_tc_InitializerSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -18743,19 +20789,12 @@ void operator<<= (
     CORBA::InitializerSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_InitializerSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::InitializerSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert (
+      _tao_any,
+      CORBA::InitializerSeq::_tao_any_destructor,
+      CORBA::_tc_InitializerSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -18764,8 +20803,8 @@ CORBA::Boolean operator>>= (
     CORBA::InitializerSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::InitializerSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::InitializerSeq *&,
       _tao_elem
     );
 }
@@ -18776,75 +20815,263 @@ CORBA::Boolean operator>>= (
     const CORBA::InitializerSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_InitializerSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::InitializerSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::InitializerSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::InitializerSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_InitializerSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::InitializerSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::extract (
+        _tao_any,
+        CORBA::InitializerSeq::_tao_any_destructor,
+        CORBA::_tc_InitializerSeq,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExceptionDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::insert_copy (
+      _tao_any,
+      CORBA::ExceptionDescription::_tao_any_destructor,
+      CORBA::_tc_ExceptionDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExceptionDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::insert (
+      _tao_any,
+      CORBA::ExceptionDescription::_tao_any_destructor,
+      CORBA::_tc_ExceptionDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExceptionDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ExceptionDescription *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExceptionDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::extract (
+        _tao_any,
+        CORBA::ExceptionDescription::_tao_any_destructor,
+        CORBA::_tc_ExceptionDescription,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>
+#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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExcDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExcDescriptionSeq::_tao_any_destructor,
+      CORBA::_tc_ExcDescriptionSeq,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExcDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ExcDescriptionSeq::_tao_any_destructor,
+      CORBA::_tc_ExcDescriptionSeq,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExcDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ExcDescriptionSeq *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExcDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ExcDescriptionSeq::_tao_any_destructor,
+        CORBA::_tc_ExcDescriptionSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtInitializer &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>::insert_copy (
+      _tao_any,
+      CORBA::ExtInitializer::_tao_any_destructor,
+      CORBA::_tc_ExtInitializer,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtInitializer *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>::insert (
+      _tao_any,
+      CORBA::ExtInitializer::_tao_any_destructor,
+      CORBA::_tc_ExtInitializer,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtInitializer *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ExtInitializer *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtInitializer *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>::extract (
+        _tao_any,
+        CORBA::ExtInitializer::_tao_any_destructor,
+        CORBA::_tc_ExtInitializer,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>
+#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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtInitializerSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtInitializerSeq::_tao_any_destructor,
+      CORBA::_tc_ExtInitializerSeq,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtInitializerSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>::insert (
+      _tao_any,
+      CORBA::ExtInitializerSeq::_tao_any_destructor,
+      CORBA::_tc_ExtInitializerSeq,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtInitializerSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ExtInitializerSeq *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtInitializerSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>::extract (
+        _tao_any,
+        CORBA::ExtInitializerSeq::_tao_any_destructor,
+        CORBA::_tc_ExtInitializerSeq,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -18852,16 +21079,12 @@ void operator<<= (
     const CORBA::UnionMember &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_UnionMember,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::UnionMember>::insert_copy (
+      _tao_any,
+      CORBA::UnionMember::_tao_any_destructor,
+      CORBA::_tc_UnionMember,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -18870,19 +21093,12 @@ void operator<<= (
     CORBA::UnionMember *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_UnionMember,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::UnionMember::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::UnionMember>::insert (
+      _tao_any,
+      CORBA::UnionMember::_tao_any_destructor,
+      CORBA::_tc_UnionMember,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -18903,75 +21119,24 @@ CORBA::Boolean operator>>= (
     const CORBA::UnionMember *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_UnionMember
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::UnionMember*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::UnionMember *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::UnionMember,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_UnionMember,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::UnionMember::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::UnionMember>::extract (
+        _tao_any,
+        CORBA::UnionMember::_tao_any_destructor,
+        CORBA::_tc_UnionMember,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::UnionMember>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::UnionMember>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -18979,16 +21144,12 @@ void operator<<= (
     const CORBA::UnionMemberSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_UnionMemberSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert_copy (
+      _tao_any,
+      CORBA::UnionMemberSeq::_tao_any_destructor,
+      CORBA::_tc_UnionMemberSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -18997,19 +21158,12 @@ void operator<<= (
     CORBA::UnionMemberSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_UnionMemberSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::UnionMemberSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert (
+      _tao_any,
+      CORBA::UnionMemberSeq::_tao_any_destructor,
+      CORBA::_tc_UnionMemberSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -19018,8 +21172,8 @@ CORBA::Boolean operator>>= (
     CORBA::UnionMemberSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::UnionMemberSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::UnionMemberSeq *&,
       _tao_elem
     );
 }
@@ -19030,75 +21184,17 @@ CORBA::Boolean operator>>= (
     const CORBA::UnionMemberSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_UnionMemberSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::UnionMemberSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::UnionMemberSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::UnionMemberSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_UnionMemberSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::UnionMemberSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::extract (
+        _tao_any,
+        CORBA::UnionMemberSeq::_tao_any_destructor,
+        CORBA::_tc_UnionMemberSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -19106,16 +21202,12 @@ void operator<<= (
     const CORBA::EnumMemberSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_EnumMemberSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert_copy (
+      _tao_any,
+      CORBA::EnumMemberSeq::_tao_any_destructor,
+      CORBA::_tc_EnumMemberSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -19124,19 +21216,12 @@ void operator<<= (
     CORBA::EnumMemberSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_EnumMemberSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::EnumMemberSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert (
+      _tao_any,
+      CORBA::EnumMemberSeq::_tao_any_destructor,
+      CORBA::_tc_EnumMemberSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -19145,8 +21230,8 @@ CORBA::Boolean operator>>= (
     CORBA::EnumMemberSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::EnumMemberSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::EnumMemberSeq *&,
       _tao_elem
     );
 }
@@ -19157,77 +21242,19 @@ CORBA::Boolean operator>>= (
     const CORBA::EnumMemberSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_EnumMemberSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::EnumMemberSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::EnumMemberSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::EnumMemberSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_EnumMemberSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::EnumMemberSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::extract (
+        _tao_any,
+        CORBA::EnumMemberSeq::_tao_any_destructor,
+        CORBA::_tc_EnumMemberSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -19239,26 +21266,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::Container_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_Container, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::Container::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::Container>::insert (
+      _tao_any,
+      CORBA::Container::_tao_any_destructor,
+      CORBA::_tc_Container,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -19267,60 +21287,26 @@ operator>>= (
     CORBA::Container_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::Container::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_Container
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::Container>::extract (
+        _tao_any,
+        CORBA::Container::_tao_any_destructor,
+        CORBA::_tc_Container,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_Container,
-            1,
-            _tao_elem,
-            CORBA::Container::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::Container::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::Container::_nil ();
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<CORBA::Container,CORBA::Container_var>;
+  template class TAO::Any_Impl_T<CORBA::Container>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::Container,CORBA::Container_var>
+# pragma instantiate TAO_Object_Manager<CORBA::Container, CORBA::Container_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::Container>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -19328,16 +21314,12 @@ void operator<<= (
     const CORBA::Container::Description &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::Container::_tc_Description,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::Container::Description>::insert_copy (
+      _tao_any,
+      CORBA::Container::Description::_tao_any_destructor,
+      CORBA::Container::_tc_Description,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -19346,19 +21328,12 @@ void operator<<= (
     CORBA::Container::Description *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::Container::_tc_Description,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::Container::Description::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::Container::Description>::insert (
+      _tao_any,
+      CORBA::Container::Description::_tao_any_destructor,
+      CORBA::Container::_tc_Description,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -19379,75 +21354,24 @@ CORBA::Boolean operator>>= (
     const CORBA::Container::Description *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::Container::_tc_Description
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::Container::Description*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::Container::Description *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::Container::Description,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::Container::_tc_Description,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::Container::Description::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Container::Description>::extract (
+        _tao_any,
+        CORBA::Container::Description::_tao_any_destructor,
+        CORBA::Container::_tc_Description,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::Container::Description>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Container::Description>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -19455,16 +21379,12 @@ void operator<<= (
     const CORBA::Container::DescriptionSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::Container::_tc_DescriptionSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::Container::DescriptionSeq::_tao_any_destructor,
+      CORBA::Container::_tc_DescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -19473,19 +21393,12 @@ void operator<<= (
     CORBA::Container::DescriptionSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::Container::_tc_DescriptionSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::Container::DescriptionSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert (
+      _tao_any,
+      CORBA::Container::DescriptionSeq::_tao_any_destructor,
+      CORBA::Container::_tc_DescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -19494,8 +21407,8 @@ CORBA::Boolean operator>>= (
     CORBA::Container::DescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::Container::DescriptionSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::Container::DescriptionSeq *&,
       _tao_elem
     );
 }
@@ -19506,77 +21419,19 @@ CORBA::Boolean operator>>= (
     const CORBA::Container::DescriptionSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::Container::_tc_DescriptionSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::Container::DescriptionSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::Container::DescriptionSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::Container::DescriptionSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::Container::_tc_DescriptionSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::Container::DescriptionSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::extract (
+        _tao_any,
+        CORBA::Container::DescriptionSeq::_tao_any_destructor,
+        CORBA::Container::_tc_DescriptionSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -19588,26 +21443,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::IDLType_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_IDLType, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::IDLType::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::IDLType>::insert (
+      _tao_any,
+      CORBA::IDLType::_tao_any_destructor,
+      CORBA::_tc_IDLType,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -19616,62 +21464,37 @@ operator>>= (
     CORBA::IDLType_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::IDLType::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_IDLType
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::IDLType>::extract (
+        _tao_any,
+        CORBA::IDLType::_tao_any_destructor,
+        CORBA::_tc_IDLType,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_IDLType,
-            1,
-            _tao_elem,
-            CORBA::IDLType::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::IDLType::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::IDLType::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::IDLType>::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::IDLType,CORBA::IDLType_var>;
+  template class TAO::Any_Impl_T<CORBA::IDLType>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::IDLType,CORBA::IDLType_var>
+# pragma instantiate TAO_Object_Manager<CORBA::IDLType, CORBA::IDLType_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::IDLType>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -19683,26 +21506,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::TypedefDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_TypedefDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::TypedefDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::TypedefDef>::insert (
+      _tao_any,
+      CORBA::TypedefDef::_tao_any_destructor,
+      CORBA::_tc_TypedefDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -19711,60 +21527,35 @@ operator>>= (
     CORBA::TypedefDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::TypedefDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_TypedefDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::TypedefDef>::extract (
+        _tao_any,
+        CORBA::TypedefDef::_tao_any_destructor,
+        CORBA::_tc_TypedefDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_TypedefDef,
-            1,
-            _tao_elem,
-            CORBA::TypedefDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::TypedefDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::TypedefDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::TypedefDef>::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::TypedefDef,CORBA::TypedefDef_var>;
+  template class TAO::Any_Impl_T<CORBA::TypedefDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::TypedefDef,CORBA::TypedefDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::TypedefDef, CORBA::TypedefDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::TypedefDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -19772,16 +21563,12 @@ void operator<<= (
     const CORBA::TypeDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_TypeDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::insert_copy (
+      _tao_any,
+      CORBA::TypeDescription::_tao_any_destructor,
+      CORBA::_tc_TypeDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -19790,19 +21577,12 @@ void operator<<= (
     CORBA::TypeDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_TypeDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::TypeDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::insert (
+      _tao_any,
+      CORBA::TypeDescription::_tao_any_destructor,
+      CORBA::_tc_TypeDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -19823,75 +21603,24 @@ CORBA::Boolean operator>>= (
     const CORBA::TypeDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_TypeDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::TypeDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::TypeDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::TypeDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_TypeDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::TypeDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::extract (
+        _tao_any,
+        CORBA::TypeDescription::_tao_any_destructor,
+        CORBA::_tc_TypeDescription,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::TypeDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::TypeDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -19934,7 +21663,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -19977,11 +21706,11 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ContainedSeq &_tao_sequence
+    const CORBA::InterfaceDefSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
@@ -19993,7 +21722,8 @@ CORBA::Boolean operator<< (
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+          _tao_marshal_flag =
+            tao_CORBA_InterfaceDef_marshal (_tao_sequence[i].in (), strm);
         }
       
       return _tao_marshal_flag;
@@ -20004,7 +21734,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::ContainedSeq &_tao_sequence
+    CORBA::InterfaceDefSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -20043,11 +21773,11 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::InterfaceDefSeq &_tao_sequence
+    const CORBA::ValueDefSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
@@ -20059,7 +21789,8 @@ CORBA::Boolean operator<< (
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+          _tao_marshal_flag =
+            tao_CORBA_ValueDef_marshal (_tao_sequence[i].in (), strm);
         }
       
       return _tao_marshal_flag;
@@ -20070,7 +21801,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::InterfaceDefSeq &_tao_sequence
+    CORBA::ValueDefSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -20109,11 +21840,11 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ValueDefSeq &_tao_sequence
+    const CORBA::AbstractInterfaceDefSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
@@ -20125,7 +21856,8 @@ CORBA::Boolean operator<< (
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+          _tao_marshal_flag =
+            tao_CORBA_AbstractInterfaceDef_marshal (_tao_sequence[i].in (), strm);
         }
       
       return _tao_marshal_flag;
@@ -20136,7 +21868,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::ValueDefSeq &_tao_sequence
+    CORBA::AbstractInterfaceDefSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -20175,11 +21907,11 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::AbstractInterfaceDefSeq &_tao_sequence
+    const CORBA::LocalInterfaceDefSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
@@ -20191,7 +21923,8 @@ CORBA::Boolean operator<< (
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+          _tao_marshal_flag =
+            tao_CORBA_LocalInterfaceDef_marshal (_tao_sequence[i].in (), strm);
         }
       
       return _tao_marshal_flag;
@@ -20202,7 +21935,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::AbstractInterfaceDefSeq &_tao_sequence
+    CORBA::LocalInterfaceDefSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -20241,11 +21974,11 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::LocalInterfaceDefSeq &_tao_sequence
+    const CORBA::ExtInterfaceDefSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
@@ -20257,7 +21990,8 @@ CORBA::Boolean operator<< (
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+          _tao_marshal_flag =
+            tao_CORBA_ExtInterfaceDef_marshal (_tao_sequence[i].in (), strm);
         }
       
       return _tao_marshal_flag;
@@ -20268,7 +22002,275 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::LocalInterfaceDefSeq &_tao_sequence
+    CORBA::ExtInterfaceDefSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExtValueDefSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag =
+            tao_CORBA_ExtValueDef_marshal (_tao_sequence[i].in (), strm);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExtValueDefSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExtAbstractInterfaceDefSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag =
+            tao_CORBA_ExtAbstractInterfaceDef_marshal (_tao_sequence[i].in (), strm);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExtAbstractInterfaceDefSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExtLocalInterfaceDefSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag =
+            tao_CORBA_ExtLocalInterfaceDef_marshal (_tao_sequence[i].in (), strm);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExtLocalInterfaceDefSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ContainedSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag =
+            _tao_sequence[i].in ()->marshal (strm);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ContainedSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -20307,7 +22309,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -20373,7 +22375,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -20439,7 +22441,139 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExcDescriptionSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExcDescriptionSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExtInitializerSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExtInitializerSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -20505,7 +22639,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -20571,7 +22705,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -20637,7 +22771,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -20680,7 +22814,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -20723,7 +22857,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -20765,3 +22899,4 @@ CORBA::Boolean operator>> (
   return 0;
 }
 
+
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index 126a3bb0ab8..0e7f2bfbad7 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -20,7 +20,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_IFR_BASEC_H_
 #define _TAO_IDL_ORIG_IFR_BASEC_H_
@@ -61,64 +61,103 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  CORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:368
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+  
   typedef char * Identifier;
   typedef CORBA::String_var Identifier_var;
   typedef CORBA::String_out Identifier_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Identifier;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:368
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+  
   typedef char * ScopedName;
   typedef CORBA::String_var ScopedName_var;
   typedef CORBA::String_out ScopedName_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ScopedName;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:368
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+  
   typedef char * RepositoryId;
   typedef CORBA::String_var RepositoryId_var;
   typedef CORBA::String_out RepositoryId_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RepositoryId;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_enum/enum_ch.cpp:57
-
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
+  enum DefinitionKind
+  {
+    dk_none,
+    dk_all,
+    dk_Attribute,
+    dk_Constant,
+    dk_Exception,
+    dk_Interface,
+    dk_Module,
+    dk_Operation,
+    dk_Typedef,
+    dk_Alias,
+    dk_Struct,
+    dk_Union,
+    dk_Enum,
+    dk_Primitive,
+    dk_String,
+    dk_Sequence,
+    dk_Array,
+    dk_Repository,
+    dk_Wstring,
+    dk_Fixed,
+    dk_Value,
+    dk_ValueBox,
+    dk_ValueMember,
+    dk_Native,
+    dk_AbstractInterface,
+    dk_LocalInterface,
+    dk_Component,
+    dk_Home,
+    dk_Factory,
+    dk_Finder,
+    dk_Emits,
+    dk_Publishes,
+    dk_Consumes,
+    dk_Provides,
+    dk_Uses,
+    dk_Event
+  };
+  
   typedef DefinitionKind &DefinitionKind_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DefinitionKind;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_IROBJECT___PTR_CH_)
 #define _CORBA_IROBJECT___PTR_CH_
-
+  
   class IRObject;
   typedef IRObject *IRObject_ptr;
 
@@ -126,31 +165,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_IROBJECT___VAR_CH_)
 #define _CORBA_IROBJECT___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export IRObject_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export IRObject_var : public TAO_Base_var
   {
   public:
     IRObject_var (void); // default constructor
-    IRObject_var (IRObject_ptr p) : ptr_ (p) {}
+    IRObject_var (IRObject_ptr p) : ptr_ (p) {} 
     IRObject_var (const IRObject_var &); // copy constructor
     ~IRObject_var (void); // destructor
-
+    
     IRObject_var &operator= (IRObject_ptr);
     IRObject_var &operator= (const IRObject_var &);
     IRObject_ptr operator-> (void) const;
-
+    
     operator const IRObject_ptr &() const;
     operator IRObject_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     IRObject_ptr in (void) const;
     IRObject_ptr &inout (void);
     IRObject_ptr &out (void);
     IRObject_ptr _retn (void);
     IRObject_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static IRObject_ptr tao_duplicate (IRObject_ptr);
@@ -158,25 +197,25 @@ TAO_NAMESPACE  CORBA
     static IRObject_ptr tao_nil (void);
     static IRObject_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     IRObject_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    IRObject_var (const TAO_Base_var & rhs);
-    IRObject_var & operator= (const TAO_Base_var & rhs);
+    IRObject_var (const TAO_Base_var &rhs);
+    IRObject_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_IROBJECT___OUT_CH_)
 #define _CORBA_IROBJECT___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export IRObject_out
   {
   public:
@@ -189,24 +228,24 @@ TAO_NAMESPACE  CORBA
     operator IRObject_ptr &();
     IRObject_ptr &ptr (void);
     IRObject_ptr operator-> (void);
-
+  
   private:
     IRObject_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_IROBJECT_CH_)
 #define _CORBA_IROBJECT_CH_
-
+  
   class _TAO_IRObject_Proxy_Impl;
   class _TAO_IRObject_Remote_Proxy_Impl;
   class _TAO_IRObject_Proxy_Broker;
   class _TAO_IRObject_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export IRObject
     : public virtual CORBA::Object
   {
@@ -214,105 +253,106 @@ TAO_NAMESPACE  CORBA
     typedef IRObject_ptr _ptr_type;
     typedef IRObject_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static IRObject_ptr _duplicate (IRObject_ptr obj);
-
+    
     static IRObject_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IRObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IRObject_ptr _nil (void)
       {
         return (IRObject_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_IRObject_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_;
-
+  
   protected:
     IRObject (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_IRObject_setup_collocation (int collocated);
-
+    
     IRObject (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~IRObject (void);
-
+    
     friend class _TAO_IRObject_Remote_Proxy_Impl;
     friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
     friend class _TAO_IRObject_Direct_Proxy_Impl;
-
+  
   private:
     IRObject (const IRObject &);
     void operator= (const IRObject &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_IRObject_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_IRObject_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::DefinitionKind def_kind (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -320,10 +360,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -331,35 +371,35 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_IRObject_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_IRObject_Remote_Proxy_Impl
     : public virtual _TAO_IRObject_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_IRObject_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_IRObject_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::DefinitionKind def_kind (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -367,10 +407,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -379,23 +419,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_IRObject_Proxy_Broker
   {
   public:
@@ -404,109 +444,109 @@ TAO_NAMESPACE  CORBA
         IRObject *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_IRObject_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_IRObject_Remote_Proxy_Broker
     : public virtual _TAO_IRObject_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_IRObject_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_IRObject_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_IRObject_Proxy_Impl &select_proxy (
         IRObject *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_IRObject_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_IRObject_Remote_Proxy_Broker *the_TAO_IRObject_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IRObject;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:368
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+  
   typedef char * VersionSpec;
   typedef CORBA::String_var VersionSpec_var;
   typedef CORBA::String_out VersionSpec_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_VersionSpec;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class Contained;
 
 #if !defined (_CORBA_CONTAINED___PTR_CH_)
 #define _CORBA_CONTAINED___PTR_CH_
-
+  
   typedef Contained *Contained_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_CONTAINED___VAR_CH_)
 #define _CORBA_CONTAINED___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export Contained_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export Contained_var : public TAO_Base_var
   {
   public:
     Contained_var (void); // default constructor
-    Contained_var (Contained_ptr p) : ptr_ (p) {}
+    Contained_var (Contained_ptr p) : ptr_ (p) {} 
     Contained_var (const Contained_var &); // copy constructor
     ~Contained_var (void); // destructor
-
+    
     Contained_var &operator= (Contained_ptr);
     Contained_var &operator= (const Contained_var &);
     Contained_ptr operator-> (void) const;
-
+    
     operator const Contained_ptr &() const;
     operator Contained_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Contained_ptr in (void) const;
     Contained_ptr &inout (void);
     Contained_ptr &out (void);
     Contained_ptr _retn (void);
     Contained_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Contained_ptr tao_duplicate (Contained_ptr);
@@ -514,25 +554,25 @@ TAO_NAMESPACE  CORBA
     static Contained_ptr tao_nil (void);
     static Contained_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Contained_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    Contained_var (const TAO_Base_var & rhs);
-    Contained_var & operator= (const TAO_Base_var & rhs);
+    Contained_var (const TAO_Base_var &rhs);
+    Contained_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_CONTAINED___OUT_CH_)
 #define _CORBA_CONTAINED___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export Contained_out
   {
   public:
@@ -545,52 +585,52 @@ TAO_NAMESPACE  CORBA
     operator Contained_ptr &();
     Contained_ptr &ptr (void);
     Contained_ptr operator-> (void);
-
+  
   private:
     Contained_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class Repository;
 
 #if !defined (_CORBA_REPOSITORY___PTR_CH_)
 #define _CORBA_REPOSITORY___PTR_CH_
-
+  
   typedef Repository *Repository_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_REPOSITORY___VAR_CH_)
 #define _CORBA_REPOSITORY___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export Repository_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export Repository_var : public TAO_Base_var
   {
   public:
     Repository_var (void); // default constructor
-    Repository_var (Repository_ptr p) : ptr_ (p) {}
+    Repository_var (Repository_ptr p) : ptr_ (p) {} 
     Repository_var (const Repository_var &); // copy constructor
     ~Repository_var (void); // destructor
-
+    
     Repository_var &operator= (Repository_ptr);
     Repository_var &operator= (const Repository_var &);
     Repository_ptr operator-> (void) const;
-
+    
     operator const Repository_ptr &() const;
     operator Repository_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Repository_ptr in (void) const;
     Repository_ptr &inout (void);
     Repository_ptr &out (void);
     Repository_ptr _retn (void);
     Repository_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Repository_ptr tao_duplicate (Repository_ptr);
@@ -598,25 +638,25 @@ TAO_NAMESPACE  CORBA
     static Repository_ptr tao_nil (void);
     static Repository_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Repository_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    Repository_var (const TAO_Base_var & rhs);
-    Repository_var & operator= (const TAO_Base_var & rhs);
+    Repository_var (const TAO_Base_var &rhs);
+    Repository_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_REPOSITORY___OUT_CH_)
 #define _CORBA_REPOSITORY___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export Repository_out
   {
   public:
@@ -629,52 +669,52 @@ TAO_NAMESPACE  CORBA
     operator Repository_ptr &();
     Repository_ptr &ptr (void);
     Repository_ptr operator-> (void);
-
+  
   private:
     Repository_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class Container;
 
 #if !defined (_CORBA_CONTAINER___PTR_CH_)
 #define _CORBA_CONTAINER___PTR_CH_
-
+  
   typedef Container *Container_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_CONTAINER___VAR_CH_)
 #define _CORBA_CONTAINER___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export Container_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export Container_var : public TAO_Base_var
   {
   public:
     Container_var (void); // default constructor
-    Container_var (Container_ptr p) : ptr_ (p) {}
+    Container_var (Container_ptr p) : ptr_ (p) {} 
     Container_var (const Container_var &); // copy constructor
     ~Container_var (void); // destructor
-
+    
     Container_var &operator= (Container_ptr);
     Container_var &operator= (const Container_var &);
     Container_ptr operator-> (void) const;
-
+    
     operator const Container_ptr &() const;
     operator Container_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Container_ptr in (void) const;
     Container_ptr &inout (void);
     Container_ptr &out (void);
     Container_ptr _retn (void);
     Container_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Container_ptr tao_duplicate (Container_ptr);
@@ -682,25 +722,25 @@ TAO_NAMESPACE  CORBA
     static Container_ptr tao_nil (void);
     static Container_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Container_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    Container_var (const TAO_Base_var & rhs);
-    Container_var & operator= (const TAO_Base_var & rhs);
+    Container_var (const TAO_Base_var &rhs);
+    Container_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_CONTAINER___OUT_CH_)
 #define _CORBA_CONTAINER___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export Container_out
   {
   public:
@@ -713,19 +753,19 @@ TAO_NAMESPACE  CORBA
     operator Container_ptr &();
     Container_ptr &ptr (void);
     Container_ptr operator-> (void);
-
+  
   private:
     Container_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_CONTAINED___PTR_CH_)
 #define _CORBA_CONTAINED___PTR_CH_
-
+  
   class Contained;
   typedef Contained *Contained_ptr;
 
@@ -733,31 +773,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_CONTAINED___VAR_CH_)
 #define _CORBA_CONTAINED___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export Contained_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export Contained_var : public TAO_Base_var
   {
   public:
     Contained_var (void); // default constructor
-    Contained_var (Contained_ptr p) : ptr_ (p) {}
+    Contained_var (Contained_ptr p) : ptr_ (p) {} 
     Contained_var (const Contained_var &); // copy constructor
     ~Contained_var (void); // destructor
-
+    
     Contained_var &operator= (Contained_ptr);
     Contained_var &operator= (const Contained_var &);
     Contained_ptr operator-> (void) const;
-
+    
     operator const Contained_ptr &() const;
     operator Contained_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Contained_ptr in (void) const;
     Contained_ptr &inout (void);
     Contained_ptr &out (void);
     Contained_ptr _retn (void);
     Contained_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Contained_ptr tao_duplicate (Contained_ptr);
@@ -765,25 +805,25 @@ TAO_NAMESPACE  CORBA
     static Contained_ptr tao_nil (void);
     static Contained_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Contained_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    Contained_var (const TAO_Base_var & rhs);
-    Contained_var & operator= (const TAO_Base_var & rhs);
+    Contained_var (const TAO_Base_var &rhs);
+    Contained_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_CONTAINED___OUT_CH_)
 #define _CORBA_CONTAINED___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export Contained_out
   {
   public:
@@ -796,24 +836,24 @@ TAO_NAMESPACE  CORBA
     operator Contained_ptr &();
     Contained_ptr &ptr (void);
     Contained_ptr operator-> (void);
-
+  
   private:
     Contained_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_CONTAINED_CH_)
 #define _CORBA_CONTAINED_CH_
-
+  
   class _TAO_Contained_Proxy_Impl;
   class _TAO_Contained_Remote_Proxy_Impl;
   class _TAO_Contained_Proxy_Broker;
   class _TAO_Contained_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export Contained
     : public virtual CORBA::IRObject
   {
@@ -821,40 +861,40 @@ TAO_NAMESPACE  CORBA
     typedef Contained_ptr _ptr_type;
     typedef Contained_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static Contained_ptr _duplicate (Contained_ptr obj);
-
+    
     static Contained_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Contained_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Contained_ptr _nil (void)
       {
         return (Contained_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void id (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -862,20 +902,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void name (
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -883,20 +923,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void version (
         const char * version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -904,54 +944,54 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_structure/structure_ch.cpp:49
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    
     class Description_var;
-
+    
     struct TAO_IFR_Client_Export Description
     {
       typedef Description_var _var_type;
-
+      
       static void _tao_any_destructor (void *);
       ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
       CORBA::Any value;
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_structure.cpp:71
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+    
     class TAO_IFR_Client_Export Description_var
     {
     public:
@@ -959,33 +999,33 @@ TAO_NAMESPACE  CORBA
       Description_var (Description *);
       Description_var (const Description_var &);
       ~Description_var (void);
-
+      
       Description_var &operator= (Description *);
       Description_var &operator= (const Description_var &);
       Description *operator-> (void);
       const Description *operator-> (void) const;
-
+      
       operator const Description &() const;
       operator Description &();
       operator Description &() const;
-
+      
       // Variable-size types only.
       operator Description *&();
-
-      // in, inout, out, _retn
+      
+      // in, inout, out, _retn 
       const Description &in (void) const;
       Description &inout (void);
       Description *&out (void);
       Description *_retn (void);
       Description *ptr (void) const;
-
+    
     private:
       Description *ptr_;
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_structure.cpp:445
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+    
     class TAO_IFR_Client_Export Description_out
     {
     public:
@@ -997,31 +1037,31 @@ TAO_NAMESPACE  CORBA
       operator Description *&();
       Description *&ptr (void);
       Description *operator-> (void);
-
+      
     private:
       Description *&ptr_;
       // Assignment from T_var not allowed.
       void operator= (const Description_var &);
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_typecode/typecode_decl.cpp:44
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
     static ::CORBA::TypeCode_ptr _tc_Description;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void move (
         CORBA::Container_ptr new_container,
         const char * new_name,
@@ -1031,65 +1071,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_Contained_Proxy_Broker *the_TAO_Contained_Proxy_Broker_;
-
+  
   protected:
     Contained (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Contained_setup_collocation (int collocated);
-
+    
     Contained (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~Contained (void);
-
+    
     friend class _TAO_Contained_Remote_Proxy_Impl;
     friend class _TAO_Contained_ThruPOA_Proxy_Impl;
     friend class _TAO_Contained_Direct_Proxy_Impl;
-
+  
   private:
     Contained (const Contained &);
     void operator= (const Contained &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_Contained_Proxy_Impl
     : public virtual CORBA::_TAO_IRObject_Proxy_Impl
   {
   public:
     virtual ~_TAO_Contained_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual char * id (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1097,10 +1138,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void id (
         CORBA::Object *_collocated_tao_target_,
         const char * id
@@ -1109,10 +1150,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual char * name (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1120,10 +1161,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void name (
         CORBA::Object *_collocated_tao_target_,
         const char * name
@@ -1132,10 +1173,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual char * version (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1143,10 +1184,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void version (
         CORBA::Object *_collocated_tao_target_,
         const char * version
@@ -1155,10 +1196,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::Container_ptr defined_in (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1166,10 +1207,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual char * absolute_name (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1177,10 +1218,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::Repository_ptr containing_repository (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1188,10 +1229,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::Contained::Description * describe (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1199,10 +1240,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void move (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Container_ptr new_container,
@@ -1213,23 +1254,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_Contained_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_Contained_Remote_Proxy_Impl
     : public virtual _TAO_Contained_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -1237,12 +1278,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_Contained_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Contained_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual char * id (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1250,10 +1291,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void id (
         CORBA::Object *_collocated_tao_target_,
         const char * id
@@ -1262,10 +1303,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual char * name (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1273,10 +1314,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void name (
         CORBA::Object *_collocated_tao_target_,
         const char * name
@@ -1285,10 +1326,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual char * version (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1296,10 +1337,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void version (
         CORBA::Object *_collocated_tao_target_,
         const char * version
@@ -1308,10 +1349,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::Container_ptr defined_in (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1319,10 +1360,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual char * absolute_name (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1330,10 +1371,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::Repository_ptr containing_repository (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1341,10 +1382,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::Contained::Description * describe (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1352,10 +1393,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void move (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Container_ptr new_container,
@@ -1367,23 +1408,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_Contained_Proxy_Broker
   {
   public:
@@ -1392,275 +1433,97 @@ TAO_NAMESPACE  CORBA
         Contained *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_Contained_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_Contained_Remote_Proxy_Broker
     : public virtual _TAO_Contained_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Contained_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Contained_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_Contained_Proxy_Impl &select_proxy (
         Contained *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_Contained_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_Contained_Remote_Proxy_Broker *the_TAO_Contained_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Contained;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        Contained* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
-
-    // = Accessors.
-    TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var> operator[] (CORBA::ULong index) const;
-
-    // = Static operations.
-    static Contained **allocbuf (CORBA::ULong nelems);
-    static void freebuf (Contained **buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    Contained* *get_buffer (CORBA::Boolean orphan = 0);
-    const Contained* *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_CONTAINEDSEQ_CH_)
-#define _CORBA_CONTAINEDSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class ContainedSeq;
-  class ContainedSeq_var;
-
-  // *************************************************************
-  // CORBA::ContainedSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export ContainedSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<Contained,Contained_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    ContainedSeq (void);
-    ContainedSeq (CORBA::ULong max);
-    ContainedSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Contained_ptr *buffer,
-        CORBA::Boolean release = 0
-      );
-    ContainedSeq (const ContainedSeq &);
-    ~ContainedSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef ContainedSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINEDSEQ___VAR_CH_)
-#define _CORBA_CONTAINEDSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class CORBA::ContainedSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export ContainedSeq_var
-  {
-  public:
-    ContainedSeq_var (void);
-    ContainedSeq_var (ContainedSeq *);
-    ContainedSeq_var (const ContainedSeq_var &);
-    ~ContainedSeq_var (void);
-
-    ContainedSeq_var &operator= (ContainedSeq *);
-    ContainedSeq_var &operator= (const ContainedSeq_var &);
-    ContainedSeq *operator-> (void);
-    const ContainedSeq *operator-> (void) const;
-
-    operator const ContainedSeq &() const;
-    operator ContainedSeq &();
-    operator ContainedSeq &() const;
-
-    // Variable-size base types only.
-    operator ContainedSeq *&();
-
-    TAO_Object_Manager<Contained, Contained_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
-    const ContainedSeq &in (void) const;
-    ContainedSeq &inout (void);
-    ContainedSeq *&out (void);
-    ContainedSeq *_retn (void);
-    ContainedSeq *ptr (void) const;
-
-  private:
-    ContainedSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINEDSEQ___OUT_CH_)
-#define _CORBA_CONTAINEDSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export ContainedSeq_out
-  {
-  public:
-    ContainedSeq_out (ContainedSeq *&);
-    ContainedSeq_out (ContainedSeq_var &);
-    ContainedSeq_out (const ContainedSeq_out &);
-    ContainedSeq_out &operator= (const ContainedSeq_out &);
-    ContainedSeq_out &operator= (ContainedSeq *);
-    operator ContainedSeq *&();
-    ContainedSeq *&ptr (void);
-    ContainedSeq *operator-> (void);
-    TAO_Object_Manager<Contained, Contained_var> operator[] (CORBA::ULong index);
-
-  private:
-    ContainedSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ContainedSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContainedSeq;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class ModuleDef;
 
 #if !defined (_CORBA_MODULEDEF___PTR_CH_)
 #define _CORBA_MODULEDEF___PTR_CH_
-
+  
   typedef ModuleDef *ModuleDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_MODULEDEF___VAR_CH_)
 #define _CORBA_MODULEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ModuleDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ModuleDef_var : public TAO_Base_var
   {
   public:
     ModuleDef_var (void); // default constructor
-    ModuleDef_var (ModuleDef_ptr p) : ptr_ (p) {}
+    ModuleDef_var (ModuleDef_ptr p) : ptr_ (p) {} 
     ModuleDef_var (const ModuleDef_var &); // copy constructor
     ~ModuleDef_var (void); // destructor
-
+    
     ModuleDef_var &operator= (ModuleDef_ptr);
     ModuleDef_var &operator= (const ModuleDef_var &);
     ModuleDef_ptr operator-> (void) const;
-
+    
     operator const ModuleDef_ptr &() const;
     operator ModuleDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ModuleDef_ptr in (void) const;
     ModuleDef_ptr &inout (void);
     ModuleDef_ptr &out (void);
     ModuleDef_ptr _retn (void);
     ModuleDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ModuleDef_ptr tao_duplicate (ModuleDef_ptr);
@@ -1668,25 +1531,25 @@ TAO_NAMESPACE  CORBA
     static ModuleDef_ptr tao_nil (void);
     static ModuleDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ModuleDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ModuleDef_var (const TAO_Base_var & rhs);
-    ModuleDef_var & operator= (const TAO_Base_var & rhs);
+    ModuleDef_var (const TAO_Base_var &rhs);
+    ModuleDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_MODULEDEF___OUT_CH_)
 #define _CORBA_MODULEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ModuleDef_out
   {
   public:
@@ -1699,52 +1562,52 @@ TAO_NAMESPACE  CORBA
     operator ModuleDef_ptr &();
     ModuleDef_ptr &ptr (void);
     ModuleDef_ptr operator-> (void);
-
+  
   private:
     ModuleDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class ConstantDef;
 
 #if !defined (_CORBA_CONSTANTDEF___PTR_CH_)
 #define _CORBA_CONSTANTDEF___PTR_CH_
-
+  
   typedef ConstantDef *ConstantDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_CONSTANTDEF___VAR_CH_)
 #define _CORBA_CONSTANTDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ConstantDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ConstantDef_var : public TAO_Base_var
   {
   public:
     ConstantDef_var (void); // default constructor
-    ConstantDef_var (ConstantDef_ptr p) : ptr_ (p) {}
+    ConstantDef_var (ConstantDef_ptr p) : ptr_ (p) {} 
     ConstantDef_var (const ConstantDef_var &); // copy constructor
     ~ConstantDef_var (void); // destructor
-
+    
     ConstantDef_var &operator= (ConstantDef_ptr);
     ConstantDef_var &operator= (const ConstantDef_var &);
     ConstantDef_ptr operator-> (void) const;
-
+    
     operator const ConstantDef_ptr &() const;
     operator ConstantDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ConstantDef_ptr in (void) const;
     ConstantDef_ptr &inout (void);
     ConstantDef_ptr &out (void);
     ConstantDef_ptr _retn (void);
     ConstantDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ConstantDef_ptr tao_duplicate (ConstantDef_ptr);
@@ -1752,25 +1615,25 @@ TAO_NAMESPACE  CORBA
     static ConstantDef_ptr tao_nil (void);
     static ConstantDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ConstantDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ConstantDef_var (const TAO_Base_var & rhs);
-    ConstantDef_var & operator= (const TAO_Base_var & rhs);
+    ConstantDef_var (const TAO_Base_var &rhs);
+    ConstantDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_CONSTANTDEF___OUT_CH_)
 #define _CORBA_CONSTANTDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ConstantDef_out
   {
   public:
@@ -1783,52 +1646,52 @@ TAO_NAMESPACE  CORBA
     operator ConstantDef_ptr &();
     ConstantDef_ptr &ptr (void);
     ConstantDef_ptr operator-> (void);
-
+  
   private:
     ConstantDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class IDLType;
 
 #if !defined (_CORBA_IDLTYPE___PTR_CH_)
 #define _CORBA_IDLTYPE___PTR_CH_
-
+  
   typedef IDLType *IDLType_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_IDLTYPE___VAR_CH_)
 #define _CORBA_IDLTYPE___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export IDLType_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export IDLType_var : public TAO_Base_var
   {
   public:
     IDLType_var (void); // default constructor
-    IDLType_var (IDLType_ptr p) : ptr_ (p) {}
+    IDLType_var (IDLType_ptr p) : ptr_ (p) {} 
     IDLType_var (const IDLType_var &); // copy constructor
     ~IDLType_var (void); // destructor
-
+    
     IDLType_var &operator= (IDLType_ptr);
     IDLType_var &operator= (const IDLType_var &);
     IDLType_ptr operator-> (void) const;
-
+    
     operator const IDLType_ptr &() const;
     operator IDLType_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     IDLType_ptr in (void) const;
     IDLType_ptr &inout (void);
     IDLType_ptr &out (void);
     IDLType_ptr _retn (void);
     IDLType_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static IDLType_ptr tao_duplicate (IDLType_ptr);
@@ -1836,25 +1699,25 @@ TAO_NAMESPACE  CORBA
     static IDLType_ptr tao_nil (void);
     static IDLType_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     IDLType_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    IDLType_var (const TAO_Base_var & rhs);
-    IDLType_var & operator= (const TAO_Base_var & rhs);
+    IDLType_var (const TAO_Base_var &rhs);
+    IDLType_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_IDLTYPE___OUT_CH_)
 #define _CORBA_IDLTYPE___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export IDLType_out
   {
   public:
@@ -1867,52 +1730,52 @@ TAO_NAMESPACE  CORBA
     operator IDLType_ptr &();
     IDLType_ptr &ptr (void);
     IDLType_ptr operator-> (void);
-
+  
   private:
     IDLType_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class StructDef;
 
 #if !defined (_CORBA_STRUCTDEF___PTR_CH_)
 #define _CORBA_STRUCTDEF___PTR_CH_
-
+  
   typedef StructDef *StructDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_STRUCTDEF___VAR_CH_)
 #define _CORBA_STRUCTDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export StructDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export StructDef_var : public TAO_Base_var
   {
   public:
     StructDef_var (void); // default constructor
-    StructDef_var (StructDef_ptr p) : ptr_ (p) {}
+    StructDef_var (StructDef_ptr p) : ptr_ (p) {} 
     StructDef_var (const StructDef_var &); // copy constructor
     ~StructDef_var (void); // destructor
-
+    
     StructDef_var &operator= (StructDef_ptr);
     StructDef_var &operator= (const StructDef_var &);
     StructDef_ptr operator-> (void) const;
-
+    
     operator const StructDef_ptr &() const;
     operator StructDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     StructDef_ptr in (void) const;
     StructDef_ptr &inout (void);
     StructDef_ptr &out (void);
     StructDef_ptr _retn (void);
     StructDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static StructDef_ptr tao_duplicate (StructDef_ptr);
@@ -1920,25 +1783,25 @@ TAO_NAMESPACE  CORBA
     static StructDef_ptr tao_nil (void);
     static StructDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     StructDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    StructDef_var (const TAO_Base_var & rhs);
-    StructDef_var & operator= (const TAO_Base_var & rhs);
+    StructDef_var (const TAO_Base_var &rhs);
+    StructDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_STRUCTDEF___OUT_CH_)
 #define _CORBA_STRUCTDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export StructDef_out
   {
   public:
@@ -1951,52 +1814,52 @@ TAO_NAMESPACE  CORBA
     operator StructDef_ptr &();
     StructDef_ptr &ptr (void);
     StructDef_ptr operator-> (void);
-
+  
   private:
     StructDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class UnionDef;
 
 #if !defined (_CORBA_UNIONDEF___PTR_CH_)
 #define _CORBA_UNIONDEF___PTR_CH_
-
+  
   typedef UnionDef *UnionDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_UNIONDEF___VAR_CH_)
 #define _CORBA_UNIONDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export UnionDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export UnionDef_var : public TAO_Base_var
   {
   public:
     UnionDef_var (void); // default constructor
-    UnionDef_var (UnionDef_ptr p) : ptr_ (p) {}
+    UnionDef_var (UnionDef_ptr p) : ptr_ (p) {} 
     UnionDef_var (const UnionDef_var &); // copy constructor
     ~UnionDef_var (void); // destructor
-
+    
     UnionDef_var &operator= (UnionDef_ptr);
     UnionDef_var &operator= (const UnionDef_var &);
     UnionDef_ptr operator-> (void) const;
-
+    
     operator const UnionDef_ptr &() const;
     operator UnionDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     UnionDef_ptr in (void) const;
     UnionDef_ptr &inout (void);
     UnionDef_ptr &out (void);
     UnionDef_ptr _retn (void);
     UnionDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static UnionDef_ptr tao_duplicate (UnionDef_ptr);
@@ -2004,25 +1867,25 @@ TAO_NAMESPACE  CORBA
     static UnionDef_ptr tao_nil (void);
     static UnionDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     UnionDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    UnionDef_var (const TAO_Base_var & rhs);
-    UnionDef_var & operator= (const TAO_Base_var & rhs);
+    UnionDef_var (const TAO_Base_var &rhs);
+    UnionDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_UNIONDEF___OUT_CH_)
 #define _CORBA_UNIONDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export UnionDef_out
   {
   public:
@@ -2035,52 +1898,52 @@ TAO_NAMESPACE  CORBA
     operator UnionDef_ptr &();
     UnionDef_ptr &ptr (void);
     UnionDef_ptr operator-> (void);
-
+  
   private:
     UnionDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class EnumDef;
 
 #if !defined (_CORBA_ENUMDEF___PTR_CH_)
 #define _CORBA_ENUMDEF___PTR_CH_
-
+  
   typedef EnumDef *EnumDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ENUMDEF___VAR_CH_)
 #define _CORBA_ENUMDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export EnumDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export EnumDef_var : public TAO_Base_var
   {
   public:
     EnumDef_var (void); // default constructor
-    EnumDef_var (EnumDef_ptr p) : ptr_ (p) {}
+    EnumDef_var (EnumDef_ptr p) : ptr_ (p) {} 
     EnumDef_var (const EnumDef_var &); // copy constructor
     ~EnumDef_var (void); // destructor
-
+    
     EnumDef_var &operator= (EnumDef_ptr);
     EnumDef_var &operator= (const EnumDef_var &);
     EnumDef_ptr operator-> (void) const;
-
+    
     operator const EnumDef_ptr &() const;
     operator EnumDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     EnumDef_ptr in (void) const;
     EnumDef_ptr &inout (void);
     EnumDef_ptr &out (void);
     EnumDef_ptr _retn (void);
     EnumDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static EnumDef_ptr tao_duplicate (EnumDef_ptr);
@@ -2088,25 +1951,25 @@ TAO_NAMESPACE  CORBA
     static EnumDef_ptr tao_nil (void);
     static EnumDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     EnumDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    EnumDef_var (const TAO_Base_var & rhs);
-    EnumDef_var & operator= (const TAO_Base_var & rhs);
+    EnumDef_var (const TAO_Base_var &rhs);
+    EnumDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ENUMDEF___OUT_CH_)
 #define _CORBA_ENUMDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export EnumDef_out
   {
   public:
@@ -2119,52 +1982,52 @@ TAO_NAMESPACE  CORBA
     operator EnumDef_ptr &();
     EnumDef_ptr &ptr (void);
     EnumDef_ptr operator-> (void);
-
+  
   private:
     EnumDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class AliasDef;
 
 #if !defined (_CORBA_ALIASDEF___PTR_CH_)
 #define _CORBA_ALIASDEF___PTR_CH_
-
+  
   typedef AliasDef *AliasDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ALIASDEF___VAR_CH_)
 #define _CORBA_ALIASDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export AliasDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export AliasDef_var : public TAO_Base_var
   {
   public:
     AliasDef_var (void); // default constructor
-    AliasDef_var (AliasDef_ptr p) : ptr_ (p) {}
+    AliasDef_var (AliasDef_ptr p) : ptr_ (p) {} 
     AliasDef_var (const AliasDef_var &); // copy constructor
     ~AliasDef_var (void); // destructor
-
+    
     AliasDef_var &operator= (AliasDef_ptr);
     AliasDef_var &operator= (const AliasDef_var &);
     AliasDef_ptr operator-> (void) const;
-
+    
     operator const AliasDef_ptr &() const;
     operator AliasDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     AliasDef_ptr in (void) const;
     AliasDef_ptr &inout (void);
     AliasDef_ptr &out (void);
     AliasDef_ptr _retn (void);
     AliasDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static AliasDef_ptr tao_duplicate (AliasDef_ptr);
@@ -2172,25 +2035,25 @@ TAO_NAMESPACE  CORBA
     static AliasDef_ptr tao_nil (void);
     static AliasDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     AliasDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    AliasDef_var (const TAO_Base_var & rhs);
-    AliasDef_var & operator= (const TAO_Base_var & rhs);
+    AliasDef_var (const TAO_Base_var &rhs);
+    AliasDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ALIASDEF___OUT_CH_)
 #define _CORBA_ALIASDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export AliasDef_out
   {
   public:
@@ -2203,52 +2066,52 @@ TAO_NAMESPACE  CORBA
     operator AliasDef_ptr &();
     AliasDef_ptr &ptr (void);
     AliasDef_ptr operator-> (void);
-
+  
   private:
     AliasDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class InterfaceDef;
 
 #if !defined (_CORBA_INTERFACEDEF___PTR_CH_)
 #define _CORBA_INTERFACEDEF___PTR_CH_
-
+  
   typedef InterfaceDef *InterfaceDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
 #define _CORBA_INTERFACEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export InterfaceDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export InterfaceDef_var : public TAO_Base_var
   {
   public:
     InterfaceDef_var (void); // default constructor
-    InterfaceDef_var (InterfaceDef_ptr p) : ptr_ (p) {}
+    InterfaceDef_var (InterfaceDef_ptr p) : ptr_ (p) {} 
     InterfaceDef_var (const InterfaceDef_var &); // copy constructor
     ~InterfaceDef_var (void); // destructor
-
+    
     InterfaceDef_var &operator= (InterfaceDef_ptr);
     InterfaceDef_var &operator= (const InterfaceDef_var &);
     InterfaceDef_ptr operator-> (void) const;
-
+    
     operator const InterfaceDef_ptr &() const;
     operator InterfaceDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     InterfaceDef_ptr in (void) const;
     InterfaceDef_ptr &inout (void);
     InterfaceDef_ptr &out (void);
     InterfaceDef_ptr _retn (void);
     InterfaceDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static InterfaceDef_ptr tao_duplicate (InterfaceDef_ptr);
@@ -2256,25 +2119,25 @@ TAO_NAMESPACE  CORBA
     static InterfaceDef_ptr tao_nil (void);
     static InterfaceDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     InterfaceDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    InterfaceDef_var (const TAO_Base_var & rhs);
-    InterfaceDef_var & operator= (const TAO_Base_var & rhs);
+    InterfaceDef_var (const TAO_Base_var &rhs);
+    InterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_INTERFACEDEF___OUT_CH_)
 #define _CORBA_INTERFACEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export InterfaceDef_out
   {
   public:
@@ -2287,21 +2150,21 @@ TAO_NAMESPACE  CORBA
     operator InterfaceDef_ptr &();
     InterfaceDef_ptr &ptr (void);
     InterfaceDef_ptr operator-> (void);
-
+  
   private:
     InterfaceDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
+  // 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_CORBA_INTERFACEDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CH_
-
+  
   class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -2321,14 +2184,14 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
-
+    
     // = Accessors.
     TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var> operator[] (CORBA::ULong index) const;
-
+    
     // = Static operations.
     static InterfaceDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (InterfaceDef **buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -2338,7 +2201,7 @@ TAO_NAMESPACE  CORBA
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-
+    
     virtual void _downcast (
         void* target,
         CORBA::Object *src
@@ -2349,47 +2212,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_INTERFACEDEFSEQ_CH_)
 #define _CORBA_INTERFACEDEFSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class InterfaceDefSeq;
   class InterfaceDefSeq_var;
-
+  
   // *************************************************************
   // CORBA::InterfaceDefSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export InterfaceDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export InterfaceDefSeq : 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_InterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<InterfaceDef,InterfaceDef_var>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     InterfaceDefSeq (void);
     InterfaceDefSeq (CORBA::ULong max);
     InterfaceDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        InterfaceDef_ptr *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        InterfaceDef_ptr *buffer, 
         CORBA::Boolean release = 0
       );
     InterfaceDefSeq (const InterfaceDefSeq &);
     ~InterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef InterfaceDefSeq_var _var_type;
   };
 
@@ -2397,14 +2260,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_INTERFACEDEFSEQ___VAR_CH_)
 #define _CORBA_INTERFACEDEFSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::InterfaceDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export InterfaceDefSeq_var
   {
   public:
@@ -2412,28 +2275,28 @@ TAO_NAMESPACE  CORBA
     InterfaceDefSeq_var (InterfaceDefSeq *);
     InterfaceDefSeq_var (const InterfaceDefSeq_var &);
     ~InterfaceDefSeq_var (void);
-
+    
     InterfaceDefSeq_var &operator= (InterfaceDefSeq *);
     InterfaceDefSeq_var &operator= (const InterfaceDefSeq_var &);
     InterfaceDefSeq *operator-> (void);
     const InterfaceDefSeq *operator-> (void) const;
-
+    
     operator const InterfaceDefSeq &() const;
     operator InterfaceDefSeq &();
     operator InterfaceDefSeq &() const;
-
+    
     // Variable-size base types only.
     operator InterfaceDefSeq *&();
-
+    
     TAO_Object_Manager<InterfaceDef, InterfaceDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const InterfaceDefSeq &in (void) const;
     InterfaceDefSeq &inout (void);
     InterfaceDefSeq *&out (void);
     InterfaceDefSeq *_retn (void);
     InterfaceDefSeq *ptr (void) const;
-
+  
   private:
     InterfaceDefSeq *ptr_;
   };
@@ -2442,10 +2305,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_INTERFACEDEFSEQ___OUT_CH_)
 #define _CORBA_INTERFACEDEFSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export InterfaceDefSeq_out
   {
   public:
@@ -2458,7 +2321,7 @@ TAO_NAMESPACE  CORBA
     InterfaceDefSeq *&ptr (void);
     InterfaceDefSeq *operator-> (void);
     TAO_Object_Manager<InterfaceDef, InterfaceDef_var> operator[] (CORBA::ULong index);
-
+  
   private:
     InterfaceDefSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -2466,51 +2329,51 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class ExceptionDef;
 
 #if !defined (_CORBA_EXCEPTIONDEF___PTR_CH_)
 #define _CORBA_EXCEPTIONDEF___PTR_CH_
-
+  
   typedef ExceptionDef *ExceptionDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_EXCEPTIONDEF___VAR_CH_)
 #define _CORBA_EXCEPTIONDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ExceptionDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ExceptionDef_var : public TAO_Base_var
   {
   public:
     ExceptionDef_var (void); // default constructor
-    ExceptionDef_var (ExceptionDef_ptr p) : ptr_ (p) {}
+    ExceptionDef_var (ExceptionDef_ptr p) : ptr_ (p) {} 
     ExceptionDef_var (const ExceptionDef_var &); // copy constructor
     ~ExceptionDef_var (void); // destructor
-
+    
     ExceptionDef_var &operator= (ExceptionDef_ptr);
     ExceptionDef_var &operator= (const ExceptionDef_var &);
     ExceptionDef_ptr operator-> (void) const;
-
+    
     operator const ExceptionDef_ptr &() const;
     operator ExceptionDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ExceptionDef_ptr in (void) const;
     ExceptionDef_ptr &inout (void);
     ExceptionDef_ptr &out (void);
     ExceptionDef_ptr _retn (void);
     ExceptionDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ExceptionDef_ptr tao_duplicate (ExceptionDef_ptr);
@@ -2518,25 +2381,25 @@ TAO_NAMESPACE  CORBA
     static ExceptionDef_ptr tao_nil (void);
     static ExceptionDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ExceptionDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ExceptionDef_var (const TAO_Base_var & rhs);
-    ExceptionDef_var & operator= (const TAO_Base_var & rhs);
+    ExceptionDef_var (const TAO_Base_var &rhs);
+    ExceptionDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_EXCEPTIONDEF___OUT_CH_)
 #define _CORBA_EXCEPTIONDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ExceptionDef_out
   {
   public:
@@ -2549,52 +2412,52 @@ TAO_NAMESPACE  CORBA
     operator ExceptionDef_ptr &();
     ExceptionDef_ptr &ptr (void);
     ExceptionDef_ptr operator-> (void);
-
+  
   private:
     ExceptionDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class NativeDef;
 
 #if !defined (_CORBA_NATIVEDEF___PTR_CH_)
 #define _CORBA_NATIVEDEF___PTR_CH_
-
+  
   typedef NativeDef *NativeDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_NATIVEDEF___VAR_CH_)
 #define _CORBA_NATIVEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export NativeDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export NativeDef_var : public TAO_Base_var
   {
   public:
     NativeDef_var (void); // default constructor
-    NativeDef_var (NativeDef_ptr p) : ptr_ (p) {}
+    NativeDef_var (NativeDef_ptr p) : ptr_ (p) {} 
     NativeDef_var (const NativeDef_var &); // copy constructor
     ~NativeDef_var (void); // destructor
-
+    
     NativeDef_var &operator= (NativeDef_ptr);
     NativeDef_var &operator= (const NativeDef_var &);
     NativeDef_ptr operator-> (void) const;
-
+    
     operator const NativeDef_ptr &() const;
     operator NativeDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     NativeDef_ptr in (void) const;
     NativeDef_ptr &inout (void);
     NativeDef_ptr &out (void);
     NativeDef_ptr _retn (void);
     NativeDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static NativeDef_ptr tao_duplicate (NativeDef_ptr);
@@ -2602,25 +2465,25 @@ TAO_NAMESPACE  CORBA
     static NativeDef_ptr tao_nil (void);
     static NativeDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     NativeDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    NativeDef_var (const TAO_Base_var & rhs);
-    NativeDef_var & operator= (const TAO_Base_var & rhs);
+    NativeDef_var (const TAO_Base_var &rhs);
+    NativeDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_NATIVEDEF___OUT_CH_)
 #define _CORBA_NATIVEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export NativeDef_out
   {
   public:
@@ -2633,52 +2496,52 @@ TAO_NAMESPACE  CORBA
     operator NativeDef_ptr &();
     NativeDef_ptr &ptr (void);
     NativeDef_ptr operator-> (void);
-
+  
   private:
     NativeDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class ValueDef;
 
 #if !defined (_CORBA_VALUEDEF___PTR_CH_)
 #define _CORBA_VALUEDEF___PTR_CH_
-
+  
   typedef ValueDef *ValueDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_VALUEDEF___VAR_CH_)
 #define _CORBA_VALUEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ValueDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ValueDef_var : public TAO_Base_var
   {
   public:
     ValueDef_var (void); // default constructor
-    ValueDef_var (ValueDef_ptr p) : ptr_ (p) {}
+    ValueDef_var (ValueDef_ptr p) : ptr_ (p) {} 
     ValueDef_var (const ValueDef_var &); // copy constructor
     ~ValueDef_var (void); // destructor
-
+    
     ValueDef_var &operator= (ValueDef_ptr);
     ValueDef_var &operator= (const ValueDef_var &);
     ValueDef_ptr operator-> (void) const;
-
+    
     operator const ValueDef_ptr &() const;
     operator ValueDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ValueDef_ptr in (void) const;
     ValueDef_ptr &inout (void);
     ValueDef_ptr &out (void);
     ValueDef_ptr _retn (void);
     ValueDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ValueDef_ptr tao_duplicate (ValueDef_ptr);
@@ -2686,25 +2549,25 @@ TAO_NAMESPACE  CORBA
     static ValueDef_ptr tao_nil (void);
     static ValueDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ValueDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ValueDef_var (const TAO_Base_var & rhs);
-    ValueDef_var & operator= (const TAO_Base_var & rhs);
+    ValueDef_var (const TAO_Base_var &rhs);
+    ValueDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_VALUEDEF___OUT_CH_)
 #define _CORBA_VALUEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ValueDef_out
   {
   public:
@@ -2717,21 +2580,21 @@ TAO_NAMESPACE  CORBA
     operator ValueDef_ptr &();
     ValueDef_ptr &ptr (void);
     ValueDef_ptr operator-> (void);
-
+  
   private:
     ValueDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
+  // 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_CORBA_VALUEDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CH_
-
+  
   class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -2751,14 +2614,14 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
-
+    
     // = Accessors.
     TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var> operator[] (CORBA::ULong index) const;
-
+    
     // = Static operations.
     static ValueDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (ValueDef **buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -2768,7 +2631,7 @@ TAO_NAMESPACE  CORBA
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-
+    
     virtual void _downcast (
         void* target,
         CORBA::Object *src
@@ -2779,47 +2642,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_VALUEDEFSEQ_CH_)
 #define _CORBA_VALUEDEFSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ValueDefSeq;
   class ValueDefSeq_var;
-
+  
   // *************************************************************
   // CORBA::ValueDefSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export ValueDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export ValueDefSeq : 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_ValueDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<ValueDef,ValueDef_var>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ValueDefSeq (void);
     ValueDefSeq (CORBA::ULong max);
     ValueDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ValueDef_ptr *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ValueDef_ptr *buffer, 
         CORBA::Boolean release = 0
       );
     ValueDefSeq (const ValueDefSeq &);
     ~ValueDefSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef ValueDefSeq_var _var_type;
   };
 
@@ -2827,14 +2690,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_VALUEDEFSEQ___VAR_CH_)
 #define _CORBA_VALUEDEFSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::ValueDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export ValueDefSeq_var
   {
   public:
@@ -2842,28 +2705,28 @@ TAO_NAMESPACE  CORBA
     ValueDefSeq_var (ValueDefSeq *);
     ValueDefSeq_var (const ValueDefSeq_var &);
     ~ValueDefSeq_var (void);
-
+    
     ValueDefSeq_var &operator= (ValueDefSeq *);
     ValueDefSeq_var &operator= (const ValueDefSeq_var &);
     ValueDefSeq *operator-> (void);
     const ValueDefSeq *operator-> (void) const;
-
+    
     operator const ValueDefSeq &() const;
     operator ValueDefSeq &();
     operator ValueDefSeq &() const;
-
+    
     // Variable-size base types only.
     operator ValueDefSeq *&();
-
+    
     TAO_Object_Manager<ValueDef, ValueDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ValueDefSeq &in (void) const;
     ValueDefSeq &inout (void);
     ValueDefSeq *&out (void);
     ValueDefSeq *_retn (void);
     ValueDefSeq *ptr (void) const;
-
+  
   private:
     ValueDefSeq *ptr_;
   };
@@ -2872,10 +2735,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_VALUEDEFSEQ___OUT_CH_)
 #define _CORBA_VALUEDEFSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export ValueDefSeq_out
   {
   public:
@@ -2888,7 +2751,7 @@ TAO_NAMESPACE  CORBA
     ValueDefSeq *&ptr (void);
     ValueDefSeq *operator-> (void);
     TAO_Object_Manager<ValueDef, ValueDef_var> operator[] (CORBA::ULong index);
-
+  
   private:
     ValueDefSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -2896,51 +2759,51 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueDefSeq;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class ValueBoxDef;
 
 #if !defined (_CORBA_VALUEBOXDEF___PTR_CH_)
 #define _CORBA_VALUEBOXDEF___PTR_CH_
-
+  
   typedef ValueBoxDef *ValueBoxDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_VALUEBOXDEF___VAR_CH_)
 #define _CORBA_VALUEBOXDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ValueBoxDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ValueBoxDef_var : public TAO_Base_var
   {
   public:
     ValueBoxDef_var (void); // default constructor
-    ValueBoxDef_var (ValueBoxDef_ptr p) : ptr_ (p) {}
+    ValueBoxDef_var (ValueBoxDef_ptr p) : ptr_ (p) {} 
     ValueBoxDef_var (const ValueBoxDef_var &); // copy constructor
     ~ValueBoxDef_var (void); // destructor
-
+    
     ValueBoxDef_var &operator= (ValueBoxDef_ptr);
     ValueBoxDef_var &operator= (const ValueBoxDef_var &);
     ValueBoxDef_ptr operator-> (void) const;
-
+    
     operator const ValueBoxDef_ptr &() const;
     operator ValueBoxDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ValueBoxDef_ptr in (void) const;
     ValueBoxDef_ptr &inout (void);
     ValueBoxDef_ptr &out (void);
     ValueBoxDef_ptr _retn (void);
     ValueBoxDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ValueBoxDef_ptr tao_duplicate (ValueBoxDef_ptr);
@@ -2948,25 +2811,25 @@ TAO_NAMESPACE  CORBA
     static ValueBoxDef_ptr tao_nil (void);
     static ValueBoxDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ValueBoxDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ValueBoxDef_var (const TAO_Base_var & rhs);
-    ValueBoxDef_var & operator= (const TAO_Base_var & rhs);
+    ValueBoxDef_var (const TAO_Base_var &rhs);
+    ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_VALUEBOXDEF___OUT_CH_)
 #define _CORBA_VALUEBOXDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ValueBoxDef_out
   {
   public:
@@ -2979,52 +2842,52 @@ TAO_NAMESPACE  CORBA
     operator ValueBoxDef_ptr &();
     ValueBoxDef_ptr &ptr (void);
     ValueBoxDef_ptr operator-> (void);
-
+  
   private:
     ValueBoxDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class AbstractInterfaceDef;
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___PTR_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF___PTR_CH_
-
+  
   typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___VAR_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export AbstractInterfaceDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export AbstractInterfaceDef_var : public TAO_Base_var
   {
   public:
     AbstractInterfaceDef_var (void); // default constructor
-    AbstractInterfaceDef_var (AbstractInterfaceDef_ptr p) : ptr_ (p) {}
+    AbstractInterfaceDef_var (AbstractInterfaceDef_ptr p) : ptr_ (p) {} 
     AbstractInterfaceDef_var (const AbstractInterfaceDef_var &); // copy constructor
     ~AbstractInterfaceDef_var (void); // destructor
-
+    
     AbstractInterfaceDef_var &operator= (AbstractInterfaceDef_ptr);
     AbstractInterfaceDef_var &operator= (const AbstractInterfaceDef_var &);
     AbstractInterfaceDef_ptr operator-> (void) const;
-
+    
     operator const AbstractInterfaceDef_ptr &() const;
     operator AbstractInterfaceDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     AbstractInterfaceDef_ptr in (void) const;
     AbstractInterfaceDef_ptr &inout (void);
     AbstractInterfaceDef_ptr &out (void);
     AbstractInterfaceDef_ptr _retn (void);
     AbstractInterfaceDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static AbstractInterfaceDef_ptr tao_duplicate (AbstractInterfaceDef_ptr);
@@ -3032,25 +2895,25 @@ TAO_NAMESPACE  CORBA
     static AbstractInterfaceDef_ptr tao_nil (void);
     static AbstractInterfaceDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     AbstractInterfaceDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    AbstractInterfaceDef_var (const TAO_Base_var & rhs);
-    AbstractInterfaceDef_var & operator= (const TAO_Base_var & rhs);
+    AbstractInterfaceDef_var (const TAO_Base_var &rhs);
+    AbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___OUT_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export AbstractInterfaceDef_out
   {
   public:
@@ -3063,21 +2926,21 @@ TAO_NAMESPACE  CORBA
     operator AbstractInterfaceDef_ptr &();
     AbstractInterfaceDef_ptr &ptr (void);
     AbstractInterfaceDef_ptr operator-> (void);
-
+  
   private:
     AbstractInterfaceDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
+  // 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_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
-
+  
   class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -3097,14 +2960,14 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void);
-
+    
     // = Accessors.
     TAO_Object_Manager<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var> operator[] (CORBA::ULong index) const;
-
+    
     // = Static operations.
     static AbstractInterfaceDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (AbstractInterfaceDef **buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -3114,7 +2977,7 @@ TAO_NAMESPACE  CORBA
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-
+    
     virtual void _downcast (
         void* target,
         CORBA::Object *src
@@ -3125,47 +2988,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class AbstractInterfaceDefSeq;
   class AbstractInterfaceDefSeq_var;
-
+  
   // *************************************************************
   // CORBA::AbstractInterfaceDefSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export AbstractInterfaceDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export AbstractInterfaceDefSeq : 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_AbstractInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<AbstractInterfaceDef,AbstractInterfaceDef_var>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     AbstractInterfaceDefSeq (void);
     AbstractInterfaceDefSeq (CORBA::ULong max);
     AbstractInterfaceDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        AbstractInterfaceDef_ptr *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        AbstractInterfaceDef_ptr *buffer, 
         CORBA::Boolean release = 0
       );
     AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &);
     ~AbstractInterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef AbstractInterfaceDefSeq_var _var_type;
   };
 
@@ -3173,14 +3036,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ___VAR_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::AbstractInterfaceDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export AbstractInterfaceDefSeq_var
   {
   public:
@@ -3188,28 +3051,28 @@ TAO_NAMESPACE  CORBA
     AbstractInterfaceDefSeq_var (AbstractInterfaceDefSeq *);
     AbstractInterfaceDefSeq_var (const AbstractInterfaceDefSeq_var &);
     ~AbstractInterfaceDefSeq_var (void);
-
+    
     AbstractInterfaceDefSeq_var &operator= (AbstractInterfaceDefSeq *);
     AbstractInterfaceDefSeq_var &operator= (const AbstractInterfaceDefSeq_var &);
     AbstractInterfaceDefSeq *operator-> (void);
     const AbstractInterfaceDefSeq *operator-> (void) const;
-
+    
     operator const AbstractInterfaceDefSeq &() const;
     operator AbstractInterfaceDefSeq &();
     operator AbstractInterfaceDefSeq &() const;
-
+    
     // Variable-size base types only.
     operator AbstractInterfaceDefSeq *&();
-
+    
     TAO_Object_Manager<AbstractInterfaceDef, AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const AbstractInterfaceDefSeq &in (void) const;
     AbstractInterfaceDefSeq &inout (void);
     AbstractInterfaceDefSeq *&out (void);
     AbstractInterfaceDefSeq *_retn (void);
     AbstractInterfaceDefSeq *ptr (void) const;
-
+  
   private:
     AbstractInterfaceDefSeq *ptr_;
   };
@@ -3218,10 +3081,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ___OUT_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export AbstractInterfaceDefSeq_out
   {
   public:
@@ -3234,7 +3097,7 @@ TAO_NAMESPACE  CORBA
     AbstractInterfaceDefSeq *&ptr (void);
     AbstractInterfaceDefSeq *operator-> (void);
     TAO_Object_Manager<AbstractInterfaceDef, AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
-
+  
   private:
     AbstractInterfaceDefSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -3242,51 +3105,51 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AbstractInterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class LocalInterfaceDef;
 
 #if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
 #define _CORBA_LOCALINTERFACEDEF___PTR_CH_
-
+  
   typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_LOCALINTERFACEDEF___VAR_CH_)
 #define _CORBA_LOCALINTERFACEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export LocalInterfaceDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export LocalInterfaceDef_var : public TAO_Base_var
   {
   public:
     LocalInterfaceDef_var (void); // default constructor
-    LocalInterfaceDef_var (LocalInterfaceDef_ptr p) : ptr_ (p) {}
+    LocalInterfaceDef_var (LocalInterfaceDef_ptr p) : ptr_ (p) {} 
     LocalInterfaceDef_var (const LocalInterfaceDef_var &); // copy constructor
     ~LocalInterfaceDef_var (void); // destructor
-
+    
     LocalInterfaceDef_var &operator= (LocalInterfaceDef_ptr);
     LocalInterfaceDef_var &operator= (const LocalInterfaceDef_var &);
     LocalInterfaceDef_ptr operator-> (void) const;
-
+    
     operator const LocalInterfaceDef_ptr &() const;
     operator LocalInterfaceDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     LocalInterfaceDef_ptr in (void) const;
     LocalInterfaceDef_ptr &inout (void);
     LocalInterfaceDef_ptr &out (void);
     LocalInterfaceDef_ptr _retn (void);
     LocalInterfaceDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static LocalInterfaceDef_ptr tao_duplicate (LocalInterfaceDef_ptr);
@@ -3294,25 +3157,25 @@ TAO_NAMESPACE  CORBA
     static LocalInterfaceDef_ptr tao_nil (void);
     static LocalInterfaceDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     LocalInterfaceDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    LocalInterfaceDef_var (const TAO_Base_var & rhs);
-    LocalInterfaceDef_var & operator= (const TAO_Base_var & rhs);
+    LocalInterfaceDef_var (const TAO_Base_var &rhs);
+    LocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_LOCALINTERFACEDEF___OUT_CH_)
 #define _CORBA_LOCALINTERFACEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export LocalInterfaceDef_out
   {
   public:
@@ -3325,21 +3188,21 @@ TAO_NAMESPACE  CORBA
     operator LocalInterfaceDef_ptr &();
     LocalInterfaceDef_ptr &ptr (void);
     LocalInterfaceDef_ptr operator-> (void);
-
+  
   private:
     LocalInterfaceDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
+  // 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_CORBA_LOCALINTERFACEDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CH_
-
+  
   class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -3359,14 +3222,14 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void);
-
+    
     // = Accessors.
     TAO_Object_Manager<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var> operator[] (CORBA::ULong index) const;
-
+    
     // = Static operations.
     static LocalInterfaceDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (LocalInterfaceDef **buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -3376,7 +3239,7 @@ TAO_NAMESPACE  CORBA
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-
+    
     virtual void _downcast (
         void* target,
         CORBA::Object *src
@@ -3387,47 +3250,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CH_)
 #define _CORBA_LOCALINTERFACEDEFSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class LocalInterfaceDefSeq;
   class LocalInterfaceDefSeq_var;
-
+  
   // *************************************************************
   // CORBA::LocalInterfaceDefSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export LocalInterfaceDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export LocalInterfaceDefSeq : 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_LocalInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<LocalInterfaceDef,LocalInterfaceDef_var>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     LocalInterfaceDefSeq (void);
     LocalInterfaceDefSeq (CORBA::ULong max);
     LocalInterfaceDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        LocalInterfaceDef_ptr *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        LocalInterfaceDef_ptr *buffer, 
         CORBA::Boolean release = 0
       );
     LocalInterfaceDefSeq (const LocalInterfaceDefSeq &);
     ~LocalInterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef LocalInterfaceDefSeq_var _var_type;
   };
 
@@ -3435,14 +3298,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ___VAR_CH_)
 #define _CORBA_LOCALINTERFACEDEFSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::LocalInterfaceDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export LocalInterfaceDefSeq_var
   {
   public:
@@ -3450,28 +3313,28 @@ TAO_NAMESPACE  CORBA
     LocalInterfaceDefSeq_var (LocalInterfaceDefSeq *);
     LocalInterfaceDefSeq_var (const LocalInterfaceDefSeq_var &);
     ~LocalInterfaceDefSeq_var (void);
-
+    
     LocalInterfaceDefSeq_var &operator= (LocalInterfaceDefSeq *);
     LocalInterfaceDefSeq_var &operator= (const LocalInterfaceDefSeq_var &);
     LocalInterfaceDefSeq *operator-> (void);
     const LocalInterfaceDefSeq *operator-> (void) const;
-
+    
     operator const LocalInterfaceDefSeq &() const;
     operator LocalInterfaceDefSeq &();
     operator LocalInterfaceDefSeq &() const;
-
+    
     // Variable-size base types only.
     operator LocalInterfaceDefSeq *&();
-
+    
     TAO_Object_Manager<LocalInterfaceDef, LocalInterfaceDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const LocalInterfaceDefSeq &in (void) const;
     LocalInterfaceDefSeq &inout (void);
     LocalInterfaceDefSeq *&out (void);
     LocalInterfaceDefSeq *_retn (void);
     LocalInterfaceDefSeq *ptr (void) const;
-
+  
   private:
     LocalInterfaceDefSeq *ptr_;
   };
@@ -3480,10 +3343,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ___OUT_CH_)
 #define _CORBA_LOCALINTERFACEDEFSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export LocalInterfaceDefSeq_out
   {
   public:
@@ -3496,7 +3359,7 @@ TAO_NAMESPACE  CORBA
     LocalInterfaceDefSeq *&ptr (void);
     LocalInterfaceDefSeq *operator-> (void);
     TAO_Object_Manager<LocalInterfaceDef, LocalInterfaceDef_var> operator[] (CORBA::ULong index);
-
+  
   private:
     LocalInterfaceDefSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -3504,30 +3367,1256 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
+  
+  // 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_LocalInterfaceDefSeq;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
+  class ExtInterfaceDef;
 
+#if !defined (_CORBA_EXTINTERFACEDEF___PTR_CH_)
+#define _CORBA_EXTINTERFACEDEF___PTR_CH_
+  
+  typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTINTERFACEDEF___VAR_CH_)
+#define _CORBA_EXTINTERFACEDEF___VAR_CH_
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ExtInterfaceDef_var : public TAO_Base_var
+  {
+  public:
+    ExtInterfaceDef_var (void); // default constructor
+    ExtInterfaceDef_var (ExtInterfaceDef_ptr p) : ptr_ (p) {} 
+    ExtInterfaceDef_var (const ExtInterfaceDef_var &); // copy constructor
+    ~ExtInterfaceDef_var (void); // destructor
+    
+    ExtInterfaceDef_var &operator= (ExtInterfaceDef_ptr);
+    ExtInterfaceDef_var &operator= (const ExtInterfaceDef_var &);
+    ExtInterfaceDef_ptr operator-> (void) const;
+    
+    operator const ExtInterfaceDef_ptr &() const;
+    operator ExtInterfaceDef_ptr &();
+    // in, inout, out, _retn 
+    ExtInterfaceDef_ptr in (void) const;
+    ExtInterfaceDef_ptr &inout (void);
+    ExtInterfaceDef_ptr &out (void);
+    ExtInterfaceDef_ptr _retn (void);
+    ExtInterfaceDef_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ExtInterfaceDef_ptr tao_duplicate (ExtInterfaceDef_ptr);
+    static void tao_release (ExtInterfaceDef_ptr);
+    static ExtInterfaceDef_ptr tao_nil (void);
+    static ExtInterfaceDef_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+  
+  private:
+    ExtInterfaceDef_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ExtInterfaceDef_var (const TAO_Base_var &rhs);
+    ExtInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+  };
 
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LocalInterfaceDefSeq;
+#endif /* end #if !defined */
 
+#if !defined (_CORBA_EXTINTERFACEDEF___OUT_CH_)
+#define _CORBA_EXTINTERFACEDEF___OUT_CH_
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
+  class TAO_IFR_Client_Export ExtInterfaceDef_out
+  {
+  public:
+    ExtInterfaceDef_out (ExtInterfaceDef_ptr &);
+    ExtInterfaceDef_out (ExtInterfaceDef_var &);
+    ExtInterfaceDef_out (const ExtInterfaceDef_out &);
+    ExtInterfaceDef_out &operator= (const ExtInterfaceDef_out &);
+    ExtInterfaceDef_out &operator= (const ExtInterfaceDef_var &);
+    ExtInterfaceDef_out &operator= (ExtInterfaceDef_ptr);
+    operator ExtInterfaceDef_ptr &();
+    ExtInterfaceDef_ptr &ptr (void);
+    ExtInterfaceDef_ptr operator-> (void);
+  
+  private:
+    ExtInterfaceDef_ptr &ptr_;
+  };
 
-  class StructMember_var;
+#endif /* end #if !defined */
+  
+  // 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_CORBA_EXTINTERFACEDEFSEQ_CH_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTINTERFACEDEFSEQ_CH_
+  
+  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (
+        CORBA::ULong maximum,
+        CORBA::ULong length,
+        ExtInterfaceDef* *value,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (
+        const _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<CORBA::ExtInterfaceDef,CORBA::ExtInterfaceDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static ExtInterfaceDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (ExtInterfaceDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ExtInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const ExtInterfaceDef* *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_EXTINTERFACEDEFSEQ_CH_)
+#define _CORBA_EXTINTERFACEDEFSEQ_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ExtInterfaceDefSeq;
+  class ExtInterfaceDefSeq_var;
+  
+  // *************************************************************
+  // CORBA::ExtInterfaceDefSeq
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExtInterfaceDefSeq : 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_ExtInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<ExtInterfaceDef,ExtInterfaceDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  {
+  public:
+    ExtInterfaceDefSeq (void);
+    ExtInterfaceDefSeq (CORBA::ULong max);
+    ExtInterfaceDefSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ExtInterfaceDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ExtInterfaceDefSeq (const ExtInterfaceDefSeq &);
+    ~ExtInterfaceDefSeq (void);
+    
+    static void _tao_any_destructor (void*);
+    
+    typedef ExtInterfaceDefSeq_var _var_type;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTINTERFACEDEFSEQ___VAR_CH_)
+#define _CORBA_EXTINTERFACEDEFSEQ___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
+  // *************************************************************
+  // class CORBA::ExtInterfaceDefSeq_var
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExtInterfaceDefSeq_var
+  {
+  public:
+    ExtInterfaceDefSeq_var (void);
+    ExtInterfaceDefSeq_var (ExtInterfaceDefSeq *);
+    ExtInterfaceDefSeq_var (const ExtInterfaceDefSeq_var &);
+    ~ExtInterfaceDefSeq_var (void);
+    
+    ExtInterfaceDefSeq_var &operator= (ExtInterfaceDefSeq *);
+    ExtInterfaceDefSeq_var &operator= (const ExtInterfaceDefSeq_var &);
+    ExtInterfaceDefSeq *operator-> (void);
+    const ExtInterfaceDefSeq *operator-> (void) const;
+    
+    operator const ExtInterfaceDefSeq &() const;
+    operator ExtInterfaceDefSeq &();
+    operator ExtInterfaceDefSeq &() const;
+    
+    // Variable-size base types only.
+    operator ExtInterfaceDefSeq *&();
+    
+    TAO_Object_Manager<ExtInterfaceDef, ExtInterfaceDef_var> operator[] (CORBA::ULong index);
+    
+    // in, inout, out, _retn 
+    const ExtInterfaceDefSeq &in (void) const;
+    ExtInterfaceDefSeq &inout (void);
+    ExtInterfaceDefSeq *&out (void);
+    ExtInterfaceDefSeq *_retn (void);
+    ExtInterfaceDefSeq *ptr (void) const;
+  
+  private:
+    ExtInterfaceDefSeq *ptr_;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTINTERFACEDEFSEQ___OUT_CH_)
+#define _CORBA_EXTINTERFACEDEFSEQ___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_IFR_Client_Export ExtInterfaceDefSeq_out
+  {
+  public:
+    ExtInterfaceDefSeq_out (ExtInterfaceDefSeq *&);
+    ExtInterfaceDefSeq_out (ExtInterfaceDefSeq_var &);
+    ExtInterfaceDefSeq_out (const ExtInterfaceDefSeq_out &);
+    ExtInterfaceDefSeq_out &operator= (const ExtInterfaceDefSeq_out &);
+    ExtInterfaceDefSeq_out &operator= (ExtInterfaceDefSeq *);
+    operator ExtInterfaceDefSeq *&();
+    ExtInterfaceDefSeq *&ptr (void);
+    ExtInterfaceDefSeq *operator-> (void);
+    TAO_Object_Manager<ExtInterfaceDef, ExtInterfaceDef_var> operator[] (CORBA::ULong index);
+  
+  private:
+    ExtInterfaceDefSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ExtInterfaceDefSeq_var &);
+  };
+
+#endif /* end #if !defined */
+  
+  // 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_ExtInterfaceDefSeq;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
+  class ExtValueDef;
+
+#if !defined (_CORBA_EXTVALUEDEF___PTR_CH_)
+#define _CORBA_EXTVALUEDEF___PTR_CH_
+  
+  typedef ExtValueDef *ExtValueDef_ptr;
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTVALUEDEF___VAR_CH_)
+#define _CORBA_EXTVALUEDEF___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ExtValueDef_var : public TAO_Base_var
+  {
+  public:
+    ExtValueDef_var (void); // default constructor
+    ExtValueDef_var (ExtValueDef_ptr p) : ptr_ (p) {} 
+    ExtValueDef_var (const ExtValueDef_var &); // copy constructor
+    ~ExtValueDef_var (void); // destructor
+    
+    ExtValueDef_var &operator= (ExtValueDef_ptr);
+    ExtValueDef_var &operator= (const ExtValueDef_var &);
+    ExtValueDef_ptr operator-> (void) const;
+    
+    operator const ExtValueDef_ptr &() const;
+    operator ExtValueDef_ptr &();
+    // in, inout, out, _retn 
+    ExtValueDef_ptr in (void) const;
+    ExtValueDef_ptr &inout (void);
+    ExtValueDef_ptr &out (void);
+    ExtValueDef_ptr _retn (void);
+    ExtValueDef_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ExtValueDef_ptr tao_duplicate (ExtValueDef_ptr);
+    static void tao_release (ExtValueDef_ptr);
+    static ExtValueDef_ptr tao_nil (void);
+    static ExtValueDef_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+  
+  private:
+    ExtValueDef_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ExtValueDef_var (const TAO_Base_var &rhs);
+    ExtValueDef_var &operator= (const TAO_Base_var &rhs);
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTVALUEDEF___OUT_CH_)
+#define _CORBA_EXTVALUEDEF___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
+  class TAO_IFR_Client_Export ExtValueDef_out
+  {
+  public:
+    ExtValueDef_out (ExtValueDef_ptr &);
+    ExtValueDef_out (ExtValueDef_var &);
+    ExtValueDef_out (const ExtValueDef_out &);
+    ExtValueDef_out &operator= (const ExtValueDef_out &);
+    ExtValueDef_out &operator= (const ExtValueDef_var &);
+    ExtValueDef_out &operator= (ExtValueDef_ptr);
+    operator ExtValueDef_ptr &();
+    ExtValueDef_ptr &ptr (void);
+    ExtValueDef_ptr operator-> (void);
+  
+  private:
+    ExtValueDef_ptr &ptr_;
+  };
+
+#endif /* end #if !defined */
+  
+  // 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_CORBA_EXTVALUEDEFSEQ_CH_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTVALUEDEFSEQ_CH_
+  
+  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (
+        CORBA::ULong maximum,
+        CORBA::ULong length,
+        ExtValueDef* *value,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (
+        const _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<CORBA::ExtValueDef,CORBA::ExtValueDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static ExtValueDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (ExtValueDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ExtValueDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const ExtValueDef* *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_EXTVALUEDEFSEQ_CH_)
+#define _CORBA_EXTVALUEDEFSEQ_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ExtValueDefSeq;
+  class ExtValueDefSeq_var;
+  
+  // *************************************************************
+  // CORBA::ExtValueDefSeq
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExtValueDefSeq : 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_ExtValueDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<ExtValueDef,ExtValueDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  {
+  public:
+    ExtValueDefSeq (void);
+    ExtValueDefSeq (CORBA::ULong max);
+    ExtValueDefSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ExtValueDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ExtValueDefSeq (const ExtValueDefSeq &);
+    ~ExtValueDefSeq (void);
+    
+    static void _tao_any_destructor (void*);
+    
+    typedef ExtValueDefSeq_var _var_type;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTVALUEDEFSEQ___VAR_CH_)
+#define _CORBA_EXTVALUEDEFSEQ___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
+  // *************************************************************
+  // class CORBA::ExtValueDefSeq_var
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExtValueDefSeq_var
+  {
+  public:
+    ExtValueDefSeq_var (void);
+    ExtValueDefSeq_var (ExtValueDefSeq *);
+    ExtValueDefSeq_var (const ExtValueDefSeq_var &);
+    ~ExtValueDefSeq_var (void);
+    
+    ExtValueDefSeq_var &operator= (ExtValueDefSeq *);
+    ExtValueDefSeq_var &operator= (const ExtValueDefSeq_var &);
+    ExtValueDefSeq *operator-> (void);
+    const ExtValueDefSeq *operator-> (void) const;
+    
+    operator const ExtValueDefSeq &() const;
+    operator ExtValueDefSeq &();
+    operator ExtValueDefSeq &() const;
+    
+    // Variable-size base types only.
+    operator ExtValueDefSeq *&();
+    
+    TAO_Object_Manager<ExtValueDef, ExtValueDef_var> operator[] (CORBA::ULong index);
+    
+    // in, inout, out, _retn 
+    const ExtValueDefSeq &in (void) const;
+    ExtValueDefSeq &inout (void);
+    ExtValueDefSeq *&out (void);
+    ExtValueDefSeq *_retn (void);
+    ExtValueDefSeq *ptr (void) const;
+  
+  private:
+    ExtValueDefSeq *ptr_;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTVALUEDEFSEQ___OUT_CH_)
+#define _CORBA_EXTVALUEDEFSEQ___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_IFR_Client_Export ExtValueDefSeq_out
+  {
+  public:
+    ExtValueDefSeq_out (ExtValueDefSeq *&);
+    ExtValueDefSeq_out (ExtValueDefSeq_var &);
+    ExtValueDefSeq_out (const ExtValueDefSeq_out &);
+    ExtValueDefSeq_out &operator= (const ExtValueDefSeq_out &);
+    ExtValueDefSeq_out &operator= (ExtValueDefSeq *);
+    operator ExtValueDefSeq *&();
+    ExtValueDefSeq *&ptr (void);
+    ExtValueDefSeq *operator-> (void);
+    TAO_Object_Manager<ExtValueDef, ExtValueDef_var> operator[] (CORBA::ULong index);
+  
+  private:
+    ExtValueDefSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ExtValueDefSeq_var &);
+  };
+
+#endif /* end #if !defined */
+  
+  // 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_ExtValueDefSeq;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
+  class ExtAbstractInterfaceDef;
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___PTR_CH_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF___PTR_CH_
+  
+  typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___VAR_CH_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ExtAbstractInterfaceDef_var : public TAO_Base_var
+  {
+  public:
+    ExtAbstractInterfaceDef_var (void); // default constructor
+    ExtAbstractInterfaceDef_var (ExtAbstractInterfaceDef_ptr p) : ptr_ (p) {} 
+    ExtAbstractInterfaceDef_var (const ExtAbstractInterfaceDef_var &); // copy constructor
+    ~ExtAbstractInterfaceDef_var (void); // destructor
+    
+    ExtAbstractInterfaceDef_var &operator= (ExtAbstractInterfaceDef_ptr);
+    ExtAbstractInterfaceDef_var &operator= (const ExtAbstractInterfaceDef_var &);
+    ExtAbstractInterfaceDef_ptr operator-> (void) const;
+    
+    operator const ExtAbstractInterfaceDef_ptr &() const;
+    operator ExtAbstractInterfaceDef_ptr &();
+    // in, inout, out, _retn 
+    ExtAbstractInterfaceDef_ptr in (void) const;
+    ExtAbstractInterfaceDef_ptr &inout (void);
+    ExtAbstractInterfaceDef_ptr &out (void);
+    ExtAbstractInterfaceDef_ptr _retn (void);
+    ExtAbstractInterfaceDef_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ExtAbstractInterfaceDef_ptr tao_duplicate (ExtAbstractInterfaceDef_ptr);
+    static void tao_release (ExtAbstractInterfaceDef_ptr);
+    static ExtAbstractInterfaceDef_ptr tao_nil (void);
+    static ExtAbstractInterfaceDef_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+  
+  private:
+    ExtAbstractInterfaceDef_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ExtAbstractInterfaceDef_var (const TAO_Base_var &rhs);
+    ExtAbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___OUT_CH_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
+  class TAO_IFR_Client_Export ExtAbstractInterfaceDef_out
+  {
+  public:
+    ExtAbstractInterfaceDef_out (ExtAbstractInterfaceDef_ptr &);
+    ExtAbstractInterfaceDef_out (ExtAbstractInterfaceDef_var &);
+    ExtAbstractInterfaceDef_out (const ExtAbstractInterfaceDef_out &);
+    ExtAbstractInterfaceDef_out &operator= (const ExtAbstractInterfaceDef_out &);
+    ExtAbstractInterfaceDef_out &operator= (const ExtAbstractInterfaceDef_var &);
+    ExtAbstractInterfaceDef_out &operator= (ExtAbstractInterfaceDef_ptr);
+    operator ExtAbstractInterfaceDef_ptr &();
+    ExtAbstractInterfaceDef_ptr &ptr (void);
+    ExtAbstractInterfaceDef_ptr operator-> (void);
+  
+  private:
+    ExtAbstractInterfaceDef_ptr &ptr_;
+  };
+
+#endif /* end #if !defined */
+  
+  // 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_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_
+  
+  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (
+        CORBA::ULong maximum,
+        CORBA::ULong length,
+        ExtAbstractInterfaceDef* *value,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (
+        const _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<CORBA::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static ExtAbstractInterfaceDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (ExtAbstractInterfaceDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ExtAbstractInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const ExtAbstractInterfaceDef* *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_EXTABSTRACTINTERFACEDEFSEQ_CH_)
+#define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ExtAbstractInterfaceDefSeq;
+  class ExtAbstractInterfaceDefSeq_var;
+  
+  // *************************************************************
+  // CORBA::ExtAbstractInterfaceDefSeq
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq : 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_ExtAbstractInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<ExtAbstractInterfaceDef,ExtAbstractInterfaceDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  {
+  public:
+    ExtAbstractInterfaceDefSeq (void);
+    ExtAbstractInterfaceDefSeq (CORBA::ULong max);
+    ExtAbstractInterfaceDefSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ExtAbstractInterfaceDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ExtAbstractInterfaceDefSeq (const ExtAbstractInterfaceDefSeq &);
+    ~ExtAbstractInterfaceDefSeq (void);
+    
+    static void _tao_any_destructor (void*);
+    
+    typedef ExtAbstractInterfaceDefSeq_var _var_type;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ___VAR_CH_)
+#define _CORBA_EXTABSTRACTINTERFACEDEFSEQ___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
+  // *************************************************************
+  // class CORBA::ExtAbstractInterfaceDefSeq_var
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq_var
+  {
+  public:
+    ExtAbstractInterfaceDefSeq_var (void);
+    ExtAbstractInterfaceDefSeq_var (ExtAbstractInterfaceDefSeq *);
+    ExtAbstractInterfaceDefSeq_var (const ExtAbstractInterfaceDefSeq_var &);
+    ~ExtAbstractInterfaceDefSeq_var (void);
+    
+    ExtAbstractInterfaceDefSeq_var &operator= (ExtAbstractInterfaceDefSeq *);
+    ExtAbstractInterfaceDefSeq_var &operator= (const ExtAbstractInterfaceDefSeq_var &);
+    ExtAbstractInterfaceDefSeq *operator-> (void);
+    const ExtAbstractInterfaceDefSeq *operator-> (void) const;
+    
+    operator const ExtAbstractInterfaceDefSeq &() const;
+    operator ExtAbstractInterfaceDefSeq &();
+    operator ExtAbstractInterfaceDefSeq &() const;
+    
+    // Variable-size base types only.
+    operator ExtAbstractInterfaceDefSeq *&();
+    
+    TAO_Object_Manager<ExtAbstractInterfaceDef, ExtAbstractInterfaceDef_var> operator[] (CORBA::ULong index);
+    
+    // in, inout, out, _retn 
+    const ExtAbstractInterfaceDefSeq &in (void) const;
+    ExtAbstractInterfaceDefSeq &inout (void);
+    ExtAbstractInterfaceDefSeq *&out (void);
+    ExtAbstractInterfaceDefSeq *_retn (void);
+    ExtAbstractInterfaceDefSeq *ptr (void) const;
+  
+  private:
+    ExtAbstractInterfaceDefSeq *ptr_;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ___OUT_CH_)
+#define _CORBA_EXTABSTRACTINTERFACEDEFSEQ___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq_out
+  {
+  public:
+    ExtAbstractInterfaceDefSeq_out (ExtAbstractInterfaceDefSeq *&);
+    ExtAbstractInterfaceDefSeq_out (ExtAbstractInterfaceDefSeq_var &);
+    ExtAbstractInterfaceDefSeq_out (const ExtAbstractInterfaceDefSeq_out &);
+    ExtAbstractInterfaceDefSeq_out &operator= (const ExtAbstractInterfaceDefSeq_out &);
+    ExtAbstractInterfaceDefSeq_out &operator= (ExtAbstractInterfaceDefSeq *);
+    operator ExtAbstractInterfaceDefSeq *&();
+    ExtAbstractInterfaceDefSeq *&ptr (void);
+    ExtAbstractInterfaceDefSeq *operator-> (void);
+    TAO_Object_Manager<ExtAbstractInterfaceDef, ExtAbstractInterfaceDef_var> operator[] (CORBA::ULong index);
+  
+  private:
+    ExtAbstractInterfaceDefSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ExtAbstractInterfaceDefSeq_var &);
+  };
+
+#endif /* end #if !defined */
+  
+  // 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_ExtAbstractInterfaceDefSeq;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
+  class ExtLocalInterfaceDef;
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF___PTR_CH_)
+#define _CORBA_EXTLOCALINTERFACEDEF___PTR_CH_
+  
+  typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF___VAR_CH_)
+#define _CORBA_EXTLOCALINTERFACEDEF___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ExtLocalInterfaceDef_var : public TAO_Base_var
+  {
+  public:
+    ExtLocalInterfaceDef_var (void); // default constructor
+    ExtLocalInterfaceDef_var (ExtLocalInterfaceDef_ptr p) : ptr_ (p) {} 
+    ExtLocalInterfaceDef_var (const ExtLocalInterfaceDef_var &); // copy constructor
+    ~ExtLocalInterfaceDef_var (void); // destructor
+    
+    ExtLocalInterfaceDef_var &operator= (ExtLocalInterfaceDef_ptr);
+    ExtLocalInterfaceDef_var &operator= (const ExtLocalInterfaceDef_var &);
+    ExtLocalInterfaceDef_ptr operator-> (void) const;
+    
+    operator const ExtLocalInterfaceDef_ptr &() const;
+    operator ExtLocalInterfaceDef_ptr &();
+    // in, inout, out, _retn 
+    ExtLocalInterfaceDef_ptr in (void) const;
+    ExtLocalInterfaceDef_ptr &inout (void);
+    ExtLocalInterfaceDef_ptr &out (void);
+    ExtLocalInterfaceDef_ptr _retn (void);
+    ExtLocalInterfaceDef_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ExtLocalInterfaceDef_ptr tao_duplicate (ExtLocalInterfaceDef_ptr);
+    static void tao_release (ExtLocalInterfaceDef_ptr);
+    static ExtLocalInterfaceDef_ptr tao_nil (void);
+    static ExtLocalInterfaceDef_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+  
+  private:
+    ExtLocalInterfaceDef_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ExtLocalInterfaceDef_var (const TAO_Base_var &rhs);
+    ExtLocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF___OUT_CH_)
+#define _CORBA_EXTLOCALINTERFACEDEF___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
+  class TAO_IFR_Client_Export ExtLocalInterfaceDef_out
+  {
+  public:
+    ExtLocalInterfaceDef_out (ExtLocalInterfaceDef_ptr &);
+    ExtLocalInterfaceDef_out (ExtLocalInterfaceDef_var &);
+    ExtLocalInterfaceDef_out (const ExtLocalInterfaceDef_out &);
+    ExtLocalInterfaceDef_out &operator= (const ExtLocalInterfaceDef_out &);
+    ExtLocalInterfaceDef_out &operator= (const ExtLocalInterfaceDef_var &);
+    ExtLocalInterfaceDef_out &operator= (ExtLocalInterfaceDef_ptr);
+    operator ExtLocalInterfaceDef_ptr &();
+    ExtLocalInterfaceDef_ptr &ptr (void);
+    ExtLocalInterfaceDef_ptr operator-> (void);
+  
+  private:
+    ExtLocalInterfaceDef_ptr &ptr_;
+  };
+
+#endif /* end #if !defined */
+  
+  // 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_CORBA_EXTLOCALINTERFACEDEFSEQ_CH_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTLOCALINTERFACEDEFSEQ_CH_
+  
+  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (
+        CORBA::ULong maximum,
+        CORBA::ULong length,
+        ExtLocalInterfaceDef* *value,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (
+        const _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<CORBA::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static ExtLocalInterfaceDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (ExtLocalInterfaceDef **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ExtLocalInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const ExtLocalInterfaceDef* *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_EXTLOCALINTERFACEDEFSEQ_CH_)
+#define _CORBA_EXTLOCALINTERFACEDEFSEQ_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ExtLocalInterfaceDefSeq;
+  class ExtLocalInterfaceDefSeq_var;
+  
+  // *************************************************************
+  // CORBA::ExtLocalInterfaceDefSeq
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq : 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_ExtLocalInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<ExtLocalInterfaceDef,ExtLocalInterfaceDef_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  {
+  public:
+    ExtLocalInterfaceDefSeq (void);
+    ExtLocalInterfaceDefSeq (CORBA::ULong max);
+    ExtLocalInterfaceDefSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ExtLocalInterfaceDef_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ExtLocalInterfaceDefSeq (const ExtLocalInterfaceDefSeq &);
+    ~ExtLocalInterfaceDefSeq (void);
+    
+    static void _tao_any_destructor (void*);
+    
+    typedef ExtLocalInterfaceDefSeq_var _var_type;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ___VAR_CH_)
+#define _CORBA_EXTLOCALINTERFACEDEFSEQ___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
+  // *************************************************************
+  // class CORBA::ExtLocalInterfaceDefSeq_var
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq_var
+  {
+  public:
+    ExtLocalInterfaceDefSeq_var (void);
+    ExtLocalInterfaceDefSeq_var (ExtLocalInterfaceDefSeq *);
+    ExtLocalInterfaceDefSeq_var (const ExtLocalInterfaceDefSeq_var &);
+    ~ExtLocalInterfaceDefSeq_var (void);
+    
+    ExtLocalInterfaceDefSeq_var &operator= (ExtLocalInterfaceDefSeq *);
+    ExtLocalInterfaceDefSeq_var &operator= (const ExtLocalInterfaceDefSeq_var &);
+    ExtLocalInterfaceDefSeq *operator-> (void);
+    const ExtLocalInterfaceDefSeq *operator-> (void) const;
+    
+    operator const ExtLocalInterfaceDefSeq &() const;
+    operator ExtLocalInterfaceDefSeq &();
+    operator ExtLocalInterfaceDefSeq &() const;
+    
+    // Variable-size base types only.
+    operator ExtLocalInterfaceDefSeq *&();
+    
+    TAO_Object_Manager<ExtLocalInterfaceDef, ExtLocalInterfaceDef_var> operator[] (CORBA::ULong index);
+    
+    // in, inout, out, _retn 
+    const ExtLocalInterfaceDefSeq &in (void) const;
+    ExtLocalInterfaceDefSeq &inout (void);
+    ExtLocalInterfaceDefSeq *&out (void);
+    ExtLocalInterfaceDefSeq *_retn (void);
+    ExtLocalInterfaceDefSeq *ptr (void) const;
+  
+  private:
+    ExtLocalInterfaceDefSeq *ptr_;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ___OUT_CH_)
+#define _CORBA_EXTLOCALINTERFACEDEFSEQ___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq_out
+  {
+  public:
+    ExtLocalInterfaceDefSeq_out (ExtLocalInterfaceDefSeq *&);
+    ExtLocalInterfaceDefSeq_out (ExtLocalInterfaceDefSeq_var &);
+    ExtLocalInterfaceDefSeq_out (const ExtLocalInterfaceDefSeq_out &);
+    ExtLocalInterfaceDefSeq_out &operator= (const ExtLocalInterfaceDefSeq_out &);
+    ExtLocalInterfaceDefSeq_out &operator= (ExtLocalInterfaceDefSeq *);
+    operator ExtLocalInterfaceDefSeq *&();
+    ExtLocalInterfaceDefSeq *&ptr (void);
+    ExtLocalInterfaceDefSeq *operator-> (void);
+    TAO_Object_Manager<ExtLocalInterfaceDef, ExtLocalInterfaceDef_var> operator[] (CORBA::ULong index);
+  
+  private:
+    ExtLocalInterfaceDefSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ExtLocalInterfaceDefSeq_var &);
+  };
+
+#endif /* end #if !defined */
+  
+  // 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_ExtLocalInterfaceDefSeq;
+  
+  // 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_CORBA_CONTAINEDSEQ_CH_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CH_
+  
+  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
+        CORBA::ULong maximum,
+        CORBA::ULong length,
+        Contained* *value,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
+        const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
+      );
+    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &operator= (
+        const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
+    
+    // = Accessors.
+    TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static Contained **allocbuf (CORBA::ULong nelems);
+    static void freebuf (Contained **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    Contained* *get_buffer (CORBA::Boolean orphan = 0);
+    const Contained* *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_CONTAINEDSEQ_CH_)
+#define _CORBA_CONTAINEDSEQ_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ContainedSeq;
+  class ContainedSeq_var;
+  
+  // *************************************************************
+  // CORBA::ContainedSeq
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ContainedSeq : 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_ContainedSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<Contained,Contained_var>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  {
+  public:
+    ContainedSeq (void);
+    ContainedSeq (CORBA::ULong max);
+    ContainedSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        Contained_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ContainedSeq (const ContainedSeq &);
+    ~ContainedSeq (void);
+    
+    static void _tao_any_destructor (void*);
+    
+    typedef ContainedSeq_var _var_type;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_CONTAINEDSEQ___VAR_CH_)
+#define _CORBA_CONTAINEDSEQ___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
+  // *************************************************************
+  // class CORBA::ContainedSeq_var
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ContainedSeq_var
+  {
+  public:
+    ContainedSeq_var (void);
+    ContainedSeq_var (ContainedSeq *);
+    ContainedSeq_var (const ContainedSeq_var &);
+    ~ContainedSeq_var (void);
+    
+    ContainedSeq_var &operator= (ContainedSeq *);
+    ContainedSeq_var &operator= (const ContainedSeq_var &);
+    ContainedSeq *operator-> (void);
+    const ContainedSeq *operator-> (void) const;
+    
+    operator const ContainedSeq &() const;
+    operator ContainedSeq &();
+    operator ContainedSeq &() const;
+    
+    // Variable-size base types only.
+    operator ContainedSeq *&();
+    
+    TAO_Object_Manager<Contained, Contained_var> operator[] (CORBA::ULong index);
+    
+    // in, inout, out, _retn 
+    const ContainedSeq &in (void) const;
+    ContainedSeq &inout (void);
+    ContainedSeq *&out (void);
+    ContainedSeq *_retn (void);
+    ContainedSeq *ptr (void) const;
+  
+  private:
+    ContainedSeq *ptr_;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_CONTAINEDSEQ___OUT_CH_)
+#define _CORBA_CONTAINEDSEQ___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_IFR_Client_Export ContainedSeq_out
+  {
+  public:
+    ContainedSeq_out (ContainedSeq *&);
+    ContainedSeq_out (ContainedSeq_var &);
+    ContainedSeq_out (const ContainedSeq_out &);
+    ContainedSeq_out &operator= (const ContainedSeq_out &);
+    ContainedSeq_out &operator= (ContainedSeq *);
+    operator ContainedSeq *&();
+    ContainedSeq *&ptr (void);
+    ContainedSeq *operator-> (void);
+    TAO_Object_Manager<Contained, Contained_var> operator[] (CORBA::ULong index);
+  
+  private:
+    ContainedSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ContainedSeq_var &);
+  };
+
+#endif /* end #if !defined */
+  
+  // 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_ContainedSeq;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class StructMember_var;
+  
   struct TAO_IFR_Client_Export StructMember
   {
     typedef StructMember_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_IFR_Client_Export StructMember_var
   {
   public:
@@ -3535,33 +4624,33 @@ TAO_NAMESPACE  CORBA
     StructMember_var (StructMember *);
     StructMember_var (const StructMember_var &);
     ~StructMember_var (void);
-
+    
     StructMember_var &operator= (StructMember *);
     StructMember_var &operator= (const StructMember_var &);
     StructMember *operator-> (void);
     const StructMember *operator-> (void) const;
-
+    
     operator const StructMember &() const;
     operator StructMember &();
     operator StructMember &() const;
-
+    
     // Variable-size types only.
     operator StructMember *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const StructMember &in (void) const;
     StructMember &inout (void);
     StructMember *&out (void);
     StructMember *_retn (void);
     StructMember *ptr (void) const;
-
+  
   private:
     StructMember *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_IFR_Client_Export StructMember_out
   {
   public:
@@ -3573,32 +4662,32 @@ TAO_NAMESPACE  CORBA
     operator StructMember *&();
     StructMember *&ptr (void);
     StructMember *operator-> (void);
-
+    
   private:
     StructMember *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const StructMember_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMember;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+  
+  // 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_CORBA_STRUCTMEMBERSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CH_
-
+  
   class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -3612,15 +4701,15 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void);
-
+    
     // = Accessors.
     StructMember &operator[] (CORBA::ULong i);
     const StructMember &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static StructMember *allocbuf (CORBA::ULong size);
     static void freebuf (StructMember *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -3636,47 +4725,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ_CH_)
 #define _CORBA_STRUCTMEMBERSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class StructMemberSeq;
   class StructMemberSeq_var;
-
+  
   // *************************************************************
   // CORBA::StructMemberSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export StructMemberSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export StructMemberSeq : 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_CORBA_StructMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<StructMember>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     StructMemberSeq (void);
     StructMemberSeq (CORBA::ULong max);
     StructMemberSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        StructMember *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        StructMember *buffer, 
         CORBA::Boolean release = 0
       );
     StructMemberSeq (const StructMemberSeq &);
     ~StructMemberSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef StructMemberSeq_var _var_type;
   };
 
@@ -3684,14 +4773,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ___VAR_CH_)
 #define _CORBA_STRUCTMEMBERSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::StructMemberSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export StructMemberSeq_var
   {
   public:
@@ -3699,29 +4788,29 @@ TAO_NAMESPACE  CORBA
     StructMemberSeq_var (StructMemberSeq *);
     StructMemberSeq_var (const StructMemberSeq_var &);
     ~StructMemberSeq_var (void);
-
+    
     StructMemberSeq_var &operator= (StructMemberSeq *);
     StructMemberSeq_var &operator= (const StructMemberSeq_var &);
     StructMemberSeq *operator-> (void);
     const StructMemberSeq *operator-> (void) const;
-
+    
     operator const StructMemberSeq &() const;
     operator StructMemberSeq &();
     operator StructMemberSeq &() const;
-
+    
     // Variable-size base types only.
     operator StructMemberSeq *&();
-
+    
     StructMember & operator[] (CORBA::ULong index);
     const StructMember & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const StructMemberSeq &in (void) const;
     StructMemberSeq &inout (void);
     StructMemberSeq *&out (void);
     StructMemberSeq *_retn (void);
     StructMemberSeq *ptr (void) const;
-
+  
   private:
     StructMemberSeq *ptr_;
   };
@@ -3730,10 +4819,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ___OUT_CH_)
 #define _CORBA_STRUCTMEMBERSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export StructMemberSeq_out
   {
   public:
@@ -3746,7 +4835,7 @@ TAO_NAMESPACE  CORBA
     StructMemberSeq *&ptr (void);
     StructMemberSeq *operator-> (void);
     StructMember & operator[] (CORBA::ULong index);
-
+  
   private:
     StructMemberSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -3754,29 +4843,29 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMemberSeq;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class Initializer_var;
-
+  
   struct TAO_IFR_Client_Export Initializer
   {
     typedef Initializer_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CORBA::StructMemberSeq members;
     TAO_String_Manager name;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_IFR_Client_Export Initializer_var
   {
   public:
@@ -3784,33 +4873,33 @@ TAO_NAMESPACE  CORBA
     Initializer_var (Initializer *);
     Initializer_var (const Initializer_var &);
     ~Initializer_var (void);
-
+    
     Initializer_var &operator= (Initializer *);
     Initializer_var &operator= (const Initializer_var &);
     Initializer *operator-> (void);
     const Initializer *operator-> (void) const;
-
+    
     operator const Initializer &() const;
     operator Initializer &();
     operator Initializer &() const;
-
+    
     // Variable-size types only.
     operator Initializer *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const Initializer &in (void) const;
     Initializer &inout (void);
     Initializer *&out (void);
     Initializer *_retn (void);
     Initializer *ptr (void) const;
-
+  
   private:
     Initializer *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_IFR_Client_Export Initializer_out
   {
   public:
@@ -3822,32 +4911,32 @@ TAO_NAMESPACE  CORBA
     operator Initializer *&();
     Initializer *&ptr (void);
     Initializer *operator-> (void);
-
+    
   private:
     Initializer *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const Initializer_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Initializer;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+  
+  // 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_CORBA_INITIALIZERSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CH_
-
+  
   class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_InitializerSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     _TAO_Unbounded_Sequence_CORBA_InitializerSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_CORBA_InitializerSeq (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -3861,15 +4950,15 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void);
-
+    
     // = Accessors.
     Initializer &operator[] (CORBA::ULong i);
     const Initializer &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static Initializer *allocbuf (CORBA::ULong size);
     static void freebuf (Initializer *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -3885,47 +4974,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_INITIALIZERSEQ_CH_)
 #define _CORBA_INITIALIZERSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class InitializerSeq;
   class InitializerSeq_var;
-
+  
   // *************************************************************
   // CORBA::InitializerSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export InitializerSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export InitializerSeq : 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_CORBA_InitializerSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<Initializer>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     InitializerSeq (void);
     InitializerSeq (CORBA::ULong max);
     InitializerSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Initializer *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        Initializer *buffer, 
         CORBA::Boolean release = 0
       );
     InitializerSeq (const InitializerSeq &);
     ~InitializerSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef InitializerSeq_var _var_type;
   };
 
@@ -3933,14 +5022,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_INITIALIZERSEQ___VAR_CH_)
 #define _CORBA_INITIALIZERSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::InitializerSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export InitializerSeq_var
   {
   public:
@@ -3948,29 +5037,29 @@ TAO_NAMESPACE  CORBA
     InitializerSeq_var (InitializerSeq *);
     InitializerSeq_var (const InitializerSeq_var &);
     ~InitializerSeq_var (void);
-
+    
     InitializerSeq_var &operator= (InitializerSeq *);
     InitializerSeq_var &operator= (const InitializerSeq_var &);
     InitializerSeq *operator-> (void);
     const InitializerSeq *operator-> (void) const;
-
+    
     operator const InitializerSeq &() const;
     operator InitializerSeq &();
     operator InitializerSeq &() const;
-
+    
     // Variable-size base types only.
     operator InitializerSeq *&();
-
+    
     Initializer & operator[] (CORBA::ULong index);
     const Initializer & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const InitializerSeq &in (void) const;
     InitializerSeq &inout (void);
     InitializerSeq *&out (void);
     InitializerSeq *_retn (void);
     InitializerSeq *ptr (void) const;
-
+  
   private:
     InitializerSeq *ptr_;
   };
@@ -3979,10 +5068,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_INITIALIZERSEQ___OUT_CH_)
 #define _CORBA_INITIALIZERSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export InitializerSeq_out
   {
   public:
@@ -3995,7 +5084,7 @@ TAO_NAMESPACE  CORBA
     InitializerSeq *&ptr (void);
     InitializerSeq *operator-> (void);
     Initializer & operator[] (CORBA::ULong index);
-
+  
   private:
     InitializerSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -4003,31 +5092,533 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
+  
+  // 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_InitializerSeq;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class ExceptionDescription_var;
+  
+  struct TAO_IFR_Client_Export ExceptionDescription
+  {
+    typedef ExceptionDescription_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    TAO_String_Manager name;
+    TAO_String_Manager id;
+    TAO_String_Manager defined_in;
+    TAO_String_Manager version;
+    CORBA::TypeCode_var type;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
+  class TAO_IFR_Client_Export ExceptionDescription_var
+  {
+  public:
+    ExceptionDescription_var (void);
+    ExceptionDescription_var (ExceptionDescription *);
+    ExceptionDescription_var (const ExceptionDescription_var &);
+    ~ExceptionDescription_var (void);
+    
+    ExceptionDescription_var &operator= (ExceptionDescription *);
+    ExceptionDescription_var &operator= (const ExceptionDescription_var &);
+    ExceptionDescription *operator-> (void);
+    const ExceptionDescription *operator-> (void) const;
+    
+    operator const ExceptionDescription &() const;
+    operator ExceptionDescription &();
+    operator ExceptionDescription &() const;
+    
+    // Variable-size types only.
+    operator ExceptionDescription *&();
+    
+    // in, inout, out, _retn 
+    const ExceptionDescription &in (void) const;
+    ExceptionDescription &inout (void);
+    ExceptionDescription *&out (void);
+    ExceptionDescription *_retn (void);
+    ExceptionDescription *ptr (void) const;
+  
+  private:
+    ExceptionDescription *ptr_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
+  class TAO_IFR_Client_Export ExceptionDescription_out
+  {
+  public:
+    ExceptionDescription_out (ExceptionDescription *&);
+    ExceptionDescription_out (ExceptionDescription_var &);
+    ExceptionDescription_out (const ExceptionDescription_out &);
+    ExceptionDescription_out &operator= (const ExceptionDescription_out &);
+    ExceptionDescription_out &operator= (ExceptionDescription *);
+    operator ExceptionDescription *&();
+    ExceptionDescription *&ptr (void);
+    ExceptionDescription *operator-> (void);
+    
+  private:
+    ExceptionDescription *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ExceptionDescription_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_ExceptionDescription;
+  
+  // 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_CORBA_EXCDESCRIPTIONSEQ_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CH_
+  
+  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void);
+    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum); 
+    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
+        CORBA::ULong maximum,
+        CORBA::ULong length,
+        ExceptionDescription *data,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
+        const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
+      );
+    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &operator= (
+        const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void);
+    
+    // = Accessors.
+    ExceptionDescription &operator[] (CORBA::ULong i);
+    const ExceptionDescription &operator[] (CORBA::ULong i) const;
+    
+    // = Static operations.
+    static ExceptionDescription *allocbuf (CORBA::ULong size);
+    static void freebuf (ExceptionDescription *buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ExceptionDescription *get_buffer (CORBA::Boolean orphan = 0);
+    const ExceptionDescription *get_buffer (void) const;
+    void replace (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ExceptionDescription *data,
+        CORBA::Boolean release
+      );
+  };
+
+#endif /* end #if !defined */
 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CH_)
+#define _CORBA_EXCDESCRIPTIONSEQ_CH_
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ExcDescriptionSeq;
+  class ExcDescriptionSeq_var;
+  
+  // *************************************************************
+  // CORBA::ExcDescriptionSeq
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExcDescriptionSeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InitializerSeq;
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<ExceptionDescription>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  {
+  public:
+    ExcDescriptionSeq (void);
+    ExcDescriptionSeq (CORBA::ULong max);
+    ExcDescriptionSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ExceptionDescription *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ExcDescriptionSeq (const ExcDescriptionSeq &);
+    ~ExcDescriptionSeq (void);
+    
+    static void _tao_any_destructor (void*);
+    
+    typedef ExcDescriptionSeq_var _var_type;
+  };
+
+#endif /* end #if !defined */
 
+#if !defined (_CORBA_EXCDESCRIPTIONSEQ___VAR_CH_)
+#define _CORBA_EXCDESCRIPTIONSEQ___VAR_CH_
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
+  // *************************************************************
+  // class CORBA::ExcDescriptionSeq_var
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExcDescriptionSeq_var
+  {
+  public:
+    ExcDescriptionSeq_var (void);
+    ExcDescriptionSeq_var (ExcDescriptionSeq *);
+    ExcDescriptionSeq_var (const ExcDescriptionSeq_var &);
+    ~ExcDescriptionSeq_var (void);
+    
+    ExcDescriptionSeq_var &operator= (ExcDescriptionSeq *);
+    ExcDescriptionSeq_var &operator= (const ExcDescriptionSeq_var &);
+    ExcDescriptionSeq *operator-> (void);
+    const ExcDescriptionSeq *operator-> (void) const;
+    
+    operator const ExcDescriptionSeq &() const;
+    operator ExcDescriptionSeq &();
+    operator ExcDescriptionSeq &() const;
+    
+    // Variable-size base types only.
+    operator ExcDescriptionSeq *&();
+    
+    ExceptionDescription & operator[] (CORBA::ULong index);
+    const ExceptionDescription & operator[] (CORBA::ULong index) const;
+    
+    // in, inout, out, _retn 
+    const ExcDescriptionSeq &in (void) const;
+    ExcDescriptionSeq &inout (void);
+    ExcDescriptionSeq *&out (void);
+    ExcDescriptionSeq *_retn (void);
+    ExcDescriptionSeq *ptr (void) const;
+  
+  private:
+    ExcDescriptionSeq *ptr_;
+  };
 
-  class UnionMember_var;
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXCDESCRIPTIONSEQ___OUT_CH_)
+#define _CORBA_EXCDESCRIPTIONSEQ___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_IFR_Client_Export ExcDescriptionSeq_out
+  {
+  public:
+    ExcDescriptionSeq_out (ExcDescriptionSeq *&);
+    ExcDescriptionSeq_out (ExcDescriptionSeq_var &);
+    ExcDescriptionSeq_out (const ExcDescriptionSeq_out &);
+    ExcDescriptionSeq_out &operator= (const ExcDescriptionSeq_out &);
+    ExcDescriptionSeq_out &operator= (ExcDescriptionSeq *);
+    operator ExcDescriptionSeq *&();
+    ExcDescriptionSeq *&ptr (void);
+    ExcDescriptionSeq *operator-> (void);
+    ExceptionDescription & operator[] (CORBA::ULong index);
+  
+  private:
+    ExcDescriptionSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ExcDescriptionSeq_var &);
+  };
+
+#endif /* end #if !defined */
+  
+  // 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_ExcDescriptionSeq;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class ExtInitializer_var;
+  
+  struct TAO_IFR_Client_Export ExtInitializer
+  {
+    typedef ExtInitializer_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    CORBA::StructMemberSeq members;
+    CORBA::ExcDescriptionSeq exceptions;
+    TAO_String_Manager name;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
+  class TAO_IFR_Client_Export ExtInitializer_var
+  {
+  public:
+    ExtInitializer_var (void);
+    ExtInitializer_var (ExtInitializer *);
+    ExtInitializer_var (const ExtInitializer_var &);
+    ~ExtInitializer_var (void);
+    
+    ExtInitializer_var &operator= (ExtInitializer *);
+    ExtInitializer_var &operator= (const ExtInitializer_var &);
+    ExtInitializer *operator-> (void);
+    const ExtInitializer *operator-> (void) const;
+    
+    operator const ExtInitializer &() const;
+    operator ExtInitializer &();
+    operator ExtInitializer &() const;
+    
+    // Variable-size types only.
+    operator ExtInitializer *&();
+    
+    // in, inout, out, _retn 
+    const ExtInitializer &in (void) const;
+    ExtInitializer &inout (void);
+    ExtInitializer *&out (void);
+    ExtInitializer *_retn (void);
+    ExtInitializer *ptr (void) const;
+  
+  private:
+    ExtInitializer *ptr_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
+  class TAO_IFR_Client_Export ExtInitializer_out
+  {
+  public:
+    ExtInitializer_out (ExtInitializer *&);
+    ExtInitializer_out (ExtInitializer_var &);
+    ExtInitializer_out (const ExtInitializer_out &);
+    ExtInitializer_out &operator= (const ExtInitializer_out &);
+    ExtInitializer_out &operator= (ExtInitializer *);
+    operator ExtInitializer *&();
+    ExtInitializer *&ptr (void);
+    ExtInitializer *operator-> (void);
+    
+  private:
+    ExtInitializer *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ExtInitializer_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_ExtInitializer;
+  
+  // 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_CORBA_EXTINITIALIZERSEQ_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXTINITIALIZERSEQ_CH_
+  
+  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (void);
+    _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (CORBA::ULong maximum); 
+    _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (
+        CORBA::ULong maximum,
+        CORBA::ULong length,
+        ExtInitializer *data,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (
+        const _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq &rhs
+      );
+    _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq &operator= (
+        const _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (void);
+    
+    // = Accessors.
+    ExtInitializer &operator[] (CORBA::ULong i);
+    const ExtInitializer &operator[] (CORBA::ULong i) const;
+    
+    // = Static operations.
+    static ExtInitializer *allocbuf (CORBA::ULong size);
+    static void freebuf (ExtInitializer *buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ExtInitializer *get_buffer (CORBA::Boolean orphan = 0);
+    const ExtInitializer *get_buffer (void) const;
+    void replace (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ExtInitializer *data,
+        CORBA::Boolean release
+      );
+  };
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTINITIALIZERSEQ_CH_)
+#define _CORBA_EXTINITIALIZERSEQ_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ExtInitializerSeq;
+  class ExtInitializerSeq_var;
+  
+  // *************************************************************
+  // CORBA::ExtInitializerSeq
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExtInitializerSeq : 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_CORBA_ExtInitializerSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<ExtInitializer>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  {
+  public:
+    ExtInitializerSeq (void);
+    ExtInitializerSeq (CORBA::ULong max);
+    ExtInitializerSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ExtInitializer *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ExtInitializerSeq (const ExtInitializerSeq &);
+    ~ExtInitializerSeq (void);
+    
+    static void _tao_any_destructor (void*);
+    
+    typedef ExtInitializerSeq_var _var_type;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTINITIALIZERSEQ___VAR_CH_)
+#define _CORBA_EXTINITIALIZERSEQ___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
+  // *************************************************************
+  // class CORBA::ExtInitializerSeq_var
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExtInitializerSeq_var
+  {
+  public:
+    ExtInitializerSeq_var (void);
+    ExtInitializerSeq_var (ExtInitializerSeq *);
+    ExtInitializerSeq_var (const ExtInitializerSeq_var &);
+    ~ExtInitializerSeq_var (void);
+    
+    ExtInitializerSeq_var &operator= (ExtInitializerSeq *);
+    ExtInitializerSeq_var &operator= (const ExtInitializerSeq_var &);
+    ExtInitializerSeq *operator-> (void);
+    const ExtInitializerSeq *operator-> (void) const;
+    
+    operator const ExtInitializerSeq &() const;
+    operator ExtInitializerSeq &();
+    operator ExtInitializerSeq &() const;
+    
+    // Variable-size base types only.
+    operator ExtInitializerSeq *&();
+    
+    ExtInitializer & operator[] (CORBA::ULong index);
+    const ExtInitializer & operator[] (CORBA::ULong index) const;
+    
+    // in, inout, out, _retn 
+    const ExtInitializerSeq &in (void) const;
+    ExtInitializerSeq &inout (void);
+    ExtInitializerSeq *&out (void);
+    ExtInitializerSeq *_retn (void);
+    ExtInitializerSeq *ptr (void) const;
+  
+  private:
+    ExtInitializerSeq *ptr_;
+  };
 
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTINITIALIZERSEQ___OUT_CH_)
+#define _CORBA_EXTINITIALIZERSEQ___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_IFR_Client_Export ExtInitializerSeq_out
+  {
+  public:
+    ExtInitializerSeq_out (ExtInitializerSeq *&);
+    ExtInitializerSeq_out (ExtInitializerSeq_var &);
+    ExtInitializerSeq_out (const ExtInitializerSeq_out &);
+    ExtInitializerSeq_out &operator= (const ExtInitializerSeq_out &);
+    ExtInitializerSeq_out &operator= (ExtInitializerSeq *);
+    operator ExtInitializerSeq *&();
+    ExtInitializerSeq *&ptr (void);
+    ExtInitializerSeq *operator-> (void);
+    ExtInitializer & operator[] (CORBA::ULong index);
+  
+  private:
+    ExtInitializerSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ExtInitializerSeq_var &);
+  };
+
+#endif /* end #if !defined */
+  
+  // 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_ExtInitializerSeq;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class UnionMember_var;
+  
   struct TAO_IFR_Client_Export UnionMember
   {
     typedef UnionMember_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     CORBA::Any label;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_IFR_Client_Export UnionMember_var
   {
   public:
@@ -4035,33 +5626,33 @@ TAO_NAMESPACE  CORBA
     UnionMember_var (UnionMember *);
     UnionMember_var (const UnionMember_var &);
     ~UnionMember_var (void);
-
+    
     UnionMember_var &operator= (UnionMember *);
     UnionMember_var &operator= (const UnionMember_var &);
     UnionMember *operator-> (void);
     const UnionMember *operator-> (void) const;
-
+    
     operator const UnionMember &() const;
     operator UnionMember &();
     operator UnionMember &() const;
-
+    
     // Variable-size types only.
     operator UnionMember *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const UnionMember &in (void) const;
     UnionMember &inout (void);
     UnionMember *&out (void);
     UnionMember *_retn (void);
     UnionMember *ptr (void) const;
-
+  
   private:
     UnionMember *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_IFR_Client_Export UnionMember_out
   {
   public:
@@ -4073,32 +5664,32 @@ TAO_NAMESPACE  CORBA
     operator UnionMember *&();
     UnionMember *&ptr (void);
     UnionMember *operator-> (void);
-
+    
   private:
     UnionMember *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const UnionMember_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionMember;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+  
+  // 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_CORBA_UNIONMEMBERSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CH_
-
+  
   class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -4112,15 +5703,15 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void);
-
+    
     // = Accessors.
     UnionMember &operator[] (CORBA::ULong i);
     const UnionMember &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static UnionMember *allocbuf (CORBA::ULong size);
     static void freebuf (UnionMember *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -4136,47 +5727,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_UNIONMEMBERSEQ_CH_)
 #define _CORBA_UNIONMEMBERSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class UnionMemberSeq;
   class UnionMemberSeq_var;
-
+  
   // *************************************************************
   // CORBA::UnionMemberSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export UnionMemberSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export UnionMemberSeq : 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_CORBA_UnionMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<UnionMember>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     UnionMemberSeq (void);
     UnionMemberSeq (CORBA::ULong max);
     UnionMemberSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        UnionMember *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        UnionMember *buffer, 
         CORBA::Boolean release = 0
       );
     UnionMemberSeq (const UnionMemberSeq &);
     ~UnionMemberSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef UnionMemberSeq_var _var_type;
   };
 
@@ -4184,14 +5775,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_UNIONMEMBERSEQ___VAR_CH_)
 #define _CORBA_UNIONMEMBERSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::UnionMemberSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export UnionMemberSeq_var
   {
   public:
@@ -4199,29 +5790,29 @@ TAO_NAMESPACE  CORBA
     UnionMemberSeq_var (UnionMemberSeq *);
     UnionMemberSeq_var (const UnionMemberSeq_var &);
     ~UnionMemberSeq_var (void);
-
+    
     UnionMemberSeq_var &operator= (UnionMemberSeq *);
     UnionMemberSeq_var &operator= (const UnionMemberSeq_var &);
     UnionMemberSeq *operator-> (void);
     const UnionMemberSeq *operator-> (void) const;
-
+    
     operator const UnionMemberSeq &() const;
     operator UnionMemberSeq &();
     operator UnionMemberSeq &() const;
-
+    
     // Variable-size base types only.
     operator UnionMemberSeq *&();
-
+    
     UnionMember & operator[] (CORBA::ULong index);
     const UnionMember & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const UnionMemberSeq &in (void) const;
     UnionMemberSeq &inout (void);
     UnionMemberSeq *&out (void);
     UnionMemberSeq *_retn (void);
     UnionMemberSeq *ptr (void) const;
-
+  
   private:
     UnionMemberSeq *ptr_;
   };
@@ -4230,10 +5821,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_UNIONMEMBERSEQ___OUT_CH_)
 #define _CORBA_UNIONMEMBERSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export UnionMemberSeq_out
   {
   public:
@@ -4246,7 +5837,7 @@ TAO_NAMESPACE  CORBA
     UnionMemberSeq *&ptr (void);
     UnionMemberSeq *operator-> (void);
     UnionMember & operator[] (CORBA::ULong index);
-
+  
   private:
     UnionMemberSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -4254,51 +5845,51 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionMemberSeq;
 
 #if !defined (_CORBA_ENUMMEMBERSEQ_CH_)
 #define _CORBA_ENUMMEMBERSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class EnumMemberSeq;
   class EnumMemberSeq_var;
-
+  
   // *************************************************************
   // CORBA::EnumMemberSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export EnumMemberSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export EnumMemberSeq : 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_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_String_Sequence
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     EnumMemberSeq (void);
     EnumMemberSeq (CORBA::ULong max);
     EnumMemberSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        char * *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        char * *buffer, 
         CORBA::Boolean release = 0
       );
     EnumMemberSeq (const EnumMemberSeq &);
     ~EnumMemberSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef EnumMemberSeq_var _var_type;
   };
 
@@ -4306,14 +5897,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_ENUMMEMBERSEQ___VAR_CH_)
 #define _CORBA_ENUMMEMBERSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::EnumMemberSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export EnumMemberSeq_var
   {
   public:
@@ -4321,28 +5912,28 @@ TAO_NAMESPACE  CORBA
     EnumMemberSeq_var (EnumMemberSeq *);
     EnumMemberSeq_var (const EnumMemberSeq_var &);
     ~EnumMemberSeq_var (void);
-
+    
     EnumMemberSeq_var &operator= (EnumMemberSeq *);
     EnumMemberSeq_var &operator= (const EnumMemberSeq_var &);
     EnumMemberSeq *operator-> (void);
     const EnumMemberSeq *operator-> (void) const;
-
+    
     operator const EnumMemberSeq &() const;
     operator EnumMemberSeq &();
     operator EnumMemberSeq &() const;
-
+    
     // Variable-size base types only.
     operator EnumMemberSeq *&();
-
+    
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const EnumMemberSeq &in (void) const;
     EnumMemberSeq &inout (void);
     EnumMemberSeq *&out (void);
     EnumMemberSeq *_retn (void);
     EnumMemberSeq *ptr (void) const;
-
+  
   private:
     EnumMemberSeq *ptr_;
   };
@@ -4351,10 +5942,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_ENUMMEMBERSEQ___OUT_CH_)
 #define _CORBA_ENUMMEMBERSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export EnumMemberSeq_out
   {
   public:
@@ -4367,7 +5958,7 @@ TAO_NAMESPACE  CORBA
     EnumMemberSeq *&ptr (void);
     EnumMemberSeq *operator-> (void);
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
+  
   private:
     EnumMemberSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -4375,18 +5966,18 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnumMemberSeq;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_CONTAINER___PTR_CH_)
 #define _CORBA_CONTAINER___PTR_CH_
-
+  
   class Container;
   typedef Container *Container_ptr;
 
@@ -4394,31 +5985,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_CONTAINER___VAR_CH_)
 #define _CORBA_CONTAINER___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export Container_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export Container_var : public TAO_Base_var
   {
   public:
     Container_var (void); // default constructor
-    Container_var (Container_ptr p) : ptr_ (p) {}
+    Container_var (Container_ptr p) : ptr_ (p) {} 
     Container_var (const Container_var &); // copy constructor
     ~Container_var (void); // destructor
-
+    
     Container_var &operator= (Container_ptr);
     Container_var &operator= (const Container_var &);
     Container_ptr operator-> (void) const;
-
+    
     operator const Container_ptr &() const;
     operator Container_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Container_ptr in (void) const;
     Container_ptr &inout (void);
     Container_ptr &out (void);
     Container_ptr _retn (void);
     Container_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Container_ptr tao_duplicate (Container_ptr);
@@ -4426,25 +6017,25 @@ TAO_NAMESPACE  CORBA
     static Container_ptr tao_nil (void);
     static Container_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Container_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    Container_var (const TAO_Base_var & rhs);
-    Container_var & operator= (const TAO_Base_var & rhs);
+    Container_var (const TAO_Base_var &rhs);
+    Container_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_CONTAINER___OUT_CH_)
 #define _CORBA_CONTAINER___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export Container_out
   {
   public:
@@ -4457,24 +6048,24 @@ TAO_NAMESPACE  CORBA
     operator Container_ptr &();
     Container_ptr &ptr (void);
     Container_ptr operator-> (void);
-
+  
   private:
     Container_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_CONTAINER_CH_)
 #define _CORBA_CONTAINER_CH_
-
+  
   class _TAO_Container_Proxy_Impl;
   class _TAO_Container_Remote_Proxy_Impl;
   class _TAO_Container_Proxy_Broker;
   class _TAO_Container_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export Container
     : public virtual CORBA::IRObject
   {
@@ -4482,30 +6073,30 @@ TAO_NAMESPACE  CORBA
     typedef Container_ptr _ptr_type;
     typedef Container_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static Container_ptr _duplicate (Container_ptr obj);
-
+    
     static Container_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Container_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Container_ptr _nil (void)
       {
         return (Container_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Contained_ptr lookup (
         const char * search_name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4513,10 +6104,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ContainedSeq * contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited
@@ -4525,10 +6116,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
         CORBA::Long levels_to_search,
@@ -4539,25 +6130,25 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_structure/structure_ch.cpp:49
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    
     class Description_var;
-
+    
     struct TAO_IFR_Client_Export Description
     {
       typedef Description_var _var_type;
-
+      
       static void _tao_any_destructor (void *);
       ACE_NESTED_CLASS (CORBA, Contained_var) contained_object;
       ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
       CORBA::Any value;
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_structure.cpp:71
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+    
     class TAO_IFR_Client_Export Description_var
     {
     public:
@@ -4565,33 +6156,33 @@ TAO_NAMESPACE  CORBA
       Description_var (Description *);
       Description_var (const Description_var &);
       ~Description_var (void);
-
+      
       Description_var &operator= (Description *);
       Description_var &operator= (const Description_var &);
       Description *operator-> (void);
       const Description *operator-> (void) const;
-
+      
       operator const Description &() const;
       operator Description &();
       operator Description &() const;
-
+      
       // Variable-size types only.
       operator Description *&();
-
-      // in, inout, out, _retn
+      
+      // in, inout, out, _retn 
       const Description &in (void) const;
       Description &inout (void);
       Description *&out (void);
       Description *_retn (void);
       Description *ptr (void) const;
-
+    
     private:
       Description *ptr_;
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_structure.cpp:445
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+    
     class TAO_IFR_Client_Export Description_out
     {
     public:
@@ -4603,32 +6194,32 @@ TAO_NAMESPACE  CORBA
       operator Description *&();
       Description *&ptr (void);
       Description *operator-> (void);
-
+      
     private:
       Description *&ptr_;
       // Assignment from T_var not allowed.
       void operator= (const Description_var &);
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_typecode/typecode_decl.cpp:44
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
     static ::CORBA::TypeCode_ptr _tc_Description;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+    
+    // 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_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
-
+    
     class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
       : public TAO_Unbounded_Base_Sequence
     {
     public:
       _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void);
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum);
+      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum); 
       _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (
           CORBA::ULong maximum,
           CORBA::ULong length,
@@ -4642,15 +6233,15 @@ TAO_NAMESPACE  CORBA
           const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs
         );
       virtual ~_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void);
-
+      
       // = Accessors.
       Description &operator[] (CORBA::ULong i);
       const Description &operator[] (CORBA::ULong i) const;
-
+      
       // = Static operations.
       static Description *allocbuf (CORBA::ULong size);
       static void freebuf (Description *buffer);
-
+      
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
@@ -4666,47 +6257,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_sequence/sequence_ch.cpp:371
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
     class DescriptionSeq;
     class DescriptionSeq_var;
-
+    
     // *************************************************************
     // CORBA::Container::DescriptionSeq
     // *************************************************************
-
-    class TAO_IFR_Client_Export DescriptionSeq : public
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_sequence/sequence_ch.cpp:51
+    
+    class TAO_IFR_Client_Export DescriptionSeq : 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_CORBA_Container_DescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<Description>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
       DescriptionSeq (void);
       DescriptionSeq (CORBA::ULong max);
       DescriptionSeq (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          Description *buffer,
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          Description *buffer, 
           CORBA::Boolean release = 0
         );
       DescriptionSeq (const DescriptionSeq &);
       ~DescriptionSeq (void);
-
+      
       static void _tao_any_destructor (void*);
-
+      
       typedef DescriptionSeq_var _var_type;
     };
 
@@ -4714,14 +6305,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ___VAR_CH_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ___VAR_CH_
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_sequence/sequence_ch.cpp:549
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+    
     // *************************************************************
     // class CORBA::Container::DescriptionSeq_var
     // *************************************************************
-
+    
     class TAO_IFR_Client_Export DescriptionSeq_var
     {
     public:
@@ -4729,29 +6320,29 @@ TAO_NAMESPACE  CORBA
       DescriptionSeq_var (DescriptionSeq *);
       DescriptionSeq_var (const DescriptionSeq_var &);
       ~DescriptionSeq_var (void);
-
+      
       DescriptionSeq_var &operator= (DescriptionSeq *);
       DescriptionSeq_var &operator= (const DescriptionSeq_var &);
       DescriptionSeq *operator-> (void);
       const DescriptionSeq *operator-> (void) const;
-
+      
       operator const DescriptionSeq &() const;
       operator DescriptionSeq &();
       operator DescriptionSeq &() const;
-
+      
       // Variable-size base types only.
       operator DescriptionSeq *&();
-
+      
       Description & operator[] (CORBA::ULong index);
       const Description & operator[] (CORBA::ULong index) const;
-
-      // in, inout, out, _retn
+      
+      // in, inout, out, _retn 
       const DescriptionSeq &in (void) const;
       DescriptionSeq &inout (void);
       DescriptionSeq *&out (void);
       DescriptionSeq *_retn (void);
       DescriptionSeq *ptr (void) const;
-
+    
     private:
       DescriptionSeq *ptr_;
     };
@@ -4760,10 +6351,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ___OUT_CH_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ___OUT_CH_
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_sequence/sequence_ch.cpp:753
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+    
     class TAO_IFR_Client_Export DescriptionSeq_out
     {
     public:
@@ -4776,7 +6367,7 @@ TAO_NAMESPACE  CORBA
       DescriptionSeq *&ptr (void);
       DescriptionSeq *operator-> (void);
       Description & operator[] (CORBA::ULong index);
-
+    
     private:
       DescriptionSeq *&ptr_;
       // Assignment from T_var not allowed.
@@ -4784,15 +6375,15 @@ TAO_NAMESPACE  CORBA
     };
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_typecode/typecode_decl.cpp:44
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
     static ::CORBA::TypeCode_ptr _tc_DescriptionSeq;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited,
@@ -4802,10 +6393,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ModuleDef_ptr create_module (
         const char * id,
         const char * name,
@@ -4815,10 +6406,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
@@ -4830,10 +6421,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
@@ -4844,10 +6435,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
@@ -4859,10 +6450,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
@@ -4873,10 +6464,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
@@ -4887,10 +6478,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
@@ -4901,10 +6492,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
@@ -4921,10 +6512,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
@@ -4935,10 +6526,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
@@ -4949,10 +6540,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::NativeDef_ptr create_native (
         const char * id,
         const char * name,
@@ -4962,10 +6553,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
@@ -4976,10 +6567,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
@@ -4990,65 +6581,86 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::ExtValueDef_ptr create_ext_value (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::Boolean is_custom,
+        CORBA::Boolean is_abstract,
+        CORBA::ValueDef_ptr base_value,
+        CORBA::Boolean is_truncatable,
+        const CORBA::ValueDefSeq & abstract_base_values,
+        const CORBA::InterfaceDefSeq & supported_interfaces,
+        const CORBA::ExtInitializerSeq & initializers
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_Container_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
-
+  
   protected:
     Container (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Container_setup_collocation (int collocated);
-
+    
     Container (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~Container (void);
-
+    
     friend class _TAO_Container_Remote_Proxy_Impl;
     friend class _TAO_Container_ThruPOA_Proxy_Impl;
     friend class _TAO_Container_Direct_Proxy_Impl;
-
+  
   private:
     Container (const Container &);
     void operator= (const Container &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_Container_Proxy_Impl
     : public virtual CORBA::_TAO_IRObject_Proxy_Impl
   {
   public:
     virtual ~_TAO_Container_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::Contained_ptr lookup (
         CORBA::Object *_collocated_tao_target_,
         const char * search_name
@@ -5057,10 +6669,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ContainedSeq * contents (
         CORBA::Object *_collocated_tao_target_,
         CORBA::DefinitionKind limit_type,
@@ -5070,10 +6682,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ContainedSeq * lookup_name (
         CORBA::Object *_collocated_tao_target_,
         const char * search_name,
@@ -5085,10 +6697,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
         CORBA::Object *_collocated_tao_target_,
         CORBA::DefinitionKind limit_type,
@@ -5099,10 +6711,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ModuleDef_ptr create_module (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5113,10 +6725,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ConstantDef_ptr create_constant (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5129,10 +6741,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::StructDef_ptr create_struct (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5144,10 +6756,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::UnionDef_ptr create_union (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5160,10 +6772,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::EnumDef_ptr create_enum (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5175,10 +6787,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::AliasDef_ptr create_alias (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5190,10 +6802,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5205,10 +6817,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ValueDef_ptr create_value (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5226,10 +6838,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5241,10 +6853,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5256,10 +6868,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::NativeDef_ptr create_native (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5270,10 +6882,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5285,10 +6897,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5300,23 +6912,44 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
+    virtual ::CORBA::ExtValueDef_ptr create_ext_value (
+        CORBA::Object *_collocated_tao_target_,
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::Boolean is_custom,
+        CORBA::Boolean is_abstract,
+        CORBA::ValueDef_ptr base_value,
+        CORBA::Boolean is_truncatable,
+        const CORBA::ValueDefSeq & abstract_base_values,
+        const CORBA::InterfaceDefSeq & supported_interfaces,
+        const CORBA::ExtInitializerSeq & initializers
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+  
   protected:
     _TAO_Container_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_Container_Remote_Proxy_Impl
     : public virtual _TAO_Container_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -5324,12 +6957,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_Container_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Container_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::Contained_ptr lookup (
         CORBA::Object *_collocated_tao_target_,
         const char * search_name
@@ -5338,10 +6971,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ContainedSeq * contents (
         CORBA::Object *_collocated_tao_target_,
         CORBA::DefinitionKind limit_type,
@@ -5351,10 +6984,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ContainedSeq * lookup_name (
         CORBA::Object *_collocated_tao_target_,
         const char * search_name,
@@ -5366,10 +6999,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
         CORBA::Object *_collocated_tao_target_,
         CORBA::DefinitionKind limit_type,
@@ -5380,10 +7013,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ModuleDef_ptr create_module (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5394,10 +7027,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ConstantDef_ptr create_constant (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5410,10 +7043,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::StructDef_ptr create_struct (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5425,10 +7058,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::UnionDef_ptr create_union (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5441,10 +7074,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::EnumDef_ptr create_enum (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5456,10 +7089,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::AliasDef_ptr create_alias (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5471,10 +7104,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5486,10 +7119,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ValueDef_ptr create_value (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5507,10 +7140,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5522,10 +7155,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5537,10 +7170,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::NativeDef_ptr create_native (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5551,10 +7184,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5566,10 +7199,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -5581,24 +7214,45 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    virtual ::CORBA::ExtValueDef_ptr create_ext_value (
+        CORBA::Object *_collocated_tao_target_,
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::Boolean is_custom,
+        CORBA::Boolean is_abstract,
+        CORBA::ValueDef_ptr base_value,
+        CORBA::Boolean is_truncatable,
+        const CORBA::ValueDefSeq & abstract_base_values,
+        const CORBA::InterfaceDefSeq & supported_interfaces,
+        const CORBA::ExtInitializerSeq & initializers
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_Container_Proxy_Broker
   {
   public:
@@ -5607,64 +7261,64 @@ TAO_NAMESPACE  CORBA
         Container *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_Container_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_Container_Remote_Proxy_Broker
     : public virtual _TAO_Container_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Container_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Container_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_Container_Proxy_Impl &select_proxy (
         Container *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_Container_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_Container_Remote_Proxy_Broker *the_TAO_Container_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Container;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_IDLTYPE___PTR_CH_)
 #define _CORBA_IDLTYPE___PTR_CH_
-
+  
   class IDLType;
   typedef IDLType *IDLType_ptr;
 
@@ -5672,31 +7326,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_IDLTYPE___VAR_CH_)
 #define _CORBA_IDLTYPE___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export IDLType_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export IDLType_var : public TAO_Base_var
   {
   public:
     IDLType_var (void); // default constructor
-    IDLType_var (IDLType_ptr p) : ptr_ (p) {}
+    IDLType_var (IDLType_ptr p) : ptr_ (p) {} 
     IDLType_var (const IDLType_var &); // copy constructor
     ~IDLType_var (void); // destructor
-
+    
     IDLType_var &operator= (IDLType_ptr);
     IDLType_var &operator= (const IDLType_var &);
     IDLType_ptr operator-> (void) const;
-
+    
     operator const IDLType_ptr &() const;
     operator IDLType_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     IDLType_ptr in (void) const;
     IDLType_ptr &inout (void);
     IDLType_ptr &out (void);
     IDLType_ptr _retn (void);
     IDLType_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static IDLType_ptr tao_duplicate (IDLType_ptr);
@@ -5704,25 +7358,25 @@ TAO_NAMESPACE  CORBA
     static IDLType_ptr tao_nil (void);
     static IDLType_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     IDLType_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    IDLType_var (const TAO_Base_var & rhs);
-    IDLType_var & operator= (const TAO_Base_var & rhs);
+    IDLType_var (const TAO_Base_var &rhs);
+    IDLType_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_IDLTYPE___OUT_CH_)
 #define _CORBA_IDLTYPE___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export IDLType_out
   {
   public:
@@ -5735,24 +7389,24 @@ TAO_NAMESPACE  CORBA
     operator IDLType_ptr &();
     IDLType_ptr &ptr (void);
     IDLType_ptr operator-> (void);
-
+  
   private:
     IDLType_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_IDLTYPE_CH_)
 #define _CORBA_IDLTYPE_CH_
-
+  
   class _TAO_IDLType_Proxy_Impl;
   class _TAO_IDLType_Remote_Proxy_Impl;
   class _TAO_IDLType_Proxy_Broker;
   class _TAO_IDLType_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export IDLType
     : public virtual CORBA::IRObject
   {
@@ -5760,95 +7414,96 @@ TAO_NAMESPACE  CORBA
     typedef IDLType_ptr _ptr_type;
     typedef IDLType_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static IDLType_ptr _duplicate (IDLType_ptr obj);
-
+    
     static IDLType_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IDLType_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IDLType_ptr _nil (void)
       {
         return (IDLType_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_IDLType_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_;
-
+  
   protected:
     IDLType (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_IDLType_setup_collocation (int collocated);
-
+    
     IDLType (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~IDLType (void);
-
+    
     friend class _TAO_IDLType_Remote_Proxy_Impl;
     friend class _TAO_IDLType_ThruPOA_Proxy_Impl;
     friend class _TAO_IDLType_Direct_Proxy_Impl;
-
+  
   private:
     IDLType (const IDLType &);
     void operator= (const IDLType &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_IDLType_Proxy_Impl
     : public virtual CORBA::_TAO_IRObject_Proxy_Impl
   {
   public:
     virtual ~_TAO_IDLType_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5856,23 +7511,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_IDLType_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_IDLType_Remote_Proxy_Impl
     : public virtual _TAO_IDLType_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -5880,12 +7535,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_IDLType_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_IDLType_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5894,23 +7549,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_IDLType_Proxy_Broker
   {
   public:
@@ -5919,64 +7574,64 @@ TAO_NAMESPACE  CORBA
         IDLType *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_IDLType_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_IDLType_Remote_Proxy_Broker
     : public virtual _TAO_IDLType_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_IDLType_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_IDLType_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_IDLType_Proxy_Impl &select_proxy (
         IDLType *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_IDLType_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_IDLType_Remote_Proxy_Broker *the_TAO_IDLType_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IDLType;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_TYPEDEFDEF___PTR_CH_)
 #define _CORBA_TYPEDEFDEF___PTR_CH_
-
+  
   class TypedefDef;
   typedef TypedefDef *TypedefDef_ptr;
 
@@ -5984,31 +7639,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_TYPEDEFDEF___VAR_CH_)
 #define _CORBA_TYPEDEFDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export TypedefDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export TypedefDef_var : public TAO_Base_var
   {
   public:
     TypedefDef_var (void); // default constructor
-    TypedefDef_var (TypedefDef_ptr p) : ptr_ (p) {}
+    TypedefDef_var (TypedefDef_ptr p) : ptr_ (p) {} 
     TypedefDef_var (const TypedefDef_var &); // copy constructor
     ~TypedefDef_var (void); // destructor
-
+    
     TypedefDef_var &operator= (TypedefDef_ptr);
     TypedefDef_var &operator= (const TypedefDef_var &);
     TypedefDef_ptr operator-> (void) const;
-
+    
     operator const TypedefDef_ptr &() const;
     operator TypedefDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     TypedefDef_ptr in (void) const;
     TypedefDef_ptr &inout (void);
     TypedefDef_ptr &out (void);
     TypedefDef_ptr _retn (void);
     TypedefDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static TypedefDef_ptr tao_duplicate (TypedefDef_ptr);
@@ -6016,25 +7671,25 @@ TAO_NAMESPACE  CORBA
     static TypedefDef_ptr tao_nil (void);
     static TypedefDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     TypedefDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    TypedefDef_var (const TAO_Base_var & rhs);
-    TypedefDef_var & operator= (const TAO_Base_var & rhs);
+    TypedefDef_var (const TAO_Base_var &rhs);
+    TypedefDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_TYPEDEFDEF___OUT_CH_)
 #define _CORBA_TYPEDEFDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export TypedefDef_out
   {
   public:
@@ -6047,24 +7702,24 @@ TAO_NAMESPACE  CORBA
     operator TypedefDef_ptr &();
     TypedefDef_ptr &ptr (void);
     TypedefDef_ptr operator-> (void);
-
+  
   private:
     TypedefDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_TYPEDEFDEF_CH_)
 #define _CORBA_TYPEDEFDEF_CH_
-
+  
   class _TAO_TypedefDef_Proxy_Impl;
   class _TAO_TypedefDef_Remote_Proxy_Impl;
   class _TAO_TypedefDef_Proxy_Broker;
   class _TAO_TypedefDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export TypedefDef
     : public virtual CORBA::Contained,
       public virtual CORBA::IDLType
@@ -6073,99 +7728,100 @@ TAO_NAMESPACE  CORBA
     typedef TypedefDef_ptr _ptr_type;
     typedef TypedefDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static TypedefDef_ptr _duplicate (TypedefDef_ptr obj);
-
+    
     static TypedefDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TypedefDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TypedefDef_ptr _nil (void)
       {
         return (TypedefDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_TypedefDef_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
-
+  
   protected:
     TypedefDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_TypedefDef_setup_collocation (int collocated);
-
+    
     TypedefDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~TypedefDef (void);
-
+    
     friend class _TAO_TypedefDef_Remote_Proxy_Impl;
     friend class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
     friend class _TAO_TypedefDef_Direct_Proxy_Impl;
-
+  
   private:
     TypedefDef (const TypedefDef &);
     void operator= (const TypedefDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Contained_Proxy_Impl,
+    : public virtual CORBA::_TAO_Contained_Proxy_Impl, 
       public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_TypedefDef_Proxy_Impl (void) {}
-
+  
   protected:
     _TAO_TypedefDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_TypedefDef_Remote_Proxy_Impl
     : public virtual _TAO_TypedefDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -6174,26 +7830,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_TypedefDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_TypedefDef_Remote_Proxy_Impl (void) {}
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Broker
   {
   public:
@@ -6202,67 +7858,67 @@ TAO_NAMESPACE  CORBA
         TypedefDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_TypedefDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_TypedefDef_Remote_Proxy_Broker
     : public virtual _TAO_TypedefDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_TypedefDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_TypedefDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
         TypedefDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_TypedefDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_TypedefDef_Remote_Proxy_Broker *the_TAO_TypedefDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypedefDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class TypeDescription_var;
-
+  
   struct TAO_IFR_Client_Export TypeDescription
   {
     typedef TypeDescription_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -6270,10 +7926,10 @@ TAO_NAMESPACE  CORBA
     TAO_String_Manager version;
     CORBA::TypeCode_var type;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_IFR_Client_Export TypeDescription_var
   {
   public:
@@ -6281,33 +7937,33 @@ TAO_NAMESPACE  CORBA
     TypeDescription_var (TypeDescription *);
     TypeDescription_var (const TypeDescription_var &);
     ~TypeDescription_var (void);
-
+    
     TypeDescription_var &operator= (TypeDescription *);
     TypeDescription_var &operator= (const TypeDescription_var &);
     TypeDescription *operator-> (void);
     const TypeDescription *operator-> (void) const;
-
+    
     operator const TypeDescription &() const;
     operator TypeDescription &();
     operator TypeDescription &() const;
-
+    
     // Variable-size types only.
     operator TypeDescription *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const TypeDescription &in (void) const;
     TypeDescription &inout (void);
     TypeDescription *&out (void);
     TypeDescription *_retn (void);
     TypeDescription *ptr (void) const;
-
+  
   private:
     TypeDescription *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_IFR_Client_Export TypeDescription_out
   {
   public:
@@ -6319,20 +7975,20 @@ TAO_NAMESPACE  CORBA
     operator TypeDescription *&();
     TypeDescription *&ptr (void);
     TypeDescription *operator-> (void);
-
+    
   private:
     TypeDescription *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const TypeDescription_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeDescription;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module CORBA
@@ -6340,7 +7996,7 @@ TAO_NAMESPACE_CLOSE // module CORBA
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80
 
 extern TAO_IFR_Client_Export
 CORBA::_TAO_IRObject_Proxy_Broker *
@@ -6373,443 +8029,775 @@ CORBA::_TAO_TypedefDef_Proxy_Broker *
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:103
 
 // External declarations for undefined interface
+
 // CORBA::Repository
 TAO_IFR_Client_Export
 CORBA::Repository_ptr
 tao_CORBA_Repository_duplicate (
     CORBA::Repository_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_Repository_release (
     CORBA::Repository_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::Repository_ptr
 tao_CORBA_Repository_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::Repository_ptr
 tao_CORBA_Repository_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_Repository_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_Repository_marshal (
+    CORBA::Repository_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::ModuleDef
 TAO_IFR_Client_Export
 CORBA::ModuleDef_ptr
 tao_CORBA_ModuleDef_duplicate (
     CORBA::ModuleDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_ModuleDef_release (
     CORBA::ModuleDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::ModuleDef_ptr
 tao_CORBA_ModuleDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::ModuleDef_ptr
 tao_CORBA_ModuleDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_ModuleDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_ModuleDef_marshal (
+    CORBA::ModuleDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::ConstantDef
 TAO_IFR_Client_Export
 CORBA::ConstantDef_ptr
 tao_CORBA_ConstantDef_duplicate (
     CORBA::ConstantDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_ConstantDef_release (
     CORBA::ConstantDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::ConstantDef_ptr
 tao_CORBA_ConstantDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::ConstantDef_ptr
 tao_CORBA_ConstantDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_ConstantDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_ConstantDef_marshal (
+    CORBA::ConstantDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::StructDef
 TAO_IFR_Client_Export
 CORBA::StructDef_ptr
 tao_CORBA_StructDef_duplicate (
     CORBA::StructDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_StructDef_release (
     CORBA::StructDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::StructDef_ptr
 tao_CORBA_StructDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::StructDef_ptr
 tao_CORBA_StructDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_StructDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_StructDef_marshal (
+    CORBA::StructDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::UnionDef
 TAO_IFR_Client_Export
 CORBA::UnionDef_ptr
 tao_CORBA_UnionDef_duplicate (
     CORBA::UnionDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_UnionDef_release (
     CORBA::UnionDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::UnionDef_ptr
 tao_CORBA_UnionDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::UnionDef_ptr
 tao_CORBA_UnionDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_UnionDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_UnionDef_marshal (
+    CORBA::UnionDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::EnumDef
 TAO_IFR_Client_Export
 CORBA::EnumDef_ptr
 tao_CORBA_EnumDef_duplicate (
     CORBA::EnumDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_EnumDef_release (
     CORBA::EnumDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::EnumDef_ptr
 tao_CORBA_EnumDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::EnumDef_ptr
 tao_CORBA_EnumDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_EnumDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_EnumDef_marshal (
+    CORBA::EnumDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::AliasDef
 TAO_IFR_Client_Export
 CORBA::AliasDef_ptr
 tao_CORBA_AliasDef_duplicate (
     CORBA::AliasDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_AliasDef_release (
     CORBA::AliasDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::AliasDef_ptr
 tao_CORBA_AliasDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::AliasDef_ptr
 tao_CORBA_AliasDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_AliasDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_AliasDef_marshal (
+    CORBA::AliasDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::InterfaceDef
 TAO_IFR_Client_Export
 CORBA::InterfaceDef_ptr
 tao_CORBA_InterfaceDef_duplicate (
     CORBA::InterfaceDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_InterfaceDef_release (
     CORBA::InterfaceDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::InterfaceDef_ptr
 tao_CORBA_InterfaceDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::InterfaceDef_ptr
 tao_CORBA_InterfaceDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_InterfaceDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_InterfaceDef_marshal (
+    CORBA::InterfaceDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::ExceptionDef
 TAO_IFR_Client_Export
 CORBA::ExceptionDef_ptr
 tao_CORBA_ExceptionDef_duplicate (
     CORBA::ExceptionDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_ExceptionDef_release (
     CORBA::ExceptionDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::ExceptionDef_ptr
 tao_CORBA_ExceptionDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::ExceptionDef_ptr
 tao_CORBA_ExceptionDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_ExceptionDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_ExceptionDef_marshal (
+    CORBA::ExceptionDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::NativeDef
 TAO_IFR_Client_Export
 CORBA::NativeDef_ptr
 tao_CORBA_NativeDef_duplicate (
     CORBA::NativeDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_NativeDef_release (
     CORBA::NativeDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::NativeDef_ptr
 tao_CORBA_NativeDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::NativeDef_ptr
 tao_CORBA_NativeDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_NativeDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_NativeDef_marshal (
+    CORBA::NativeDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::ValueDef
 TAO_IFR_Client_Export
 CORBA::ValueDef_ptr
 tao_CORBA_ValueDef_duplicate (
     CORBA::ValueDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_ValueDef_release (
     CORBA::ValueDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::ValueDef_ptr
 tao_CORBA_ValueDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::ValueDef_ptr
 tao_CORBA_ValueDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_ValueDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_ValueDef_marshal (
+    CORBA::ValueDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::ValueBoxDef
 TAO_IFR_Client_Export
 CORBA::ValueBoxDef_ptr
 tao_CORBA_ValueBoxDef_duplicate (
     CORBA::ValueBoxDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_ValueBoxDef_release (
     CORBA::ValueBoxDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::ValueBoxDef_ptr
 tao_CORBA_ValueBoxDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::ValueBoxDef_ptr
 tao_CORBA_ValueBoxDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_ValueBoxDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_ValueBoxDef_marshal (
+    CORBA::ValueBoxDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::AbstractInterfaceDef
 TAO_IFR_Client_Export
 CORBA::AbstractInterfaceDef_ptr
 tao_CORBA_AbstractInterfaceDef_duplicate (
     CORBA::AbstractInterfaceDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_AbstractInterfaceDef_release (
     CORBA::AbstractInterfaceDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::AbstractInterfaceDef_ptr
 tao_CORBA_AbstractInterfaceDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::AbstractInterfaceDef_ptr
 tao_CORBA_AbstractInterfaceDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_AbstractInterfaceDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_AbstractInterfaceDef_marshal (
+    CORBA::AbstractInterfaceDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // External declarations for undefined interface
+
 // CORBA::LocalInterfaceDef
 TAO_IFR_Client_Export
 CORBA::LocalInterfaceDef_ptr
 tao_CORBA_LocalInterfaceDef_duplicate (
     CORBA::LocalInterfaceDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_LocalInterfaceDef_release (
     CORBA::LocalInterfaceDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::LocalInterfaceDef_ptr
 tao_CORBA_LocalInterfaceDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::LocalInterfaceDef_ptr
 tao_CORBA_LocalInterfaceDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_LocalInterfaceDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_LocalInterfaceDef_marshal (
+    CORBA::LocalInterfaceDef_ptr,
+    TAO_OutputCDR &
+  );
+
+// External declarations for undefined interface
+
+// CORBA::ExtInterfaceDef
+TAO_IFR_Client_Export
+CORBA::ExtInterfaceDef_ptr
+tao_CORBA_ExtInterfaceDef_duplicate (
+    CORBA::ExtInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export
+void
+tao_CORBA_ExtInterfaceDef_release (
+    CORBA::ExtInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export
+CORBA::ExtInterfaceDef_ptr
+tao_CORBA_ExtInterfaceDef_nil (
+    void
+  );
+
+TAO_IFR_Client_Export
+CORBA::ExtInterfaceDef_ptr
+tao_CORBA_ExtInterfaceDef_narrow (
+    CORBA::Object *
+    ACE_ENV_ARG_DECL_NOT_USED
+  );
+
+TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_ExtInterfaceDef_upcast (
+    void *
+  );
+
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_ExtInterfaceDef_marshal (
+    CORBA::ExtInterfaceDef_ptr,
+    TAO_OutputCDR &
+  );
+
+// External declarations for undefined interface
+
+// CORBA::ExtValueDef
+TAO_IFR_Client_Export
+CORBA::ExtValueDef_ptr
+tao_CORBA_ExtValueDef_duplicate (
+    CORBA::ExtValueDef_ptr
+  );
+
+TAO_IFR_Client_Export
+void
+tao_CORBA_ExtValueDef_release (
+    CORBA::ExtValueDef_ptr
+  );
+
+TAO_IFR_Client_Export
+CORBA::ExtValueDef_ptr
+tao_CORBA_ExtValueDef_nil (
+    void
+  );
+
+TAO_IFR_Client_Export
+CORBA::ExtValueDef_ptr
+tao_CORBA_ExtValueDef_narrow (
+    CORBA::Object *
+    ACE_ENV_ARG_DECL_NOT_USED
+  );
+
+TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_ExtValueDef_upcast (
+    void *
+  );
+
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_ExtValueDef_marshal (
+    CORBA::ExtValueDef_ptr,
+    TAO_OutputCDR &
+  );
+
+// External declarations for undefined interface
+
+// CORBA::ExtAbstractInterfaceDef
+TAO_IFR_Client_Export
+CORBA::ExtAbstractInterfaceDef_ptr
+tao_CORBA_ExtAbstractInterfaceDef_duplicate (
+    CORBA::ExtAbstractInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export
+void
+tao_CORBA_ExtAbstractInterfaceDef_release (
+    CORBA::ExtAbstractInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export
+CORBA::ExtAbstractInterfaceDef_ptr
+tao_CORBA_ExtAbstractInterfaceDef_nil (
+    void
+  );
+
+TAO_IFR_Client_Export
+CORBA::ExtAbstractInterfaceDef_ptr
+tao_CORBA_ExtAbstractInterfaceDef_narrow (
+    CORBA::Object *
+    ACE_ENV_ARG_DECL_NOT_USED
+  );
+
+TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_ExtAbstractInterfaceDef_upcast (
+    void *
+  );
+
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_ExtAbstractInterfaceDef_marshal (
+    CORBA::ExtAbstractInterfaceDef_ptr,
+    TAO_OutputCDR &
+  );
+
+// External declarations for undefined interface
+
+// CORBA::ExtLocalInterfaceDef
+TAO_IFR_Client_Export
+CORBA::ExtLocalInterfaceDef_ptr
+tao_CORBA_ExtLocalInterfaceDef_duplicate (
+    CORBA::ExtLocalInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export
+void
+tao_CORBA_ExtLocalInterfaceDef_release (
+    CORBA::ExtLocalInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export
+CORBA::ExtLocalInterfaceDef_ptr
+tao_CORBA_ExtLocalInterfaceDef_nil (
+    void
+  );
+
+TAO_IFR_Client_Export
+CORBA::ExtLocalInterfaceDef_ptr
+tao_CORBA_ExtLocalInterfaceDef_narrow (
+    CORBA::Object *
+    ACE_ENV_ARG_DECL_NOT_USED
+  );
+
+TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_ExtLocalInterfaceDef_upcast (
+    void *
+  );
+
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_ExtLocalInterfaceDef_marshal (
+    CORBA::ExtLocalInterfaceDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_ch.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::DefinitionKind);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DefinitionKind &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IRObject_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Repository *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Contained_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Contained_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Contained_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Contained::Description &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Contained::Description*); // noncopying version
@@ -6817,64 +8805,56 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Con
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Contained::Description *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ContainedSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ContainedSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ContainedSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ContainedSeq *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ModuleDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstantDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StructDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UnionDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::EnumDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AliasDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDefSeq*); // noncopying version
@@ -6882,28 +8862,28 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Int
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceDefSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::NativeDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDefSeq*); // noncopying version
@@ -6911,21 +8891,21 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Val
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueDefSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueBoxDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AbstractInterfaceDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::AbstractInterfaceDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDefSeq*); // noncopying version
@@ -6933,14 +8913,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Abs
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AbstractInterfaceDefSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LocalInterfaceDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::LocalInterfaceDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDefSeq*); // noncopying version
@@ -6948,7 +8928,75 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Loc
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LocalInterfaceDefSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInterfaceDef *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtInterfaceDefSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDefSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInterfaceDefSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtInterfaceDefSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtValueDef *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtValueDefSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDefSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtValueDefSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtValueDefSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAbstractInterfaceDef *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtAbstractInterfaceDefSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDefSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAbstractInterfaceDefSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtAbstractInterfaceDefSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtLocalInterfaceDef *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtLocalInterfaceDefSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDefSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtLocalInterfaceDefSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtLocalInterfaceDefSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ContainedSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ContainedSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ContainedSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ContainedSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::StructMember &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructMember*); // noncopying version
@@ -6956,7 +9004,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Str
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StructMember *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::StructMemberSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructMemberSeq*); // noncopying version
@@ -6964,7 +9012,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Str
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StructMemberSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Initializer &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Initializer*); // noncopying version
@@ -6972,7 +9020,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ini
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Initializer *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InitializerSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InitializerSeq*); // noncopying version
@@ -6980,7 +9028,39 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ini
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InitializerSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExceptionDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExceptionDescription *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExcDescriptionSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExcDescriptionSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExcDescriptionSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExcDescriptionSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtInitializer &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInitializer*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInitializer *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtInitializer *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtInitializerSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInitializerSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInitializerSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtInitializerSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::UnionMember &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionMember*); // noncopying version
@@ -6988,7 +9068,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Uni
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UnionMember *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::UnionMemberSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionMemberSeq*); // noncopying version
@@ -6996,7 +9076,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Uni
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UnionMemberSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::EnumMemberSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumMemberSeq*); // noncopying version
@@ -7004,14 +9084,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Enu
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::EnumMemberSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Container_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Container::Description &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container::Description*); // noncopying version
@@ -7019,7 +9099,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Con
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Container::Description *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Container::DescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container::DescriptionSeq*); // noncopying version
@@ -7027,21 +9107,21 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Con
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Container::DescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IDLType_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IDLType_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IDLType_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypedefDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypedefDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypedefDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::TypeDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypeDescription*); // noncopying version
@@ -7049,109 +9129,92 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Typ
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::TypeDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ch.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::DefinitionKind &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::DefinitionKind &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::IRObject_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::IRObject_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Repository_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Repository_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Contained_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Contained_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Contained::Description &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Contained::Description &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
-
-#if !defined _TAO_CDR_OP_CORBA_ContainedSeq_H_
-#define _TAO_CDR_OP_CORBA_ContainedSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ContainedSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ContainedSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ContainedSeq_H_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ModuleDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ModuleDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ConstantDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstantDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::StructDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::StructDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::UnionDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::UnionDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::EnumDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::EnumDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AliasDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AliasDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_
 #define _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_
@@ -7168,28 +9231,28 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExceptionDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExceptionDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::NativeDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::NativeDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_ValueDefSeq_H_
 #define _TAO_CDR_OP_CORBA_ValueDefSeq_H_
@@ -7206,21 +9269,21 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ValueDefSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueBoxDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBoxDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AbstractInterfaceDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AbstractInterfaceDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_
 #define _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_
@@ -7237,14 +9300,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::LocalInterfaceDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::LocalInterfaceDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_
 #define _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_
@@ -7261,13 +9324,126 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtInterfaceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtInterfaceDef_ptr &);
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_H_
+#define _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_H_
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtInterfaceDefSeq &
+  );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtInterfaceDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtValueDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtValueDef_ptr &);
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ExtValueDefSeq_H_
+#define _TAO_CDR_OP_CORBA_ExtValueDefSeq_H_
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtValueDefSeq &
+  );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtValueDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExtValueDefSeq_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtAbstractInterfaceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtAbstractInterfaceDef_ptr &);
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_H_
+#define _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_H_
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtAbstractInterfaceDefSeq &
+  );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtAbstractInterfaceDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtLocalInterfaceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocalInterfaceDef_ptr &);
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_H_
+#define _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_H_
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtLocalInterfaceDefSeq &
+  );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtLocalInterfaceDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ContainedSeq_H_
+#define _TAO_CDR_OP_CORBA_ContainedSeq_H_
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ContainedSeq &
+  );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ContainedSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ContainedSeq_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::StructMember &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::StructMember &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_StructMemberSeq_H_
 #define _TAO_CDR_OP_CORBA_StructMemberSeq_H_
@@ -7284,13 +9460,13 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_StructMemberSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Initializer &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Initializer &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_InitializerSeq_H_
 #define _TAO_CDR_OP_CORBA_InitializerSeq_H_
@@ -7307,13 +9483,59 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_InitializerSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExceptionDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExceptionDescription &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_
+#define _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExcDescriptionSeq &
+  );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExcDescriptionSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtInitializer &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtInitializer &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ExtInitializerSeq_H_
+#define _TAO_CDR_OP_CORBA_ExtInitializerSeq_H_
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtInitializerSeq &
+  );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtInitializerSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExtInitializerSeq_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::UnionMember &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::UnionMember &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_UnionMemberSeq_H_
 #define _TAO_CDR_OP_CORBA_UnionMemberSeq_H_
@@ -7330,7 +9552,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_UnionMemberSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_EnumMemberSeq_H_
 #define _TAO_CDR_OP_CORBA_EnumMemberSeq_H_
@@ -7347,19 +9569,19 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_EnumMemberSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Container_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Container_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Container::Description &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Container::Description &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_
 #define _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_
@@ -7376,30 +9598,30 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::IDLType_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::IDLType_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TypedefDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypedefDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TypeDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1016
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "IFR_BaseC.i"
@@ -7415,3 +9637,5 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDesc
 
 #include "ace/post.h"
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.i b/TAO/tao/IFR_Client/IFR_BaseC.i
index b09efd19dda..9bc28ee6169 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.i
+++ b/TAO/tao/IFR_Client/IFR_BaseC.i
@@ -21,7 +21,7 @@
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_IROBJECT___CI_)
 #define _CORBA_IROBJECT___CI_
@@ -37,10 +37,17 @@ CORBA::IRObject::IRObject (
   this->CORBA_IRObject_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::IRObject::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::Contained::Description_var
@@ -190,7 +197,7 @@ CORBA::Contained::Description_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::Contained::Description_out
@@ -251,7 +258,7 @@ CORBA::Contained::Description_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_CONTAINED___CI_)
 #define _CORBA_CONTAINED___CI_
@@ -267,442 +274,17 @@ CORBA::Contained::Contained (
   this->CORBA_Contained_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_
-
-ACE_INLINE
-CORBA::Contained **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::Contained **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::Contained*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = CORBA::Contained::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (CORBA::Contained **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::Contained* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq(
-    const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::Contained **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
-      CORBA::Contained ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::Contained ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA::Contained::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
 ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
-  )
+CORBA::Boolean
+CORBA::Contained::marshal (TAO_OutputCDR &cdr)
 {
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::Contained **tmp =
-        ACE_reinterpret_cast (CORBA::Contained **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = CORBA::Contained::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::Contained **tmp1 =
-    ACE_reinterpret_cast (CORBA::Contained **, this->buffer_);
-  
-  CORBA::Contained ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::Contained ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::Contained::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::Contained ** const tmp =
-    ACE_reinterpret_cast (CORBA::Contained ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::Contained* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::Contained **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::Contained**, 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::Contained**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::Contained* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::Contained ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_CONTAINEDSEQ_CI_)
-#define _CORBA_CONTAINEDSEQ_CI_
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ContainedSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ContainedSeq_var::ContainedSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::ContainedSeq_var (ContainedSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::ContainedSeq_var (const ::CORBA::ContainedSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ContainedSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::~ContainedSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_var &
-CORBA::ContainedSeq_var::operator= (ContainedSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq_var &
-CORBA::ContainedSeq_var::operator= (const ::CORBA::ContainedSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ContainedSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ContainedSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ContainedSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ContainedSeq *
-CORBA::ContainedSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq *
-CORBA::ContainedSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::operator const ::CORBA::ContainedSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::operator ::CORBA::ContainedSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::operator ::CORBA::ContainedSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ContainedSeq_var::operator ::CORBA::ContainedSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var>
-CORBA::ContainedSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::ContainedSeq &
-CORBA::ContainedSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq &
-CORBA::ContainedSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq *&
-CORBA::ContainedSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq *
-CORBA::ContainedSeq_var::_retn (void)
-{
-  ::CORBA::ContainedSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq *
-CORBA::ContainedSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class CORBA::ContainedSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ContainedSeq_out::ContainedSeq_out (ContainedSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_out::ContainedSeq_out (ContainedSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_out::ContainedSeq_out (const ::CORBA::ContainedSeq_out &p)
-  : ptr_ (ACE_const_cast (ContainedSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ContainedSeq_out &
-CORBA::ContainedSeq_out::operator= (const ::CORBA::ContainedSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ContainedSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq_out &
-CORBA::ContainedSeq_out::operator= (ContainedSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_out::operator ::CORBA::ContainedSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq *&
-CORBA::ContainedSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq *
-CORBA::ContainedSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var>
-CORBA::ContainedSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
+  return (cdr << this);
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -899,7 +481,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (void) c
 #define _CORBA_INTERFACEDEFSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::InterfaceDefSeq_var
@@ -1062,7 +644,7 @@ CORBA::InterfaceDefSeq_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::InterfaceDefSeq_out
@@ -1134,7 +716,7 @@ CORBA::InterfaceDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -1331,7 +913,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (void) const
 #define _CORBA_VALUEDEFSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::ValueDefSeq_var
@@ -1494,7 +1076,7 @@ CORBA::ValueDefSeq_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::ValueDefSeq_out
@@ -1566,7 +1148,7 @@ CORBA::ValueDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -1763,7 +1345,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::get_buffer
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::AbstractInterfaceDefSeq_var
@@ -1926,7 +1508,7 @@ CORBA::AbstractInterfaceDefSeq_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::AbstractInterfaceDefSeq_out
@@ -1998,7 +1580,7 @@ CORBA::AbstractInterfaceDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -2195,7 +1777,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::get_buffer (vo
 #define _CORBA_LOCALINTERFACEDEFSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::LocalInterfaceDefSeq_var
@@ -2358,7 +1940,7 @@ CORBA::LocalInterfaceDefSeq_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::LocalInterfaceDefSeq_out
@@ -2429,8 +2011,2168 @@ CORBA::LocalInterfaceDefSeq_out::operator[] (CORBA::ULong 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:107
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTINTERFACEDEFSEQ_CI_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTINTERFACEDEFSEQ_CI_
+
+ACE_INLINE
+CORBA::ExtInterfaceDef **
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  CORBA::ExtInterfaceDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, CORBA::ExtInterfaceDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = tao_CORBA_ExtInterfaceDef_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE
+void 
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::freebuf (CORBA::ExtInterfaceDef **buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+  
+  delete[] buffer;
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (void)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ExtInterfaceDef* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq(
+    const _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::ExtInterfaceDef **tmp1 =
+        _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (this->maximum_);
+      CORBA::ExtInterfaceDef ** const tmp2 =
+        ACE_reinterpret_cast (CORBA::ExtInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = tao_CORBA_ExtInterfaceDef_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq &
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::operator= (
+    const _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+  
+  if (this->release_)
+    {
+      CORBA::ExtInterfaceDef **tmp =
+        ACE_reinterpret_cast (CORBA::ExtInterfaceDef **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tao_CORBA_ExtInterfaceDef_release (tmp[i]);
+          tmp[i] = tao_CORBA_ExtInterfaceDef_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::ExtInterfaceDef **tmp1 =
+    ACE_reinterpret_cast (CORBA::ExtInterfaceDef **, this->buffer_);
+  
+  CORBA::ExtInterfaceDef ** const tmp2 =
+    ACE_reinterpret_cast (CORBA::ExtInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = tao_CORBA_ExtInterfaceDef_duplicate (tmp2[i]);
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::ExtInterfaceDef,CORBA::ExtInterfaceDef_var>
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::operator[] (CORBA::ULong index) const
+{
+  ACE_ASSERT (index < this->maximum_);
+  CORBA::ExtInterfaceDef ** const tmp =
+    ACE_reinterpret_cast (CORBA::ExtInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<CORBA::ExtInterfaceDef,CORBA::ExtInterfaceDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE
+CORBA::ExtInterfaceDef* *
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::ExtInterfaceDef **result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::ExtInterfaceDef**, 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::ExtInterfaceDef**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+  
+  return result;
+}
+
+ACE_INLINE
+const CORBA::ExtInterfaceDef* *
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const CORBA::ExtInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTINTERFACEDEFSEQ_CI_)
+#define _CORBA_EXTINTERFACEDEFSEQ_CI_
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
+// *************************************************************
+// Inline operations for class CORBA::ExtInterfaceDefSeq_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_var::ExtInterfaceDefSeq_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_var::ExtInterfaceDefSeq_var (ExtInterfaceDefSeq *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_var::ExtInterfaceDefSeq_var (const ::CORBA::ExtInterfaceDefSeq_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ExtInterfaceDefSeq (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_var::~ExtInterfaceDefSeq_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_var &
+CORBA::ExtInterfaceDefSeq_var::operator= (ExtInterfaceDefSeq *p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtInterfaceDefSeq_var &
+CORBA::ExtInterfaceDefSeq_var::operator= (const ::CORBA::ExtInterfaceDefSeq_var &p)
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ExtInterfaceDefSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExtInterfaceDefSeq (*p.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ExtInterfaceDefSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+const ::CORBA::ExtInterfaceDefSeq *
+CORBA::ExtInterfaceDefSeq_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtInterfaceDefSeq *
+CORBA::ExtInterfaceDefSeq_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_var::operator const ::CORBA::ExtInterfaceDefSeq &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_var::operator ::CORBA::ExtInterfaceDefSeq &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_var::operator ::CORBA::ExtInterfaceDefSeq &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_var::operator ::CORBA::ExtInterfaceDefSeq *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::ExtInterfaceDef, CORBA::ExtInterfaceDef_var>
+CORBA::ExtInterfaceDefSeq_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE
+const ::CORBA::ExtInterfaceDefSeq &
+CORBA::ExtInterfaceDefSeq_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtInterfaceDefSeq &
+CORBA::ExtInterfaceDefSeq_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtInterfaceDefSeq *&
+CORBA::ExtInterfaceDefSeq_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtInterfaceDefSeq *
+CORBA::ExtInterfaceDefSeq_var::_retn (void)
+{
+  ::CORBA::ExtInterfaceDefSeq *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE
+::CORBA::ExtInterfaceDefSeq *
+CORBA::ExtInterfaceDefSeq_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
+
+// *************************************************************
+// Inline operations for class CORBA::ExtInterfaceDefSeq_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_out::ExtInterfaceDefSeq_out (ExtInterfaceDefSeq *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_out::ExtInterfaceDefSeq_out (ExtInterfaceDefSeq_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_out::ExtInterfaceDefSeq_out (const ::CORBA::ExtInterfaceDefSeq_out &p)
+  : ptr_ (ACE_const_cast (ExtInterfaceDefSeq_out&, p).ptr_)
+{}
+
+ACE_INLINE
+::CORBA::ExtInterfaceDefSeq_out &
+CORBA::ExtInterfaceDefSeq_out::operator= (const ::CORBA::ExtInterfaceDefSeq_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtInterfaceDefSeq_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtInterfaceDefSeq_out &
+CORBA::ExtInterfaceDefSeq_out::operator= (ExtInterfaceDefSeq *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ExtInterfaceDefSeq_out::operator ::CORBA::ExtInterfaceDefSeq *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtInterfaceDefSeq *&
+CORBA::ExtInterfaceDefSeq_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtInterfaceDefSeq *
+CORBA::ExtInterfaceDefSeq_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::ExtInterfaceDef, CORBA::ExtInterfaceDef_var>
+CORBA::ExtInterfaceDefSeq_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:107
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTVALUEDEFSEQ_CI_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTVALUEDEFSEQ_CI_
+
+ACE_INLINE
+CORBA::ExtValueDef **
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  CORBA::ExtValueDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, CORBA::ExtValueDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = tao_CORBA_ExtValueDef_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE
+void 
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::freebuf (CORBA::ExtValueDef **buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+  
+  delete[] buffer;
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (void)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ExtValueDef* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq(
+    const _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::ExtValueDef **tmp1 =
+        _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (this->maximum_);
+      CORBA::ExtValueDef ** const tmp2 =
+        ACE_reinterpret_cast (CORBA::ExtValueDef ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = tao_CORBA_ExtValueDef_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq &
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::operator= (
+    const _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+  
+  if (this->release_)
+    {
+      CORBA::ExtValueDef **tmp =
+        ACE_reinterpret_cast (CORBA::ExtValueDef **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tao_CORBA_ExtValueDef_release (tmp[i]);
+          tmp[i] = tao_CORBA_ExtValueDef_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::ExtValueDef **tmp1 =
+    ACE_reinterpret_cast (CORBA::ExtValueDef **, this->buffer_);
+  
+  CORBA::ExtValueDef ** const tmp2 =
+    ACE_reinterpret_cast (CORBA::ExtValueDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = tao_CORBA_ExtValueDef_duplicate (tmp2[i]);
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::ExtValueDef,CORBA::ExtValueDef_var>
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::operator[] (CORBA::ULong index) const
+{
+  ACE_ASSERT (index < this->maximum_);
+  CORBA::ExtValueDef ** const tmp =
+    ACE_reinterpret_cast (CORBA::ExtValueDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<CORBA::ExtValueDef,CORBA::ExtValueDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE
+CORBA::ExtValueDef* *
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::ExtValueDef **result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::ExtValueDef**, 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::ExtValueDef**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+  
+  return result;
+}
+
+ACE_INLINE
+const CORBA::ExtValueDef* *
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const CORBA::ExtValueDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTVALUEDEFSEQ_CI_)
+#define _CORBA_EXTVALUEDEFSEQ_CI_
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
+// *************************************************************
+// Inline operations for class CORBA::ExtValueDefSeq_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtValueDefSeq_var::ExtValueDefSeq_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ExtValueDefSeq_var::ExtValueDefSeq_var (ExtValueDefSeq *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ExtValueDefSeq_var::ExtValueDefSeq_var (const ::CORBA::ExtValueDefSeq_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ExtValueDefSeq (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ExtValueDefSeq_var::~ExtValueDefSeq_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtValueDefSeq_var &
+CORBA::ExtValueDefSeq_var::operator= (ExtValueDefSeq *p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtValueDefSeq_var &
+CORBA::ExtValueDefSeq_var::operator= (const ::CORBA::ExtValueDefSeq_var &p)
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ExtValueDefSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExtValueDefSeq (*p.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ExtValueDefSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+const ::CORBA::ExtValueDefSeq *
+CORBA::ExtValueDefSeq_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtValueDefSeq *
+CORBA::ExtValueDefSeq_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtValueDefSeq_var::operator const ::CORBA::ExtValueDefSeq &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtValueDefSeq_var::operator ::CORBA::ExtValueDefSeq &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtValueDefSeq_var::operator ::CORBA::ExtValueDefSeq &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ExtValueDefSeq_var::operator ::CORBA::ExtValueDefSeq *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::ExtValueDef, CORBA::ExtValueDef_var>
+CORBA::ExtValueDefSeq_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE
+const ::CORBA::ExtValueDefSeq &
+CORBA::ExtValueDefSeq_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtValueDefSeq &
+CORBA::ExtValueDefSeq_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtValueDefSeq *&
+CORBA::ExtValueDefSeq_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtValueDefSeq *
+CORBA::ExtValueDefSeq_var::_retn (void)
+{
+  ::CORBA::ExtValueDefSeq *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE
+::CORBA::ExtValueDefSeq *
+CORBA::ExtValueDefSeq_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
+
+// *************************************************************
+// Inline operations for class CORBA::ExtValueDefSeq_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtValueDefSeq_out::ExtValueDefSeq_out (ExtValueDefSeq *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtValueDefSeq_out::ExtValueDefSeq_out (ExtValueDefSeq_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtValueDefSeq_out::ExtValueDefSeq_out (const ::CORBA::ExtValueDefSeq_out &p)
+  : ptr_ (ACE_const_cast (ExtValueDefSeq_out&, p).ptr_)
+{}
+
+ACE_INLINE
+::CORBA::ExtValueDefSeq_out &
+CORBA::ExtValueDefSeq_out::operator= (const ::CORBA::ExtValueDefSeq_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtValueDefSeq_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtValueDefSeq_out &
+CORBA::ExtValueDefSeq_out::operator= (ExtValueDefSeq *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ExtValueDefSeq_out::operator ::CORBA::ExtValueDefSeq *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtValueDefSeq *&
+CORBA::ExtValueDefSeq_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtValueDefSeq *
+CORBA::ExtValueDefSeq_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::ExtValueDef, CORBA::ExtValueDef_var>
+CORBA::ExtValueDefSeq_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:107
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CI_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CI_
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDef **
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  CORBA::ExtAbstractInterfaceDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, CORBA::ExtAbstractInterfaceDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = tao_CORBA_ExtAbstractInterfaceDef_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE
+void 
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::freebuf (CORBA::ExtAbstractInterfaceDef **buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+  
+  delete[] buffer;
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (void)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ExtAbstractInterfaceDef* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq(
+    const _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::ExtAbstractInterfaceDef **tmp1 =
+        _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (this->maximum_);
+      CORBA::ExtAbstractInterfaceDef ** const tmp2 =
+        ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = tao_CORBA_ExtAbstractInterfaceDef_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq &
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::operator= (
+    const _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+  
+  if (this->release_)
+    {
+      CORBA::ExtAbstractInterfaceDef **tmp =
+        ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tao_CORBA_ExtAbstractInterfaceDef_release (tmp[i]);
+          tmp[i] = tao_CORBA_ExtAbstractInterfaceDef_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::ExtAbstractInterfaceDef **tmp1 =
+    ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef **, this->buffer_);
+  
+  CORBA::ExtAbstractInterfaceDef ** const tmp2 =
+    ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = tao_CORBA_ExtAbstractInterfaceDef_duplicate (tmp2[i]);
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var>
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::operator[] (CORBA::ULong index) const
+{
+  ACE_ASSERT (index < this->maximum_);
+  CORBA::ExtAbstractInterfaceDef ** const tmp =
+    ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<CORBA::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDef* *
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::ExtAbstractInterfaceDef **result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef**, 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::ExtAbstractInterfaceDef**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+  
+  return result;
+}
+
+ACE_INLINE
+const CORBA::ExtAbstractInterfaceDef* *
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const CORBA::ExtAbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CI_)
+#define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CI_
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
+// *************************************************************
+// Inline operations for class CORBA::ExtAbstractInterfaceDefSeq_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_var::ExtAbstractInterfaceDefSeq_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_var::ExtAbstractInterfaceDefSeq_var (ExtAbstractInterfaceDefSeq *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_var::ExtAbstractInterfaceDefSeq_var (const ::CORBA::ExtAbstractInterfaceDefSeq_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ExtAbstractInterfaceDefSeq (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_var::~ExtAbstractInterfaceDefSeq_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_var &
+CORBA::ExtAbstractInterfaceDefSeq_var::operator= (ExtAbstractInterfaceDefSeq *p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtAbstractInterfaceDefSeq_var &
+CORBA::ExtAbstractInterfaceDefSeq_var::operator= (const ::CORBA::ExtAbstractInterfaceDefSeq_var &p)
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ExtAbstractInterfaceDefSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExtAbstractInterfaceDefSeq (*p.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ExtAbstractInterfaceDefSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+const ::CORBA::ExtAbstractInterfaceDefSeq *
+CORBA::ExtAbstractInterfaceDefSeq_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtAbstractInterfaceDefSeq *
+CORBA::ExtAbstractInterfaceDefSeq_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_var::operator const ::CORBA::ExtAbstractInterfaceDefSeq &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_var::operator ::CORBA::ExtAbstractInterfaceDefSeq &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_var::operator ::CORBA::ExtAbstractInterfaceDefSeq &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_var::operator ::CORBA::ExtAbstractInterfaceDefSeq *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::ExtAbstractInterfaceDef, CORBA::ExtAbstractInterfaceDef_var>
+CORBA::ExtAbstractInterfaceDefSeq_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE
+const ::CORBA::ExtAbstractInterfaceDefSeq &
+CORBA::ExtAbstractInterfaceDefSeq_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtAbstractInterfaceDefSeq &
+CORBA::ExtAbstractInterfaceDefSeq_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtAbstractInterfaceDefSeq *&
+CORBA::ExtAbstractInterfaceDefSeq_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtAbstractInterfaceDefSeq *
+CORBA::ExtAbstractInterfaceDefSeq_var::_retn (void)
+{
+  ::CORBA::ExtAbstractInterfaceDefSeq *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE
+::CORBA::ExtAbstractInterfaceDefSeq *
+CORBA::ExtAbstractInterfaceDefSeq_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
+
+// *************************************************************
+// Inline operations for class CORBA::ExtAbstractInterfaceDefSeq_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_out::ExtAbstractInterfaceDefSeq_out (ExtAbstractInterfaceDefSeq *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_out::ExtAbstractInterfaceDefSeq_out (ExtAbstractInterfaceDefSeq_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_out::ExtAbstractInterfaceDefSeq_out (const ::CORBA::ExtAbstractInterfaceDefSeq_out &p)
+  : ptr_ (ACE_const_cast (ExtAbstractInterfaceDefSeq_out&, p).ptr_)
+{}
+
+ACE_INLINE
+::CORBA::ExtAbstractInterfaceDefSeq_out &
+CORBA::ExtAbstractInterfaceDefSeq_out::operator= (const ::CORBA::ExtAbstractInterfaceDefSeq_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtAbstractInterfaceDefSeq_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtAbstractInterfaceDefSeq_out &
+CORBA::ExtAbstractInterfaceDefSeq_out::operator= (ExtAbstractInterfaceDefSeq *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDefSeq_out::operator ::CORBA::ExtAbstractInterfaceDefSeq *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtAbstractInterfaceDefSeq *&
+CORBA::ExtAbstractInterfaceDefSeq_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtAbstractInterfaceDefSeq *
+CORBA::ExtAbstractInterfaceDefSeq_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::ExtAbstractInterfaceDef, CORBA::ExtAbstractInterfaceDef_var>
+CORBA::ExtAbstractInterfaceDefSeq_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:107
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTLOCALINTERFACEDEFSEQ_CI_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTLOCALINTERFACEDEFSEQ_CI_
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDef **
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+{
+  CORBA::ExtLocalInterfaceDef **buf = 0;
+  
+  ACE_NEW_RETURN (buf, CORBA::ExtLocalInterfaceDef*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = tao_CORBA_ExtLocalInterfaceDef_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE
+void 
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::freebuf (CORBA::ExtLocalInterfaceDef **buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+  
+  delete[] buffer;
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (void)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ExtLocalInterfaceDef* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq(
+    const _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::ExtLocalInterfaceDef **tmp1 =
+        _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (this->maximum_);
+      CORBA::ExtLocalInterfaceDef ** const tmp2 =
+        ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = tao_CORBA_ExtLocalInterfaceDef_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq &
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::operator= (
+    const _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+  
+  if (this->release_)
+    {
+      CORBA::ExtLocalInterfaceDef **tmp =
+        ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tao_CORBA_ExtLocalInterfaceDef_release (tmp[i]);
+          tmp[i] = tao_CORBA_ExtLocalInterfaceDef_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::ExtLocalInterfaceDef **tmp1 =
+    ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef **, this->buffer_);
+  
+  CORBA::ExtLocalInterfaceDef ** const tmp2 =
+    ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = tao_CORBA_ExtLocalInterfaceDef_duplicate (tmp2[i]);
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var>
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::operator[] (CORBA::ULong index) const
+{
+  ACE_ASSERT (index < this->maximum_);
+  CORBA::ExtLocalInterfaceDef ** const tmp =
+    ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<CORBA::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDef* *
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::ExtLocalInterfaceDef **result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef**, 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::ExtLocalInterfaceDef**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+  
+  return result;
+}
+
+ACE_INLINE
+const CORBA::ExtLocalInterfaceDef* *
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const CORBA::ExtLocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CI_)
+#define _CORBA_EXTLOCALINTERFACEDEFSEQ_CI_
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
+// *************************************************************
+// Inline operations for class CORBA::ExtLocalInterfaceDefSeq_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_var::ExtLocalInterfaceDefSeq_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_var::ExtLocalInterfaceDefSeq_var (ExtLocalInterfaceDefSeq *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_var::ExtLocalInterfaceDefSeq_var (const ::CORBA::ExtLocalInterfaceDefSeq_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ExtLocalInterfaceDefSeq (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_var::~ExtLocalInterfaceDefSeq_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_var &
+CORBA::ExtLocalInterfaceDefSeq_var::operator= (ExtLocalInterfaceDefSeq *p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtLocalInterfaceDefSeq_var &
+CORBA::ExtLocalInterfaceDefSeq_var::operator= (const ::CORBA::ExtLocalInterfaceDefSeq_var &p)
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ExtLocalInterfaceDefSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExtLocalInterfaceDefSeq (*p.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ExtLocalInterfaceDefSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+const ::CORBA::ExtLocalInterfaceDefSeq *
+CORBA::ExtLocalInterfaceDefSeq_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtLocalInterfaceDefSeq *
+CORBA::ExtLocalInterfaceDefSeq_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_var::operator const ::CORBA::ExtLocalInterfaceDefSeq &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_var::operator ::CORBA::ExtLocalInterfaceDefSeq &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_var::operator ::CORBA::ExtLocalInterfaceDefSeq &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_var::operator ::CORBA::ExtLocalInterfaceDefSeq *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::ExtLocalInterfaceDef, CORBA::ExtLocalInterfaceDef_var>
+CORBA::ExtLocalInterfaceDefSeq_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE
+const ::CORBA::ExtLocalInterfaceDefSeq &
+CORBA::ExtLocalInterfaceDefSeq_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtLocalInterfaceDefSeq &
+CORBA::ExtLocalInterfaceDefSeq_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtLocalInterfaceDefSeq *&
+CORBA::ExtLocalInterfaceDefSeq_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtLocalInterfaceDefSeq *
+CORBA::ExtLocalInterfaceDefSeq_var::_retn (void)
+{
+  ::CORBA::ExtLocalInterfaceDefSeq *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE
+::CORBA::ExtLocalInterfaceDefSeq *
+CORBA::ExtLocalInterfaceDefSeq_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
+
+// *************************************************************
+// Inline operations for class CORBA::ExtLocalInterfaceDefSeq_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_out::ExtLocalInterfaceDefSeq_out (ExtLocalInterfaceDefSeq *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_out::ExtLocalInterfaceDefSeq_out (ExtLocalInterfaceDefSeq_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_out::ExtLocalInterfaceDefSeq_out (const ::CORBA::ExtLocalInterfaceDefSeq_out &p)
+  : ptr_ (ACE_const_cast (ExtLocalInterfaceDefSeq_out&, p).ptr_)
+{}
+
+ACE_INLINE
+::CORBA::ExtLocalInterfaceDefSeq_out &
+CORBA::ExtLocalInterfaceDefSeq_out::operator= (const ::CORBA::ExtLocalInterfaceDefSeq_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtLocalInterfaceDefSeq_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtLocalInterfaceDefSeq_out &
+CORBA::ExtLocalInterfaceDefSeq_out::operator= (ExtLocalInterfaceDefSeq *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDefSeq_out::operator ::CORBA::ExtLocalInterfaceDefSeq *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtLocalInterfaceDefSeq *&
+CORBA::ExtLocalInterfaceDefSeq_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtLocalInterfaceDefSeq *
+CORBA::ExtLocalInterfaceDefSeq_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::ExtLocalInterfaceDef, CORBA::ExtLocalInterfaceDef_var>
+CORBA::ExtLocalInterfaceDefSeq_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:107
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_
+
+ACE_INLINE
+CORBA::Contained **
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (CORBA::ULong nelems)
+{
+  CORBA::Contained **buf = 0;
+  
+  ACE_NEW_RETURN (buf, CORBA::Contained*[nelems], 0);
+  
+  for (CORBA::ULong i = 0; i < nelems; i++)
+    {
+      buf[i] = CORBA::Contained::_nil ();
+    }
+  
+  return buf;
+}
+
+ACE_INLINE
+void 
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (CORBA::Contained **buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+  
+  delete[] buffer;
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::Contained* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq(
+    const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::Contained **tmp1 =
+        _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
+      CORBA::Contained ** const tmp2 =
+        ACE_reinterpret_cast (CORBA::Contained ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = CORBA::Contained::_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator= (
+    const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+  
+  if (this->release_)
+    {
+      CORBA::Contained **tmp =
+        ACE_reinterpret_cast (CORBA::Contained **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::release (tmp[i]);
+          tmp[i] = CORBA::Contained::_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::Contained **tmp1 =
+    ACE_reinterpret_cast (CORBA::Contained **, this->buffer_);
+  
+  CORBA::Contained ** const tmp2 =
+    ACE_reinterpret_cast (CORBA::Contained ** ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = CORBA::Contained::_duplicate (tmp2[i]);
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var>
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator[] (CORBA::ULong index) const
+{
+  ACE_ASSERT (index < this->maximum_);
+  CORBA::Contained ** const tmp =
+    ACE_reinterpret_cast (CORBA::Contained ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var> (tmp + index, this->release_);
+}
+
+ACE_INLINE
+CORBA::Contained* *
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::Contained **result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::Contained**, 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::Contained**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+  
+  return result;
+}
+
+ACE_INLINE
+const CORBA::Contained* *
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const CORBA::Contained ** ACE_CAST_CONST, this->buffer_);
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_CONTAINEDSEQ_CI_)
+#define _CORBA_CONTAINEDSEQ_CI_
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
+// *************************************************************
+// Inline operations for class CORBA::ContainedSeq_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ContainedSeq_var::ContainedSeq_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ContainedSeq_var::ContainedSeq_var (ContainedSeq *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ContainedSeq_var::ContainedSeq_var (const ::CORBA::ContainedSeq_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ContainedSeq (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ContainedSeq_var::~ContainedSeq_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ContainedSeq_var &
+CORBA::ContainedSeq_var::operator= (ContainedSeq *p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ContainedSeq_var &
+CORBA::ContainedSeq_var::operator= (const ::CORBA::ContainedSeq_var &p)
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ContainedSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ContainedSeq (*p.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ContainedSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+const ::CORBA::ContainedSeq *
+CORBA::ContainedSeq_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ContainedSeq *
+CORBA::ContainedSeq_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ContainedSeq_var::operator const ::CORBA::ContainedSeq &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ContainedSeq_var::operator ::CORBA::ContainedSeq &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ContainedSeq_var::operator ::CORBA::ContainedSeq &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ContainedSeq_var::operator ::CORBA::ContainedSeq *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var>
+CORBA::ContainedSeq_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE
+const ::CORBA::ContainedSeq &
+CORBA::ContainedSeq_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ContainedSeq &
+CORBA::ContainedSeq_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ContainedSeq *&
+CORBA::ContainedSeq_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ContainedSeq *
+CORBA::ContainedSeq_var::_retn (void)
+{
+  ::CORBA::ContainedSeq *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE
+::CORBA::ContainedSeq *
+CORBA::ContainedSeq_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
+
+// *************************************************************
+// Inline operations for class CORBA::ContainedSeq_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ContainedSeq_out::ContainedSeq_out (ContainedSeq *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ContainedSeq_out::ContainedSeq_out (ContainedSeq_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ContainedSeq_out::ContainedSeq_out (const ::CORBA::ContainedSeq_out &p)
+  : ptr_ (ACE_const_cast (ContainedSeq_out&, p).ptr_)
+{}
+
+ACE_INLINE
+::CORBA::ContainedSeq_out &
+CORBA::ContainedSeq_out::operator= (const ::CORBA::ContainedSeq_out &p)
+{
+  this->ptr_ = ACE_const_cast (ContainedSeq_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ContainedSeq_out &
+CORBA::ContainedSeq_out::operator= (ContainedSeq *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ContainedSeq_out::operator ::CORBA::ContainedSeq *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ContainedSeq *&
+CORBA::ContainedSeq_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ContainedSeq *
+CORBA::ContainedSeq_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var>
+CORBA::ContainedSeq_out::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+#endif /* end #if !defined */
+
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::StructMember_var
@@ -2580,7 +4322,7 @@ CORBA::StructMember_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::StructMember_out
@@ -2641,7 +4383,7 @@ CORBA::StructMember_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -2857,7 +4599,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::replace (
 #define _CORBA_STRUCTMEMBERSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::StructMemberSeq_var
@@ -3027,7 +4769,7 @@ CORBA::StructMemberSeq_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::StructMemberSeq_out
@@ -3099,7 +4841,7 @@ CORBA::StructMemberSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::Initializer_var
@@ -3249,7 +4991,7 @@ CORBA::Initializer_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::Initializer_out
@@ -3310,7 +5052,7 @@ CORBA::Initializer_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -3526,7 +5268,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::replace (
 #define _CORBA_INITIALIZERSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::InitializerSeq_var
@@ -3696,7 +5438,7 @@ CORBA::InitializerSeq_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::InitializerSeq_out
@@ -3768,7 +5510,1345 @@ CORBA::InitializerSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
+// *************************************************************
+// Inline operations for class CORBA::ExceptionDescription_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExceptionDescription_var::ExceptionDescription_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ExceptionDescription_var::ExceptionDescription_var (ExceptionDescription *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ExceptionDescription_var::ExceptionDescription_var (const ::CORBA::ExceptionDescription_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ExceptionDescription (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ExceptionDescription_var::~ExceptionDescription_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExceptionDescription_var &
+CORBA::ExceptionDescription_var::operator= (ExceptionDescription *_tao_struct_var)
+{
+  delete this->ptr_;
+  this->ptr_ = _tao_struct_var;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExceptionDescription_var &
+CORBA::ExceptionDescription_var::operator= (const ::CORBA::ExceptionDescription_var &_tao_struct_var)
+{
+  if (this != &_tao_struct_var)
+    {
+      if (_tao_struct_var.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ExceptionDescription *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExceptionDescription (*_tao_struct_var.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ExceptionDescription *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE const ::CORBA::ExceptionDescription *
+CORBA::ExceptionDescription_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExceptionDescription *
+CORBA::ExceptionDescription_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExceptionDescription_var::operator const ::CORBA::ExceptionDescription &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExceptionDescription_var::operator ::CORBA::ExceptionDescription &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExceptionDescription_var::operator ::CORBA::ExceptionDescription &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ExceptionDescription_var::operator ::CORBA::ExceptionDescription *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const ::CORBA::ExceptionDescription &
+CORBA::ExceptionDescription_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExceptionDescription &
+CORBA::ExceptionDescription_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+// Mapping for variable size.
+ACE_INLINE ::CORBA::ExceptionDescription *&
+CORBA::ExceptionDescription_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExceptionDescription *
+CORBA::ExceptionDescription_var::_retn (void)
+{
+  ::CORBA::ExceptionDescription *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE ::CORBA::ExceptionDescription *
+CORBA::ExceptionDescription_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 CORBA::ExceptionDescription_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExceptionDescription_out::ExceptionDescription_out (::CORBA::ExceptionDescription *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExceptionDescription_out::ExceptionDescription_out (ExceptionDescription_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExceptionDescription_out::ExceptionDescription_out (const ::CORBA::ExceptionDescription_out &p)
+  : ptr_ (ACE_const_cast (ExceptionDescription_out&, p).ptr_)
+{}
+
+ACE_INLINE
+CORBA::ExceptionDescription_out &
+CORBA::ExceptionDescription_out::operator= (const ::CORBA::ExceptionDescription_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExceptionDescription_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ExceptionDescription_out &
+CORBA::ExceptionDescription_out::operator= (ExceptionDescription *_tao_struct_out)
+{
+  this->ptr_ = _tao_struct_out;
+  return *this;
+}
+
+ACE_INLINE 
+CORBA::ExceptionDescription_out::operator ::CORBA::ExceptionDescription *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExceptionDescription *&
+CORBA::ExceptionDescription_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExceptionDescription *
+CORBA::ExceptionDescription_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:98
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CI_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CI_
+
+ACE_INLINE
+CORBA::ExceptionDescription *
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (CORBA::ULong size)
+{
+  CORBA::ExceptionDescription *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA::ExceptionDescription[size], 0);
+  return retval;
+}
+
+ACE_INLINE
+void CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (CORBA::ExceptionDescription *buffer)
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum) 
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ExceptionDescription *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
+    const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::ExceptionDescription *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (this->maximum_);
+      CORBA::ExceptionDescription * const tmp2 =
+        ACE_reinterpret_cast (CORBA::ExceptionDescription * 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
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+  
+  if (this->release_)
+    {
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          CORBA::ExceptionDescription *tmp =
+            ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::ExceptionDescription *tmp1 =
+    ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
+  CORBA::ExceptionDescription * const tmp2 =
+    ACE_reinterpret_cast (CORBA::ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tmp1[i] = tmp2[i];
+    }
+  
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE
+CORBA::ExceptionDescription &
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator[] (CORBA::ULong i)
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ExceptionDescription* tmp =
+    ACE_reinterpret_cast (CORBA::ExceptionDescription*, this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE
+const CORBA::ExceptionDescription &
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator[] (CORBA::ULong i) const
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ExceptionDescription * const tmp =
+    ACE_reinterpret_cast (CORBA::ExceptionDescription* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE
+CORBA::ExceptionDescription *
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::ExceptionDescription *result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::ExceptionDescription*, 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::ExceptionDescription*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+  
+  return result;
+}
+
+ACE_INLINE
+const CORBA::ExceptionDescription *
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const CORBA::ExceptionDescription * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE
+void
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ExceptionDescription *data,
+    CORBA::Boolean release
+  )
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  
+  if (this->buffer_ && this->release_ == 1)
+    {
+      CORBA::ExceptionDescription *tmp =
+        ACE_reinterpret_cast (CORBA::ExceptionDescription*, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
+    }
+  
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CI_)
+#define _CORBA_EXCDESCRIPTIONSEQ_CI_
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
+// *************************************************************
+// Inline operations for class CORBA::ExcDescriptionSeq_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExcDescriptionSeq_var::ExcDescriptionSeq_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ExcDescriptionSeq_var::ExcDescriptionSeq_var (ExcDescriptionSeq *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ExcDescriptionSeq_var::ExcDescriptionSeq_var (const ::CORBA::ExcDescriptionSeq_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ExcDescriptionSeq (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ExcDescriptionSeq_var::~ExcDescriptionSeq_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExcDescriptionSeq_var &
+CORBA::ExcDescriptionSeq_var::operator= (ExcDescriptionSeq *p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExcDescriptionSeq_var &
+CORBA::ExcDescriptionSeq_var::operator= (const ::CORBA::ExcDescriptionSeq_var &p)
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ExcDescriptionSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExcDescriptionSeq (*p.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ExcDescriptionSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+const ::CORBA::ExcDescriptionSeq *
+CORBA::ExcDescriptionSeq_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExcDescriptionSeq *
+CORBA::ExcDescriptionSeq_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExcDescriptionSeq_var::operator const ::CORBA::ExcDescriptionSeq &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExcDescriptionSeq_var::operator ::CORBA::ExcDescriptionSeq &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExcDescriptionSeq_var::operator ::CORBA::ExcDescriptionSeq &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ExcDescriptionSeq_var::operator ::CORBA::ExcDescriptionSeq *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExceptionDescription &
+CORBA::ExcDescriptionSeq_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE
+const CORBA::ExceptionDescription &
+CORBA::ExcDescriptionSeq_var::operator[] (CORBA::ULong index) const
+{
+  return ACE_const_cast (const CORBA::ExceptionDescription &, this->ptr_->operator[] (index));
+}
+
+ACE_INLINE
+const ::CORBA::ExcDescriptionSeq &
+CORBA::ExcDescriptionSeq_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExcDescriptionSeq &
+CORBA::ExcDescriptionSeq_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExcDescriptionSeq *&
+CORBA::ExcDescriptionSeq_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExcDescriptionSeq *
+CORBA::ExcDescriptionSeq_var::_retn (void)
+{
+  ::CORBA::ExcDescriptionSeq *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE
+::CORBA::ExcDescriptionSeq *
+CORBA::ExcDescriptionSeq_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
+
+// *************************************************************
+// Inline operations for class CORBA::ExcDescriptionSeq_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExcDescriptionSeq_out::ExcDescriptionSeq_out (ExcDescriptionSeq *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExcDescriptionSeq_out::ExcDescriptionSeq_out (ExcDescriptionSeq_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExcDescriptionSeq_out::ExcDescriptionSeq_out (const ::CORBA::ExcDescriptionSeq_out &p)
+  : ptr_ (ACE_const_cast (ExcDescriptionSeq_out&, p).ptr_)
+{}
+
+ACE_INLINE
+::CORBA::ExcDescriptionSeq_out &
+CORBA::ExcDescriptionSeq_out::operator= (const ::CORBA::ExcDescriptionSeq_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExcDescriptionSeq_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExcDescriptionSeq_out &
+CORBA::ExcDescriptionSeq_out::operator= (ExcDescriptionSeq *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ExcDescriptionSeq_out::operator ::CORBA::ExcDescriptionSeq *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExcDescriptionSeq *&
+CORBA::ExcDescriptionSeq_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExcDescriptionSeq *
+CORBA::ExcDescriptionSeq_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExceptionDescription &
+CORBA::ExcDescriptionSeq_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 CORBA::ExtInitializer_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtInitializer_var::ExtInitializer_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ExtInitializer_var::ExtInitializer_var (ExtInitializer *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ExtInitializer_var::ExtInitializer_var (const ::CORBA::ExtInitializer_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ExtInitializer (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ExtInitializer_var::~ExtInitializer_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInitializer_var &
+CORBA::ExtInitializer_var::operator= (ExtInitializer *_tao_struct_var)
+{
+  delete this->ptr_;
+  this->ptr_ = _tao_struct_var;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtInitializer_var &
+CORBA::ExtInitializer_var::operator= (const ::CORBA::ExtInitializer_var &_tao_struct_var)
+{
+  if (this != &_tao_struct_var)
+    {
+      if (_tao_struct_var.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ExtInitializer *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExtInitializer (*_tao_struct_var.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ExtInitializer *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE const ::CORBA::ExtInitializer *
+CORBA::ExtInitializer_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExtInitializer *
+CORBA::ExtInitializer_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInitializer_var::operator const ::CORBA::ExtInitializer &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInitializer_var::operator ::CORBA::ExtInitializer &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInitializer_var::operator ::CORBA::ExtInitializer &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ExtInitializer_var::operator ::CORBA::ExtInitializer *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const ::CORBA::ExtInitializer &
+CORBA::ExtInitializer_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExtInitializer &
+CORBA::ExtInitializer_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+// Mapping for variable size.
+ACE_INLINE ::CORBA::ExtInitializer *&
+CORBA::ExtInitializer_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExtInitializer *
+CORBA::ExtInitializer_var::_retn (void)
+{
+  ::CORBA::ExtInitializer *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE ::CORBA::ExtInitializer *
+CORBA::ExtInitializer_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 CORBA::ExtInitializer_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtInitializer_out::ExtInitializer_out (::CORBA::ExtInitializer *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtInitializer_out::ExtInitializer_out (ExtInitializer_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtInitializer_out::ExtInitializer_out (const ::CORBA::ExtInitializer_out &p)
+  : ptr_ (ACE_const_cast (ExtInitializer_out&, p).ptr_)
+{}
+
+ACE_INLINE
+CORBA::ExtInitializer_out &
+CORBA::ExtInitializer_out::operator= (const ::CORBA::ExtInitializer_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtInitializer_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ExtInitializer_out &
+CORBA::ExtInitializer_out::operator= (ExtInitializer *_tao_struct_out)
+{
+  this->ptr_ = _tao_struct_out;
+  return *this;
+}
+
+ACE_INLINE 
+CORBA::ExtInitializer_out::operator ::CORBA::ExtInitializer *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExtInitializer *&
+CORBA::ExtInitializer_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExtInitializer *
+CORBA::ExtInitializer_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:98
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXTINITIALIZERSEQ_CI_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXTINITIALIZERSEQ_CI_
+
+ACE_INLINE
+CORBA::ExtInitializer *
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (CORBA::ULong size)
+{
+  CORBA::ExtInitializer *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA::ExtInitializer[size], 0);
+  return retval;
+}
+
+ACE_INLINE
+void CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::freebuf (CORBA::ExtInitializer *buffer)
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (void)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (CORBA::ULong maximum) 
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ExtInitializer *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (
+    const _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::ExtInitializer *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (this->maximum_);
+      CORBA::ExtInitializer * const tmp2 =
+        ACE_reinterpret_cast (CORBA::ExtInitializer * 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
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq &
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+  
+  if (this->release_)
+    {
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          CORBA::ExtInitializer *tmp =
+            ACE_reinterpret_cast (CORBA::ExtInitializer *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::ExtInitializer *tmp1 =
+    ACE_reinterpret_cast (CORBA::ExtInitializer *, this->buffer_);
+  CORBA::ExtInitializer * const tmp2 =
+    ACE_reinterpret_cast (CORBA::ExtInitializer * ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tmp1[i] = tmp2[i];
+    }
+  
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE
+CORBA::ExtInitializer &
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::operator[] (CORBA::ULong i)
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ExtInitializer* tmp =
+    ACE_reinterpret_cast (CORBA::ExtInitializer*, this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE
+const CORBA::ExtInitializer &
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::operator[] (CORBA::ULong i) const
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ExtInitializer * const tmp =
+    ACE_reinterpret_cast (CORBA::ExtInitializer* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE
+CORBA::ExtInitializer *
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::ExtInitializer *result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::ExtInitializer*, 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::ExtInitializer*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+  
+  return result;
+}
+
+ACE_INLINE
+const CORBA::ExtInitializer *
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const CORBA::ExtInitializer * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE
+void
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ExtInitializer *data,
+    CORBA::Boolean release
+  )
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  
+  if (this->buffer_ && this->release_ == 1)
+    {
+      CORBA::ExtInitializer *tmp =
+        ACE_reinterpret_cast (CORBA::ExtInitializer*, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::freebuf (tmp);
+    }
+  
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTINITIALIZERSEQ_CI_)
+#define _CORBA_EXTINITIALIZERSEQ_CI_
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
+// *************************************************************
+// Inline operations for class CORBA::ExtInitializerSeq_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtInitializerSeq_var::ExtInitializerSeq_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ExtInitializerSeq_var::ExtInitializerSeq_var (ExtInitializerSeq *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ExtInitializerSeq_var::ExtInitializerSeq_var (const ::CORBA::ExtInitializerSeq_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ExtInitializerSeq (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ExtInitializerSeq_var::~ExtInitializerSeq_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInitializerSeq_var &
+CORBA::ExtInitializerSeq_var::operator= (ExtInitializerSeq *p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtInitializerSeq_var &
+CORBA::ExtInitializerSeq_var::operator= (const ::CORBA::ExtInitializerSeq_var &p)
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ExtInitializerSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExtInitializerSeq (*p.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ExtInitializerSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+const ::CORBA::ExtInitializerSeq *
+CORBA::ExtInitializerSeq_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtInitializerSeq *
+CORBA::ExtInitializerSeq_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInitializerSeq_var::operator const ::CORBA::ExtInitializerSeq &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInitializerSeq_var::operator ::CORBA::ExtInitializerSeq &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInitializerSeq_var::operator ::CORBA::ExtInitializerSeq &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ExtInitializerSeq_var::operator ::CORBA::ExtInitializerSeq *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInitializer &
+CORBA::ExtInitializerSeq_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE
+const CORBA::ExtInitializer &
+CORBA::ExtInitializerSeq_var::operator[] (CORBA::ULong index) const
+{
+  return ACE_const_cast (const CORBA::ExtInitializer &, this->ptr_->operator[] (index));
+}
+
+ACE_INLINE
+const ::CORBA::ExtInitializerSeq &
+CORBA::ExtInitializerSeq_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtInitializerSeq &
+CORBA::ExtInitializerSeq_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtInitializerSeq *&
+CORBA::ExtInitializerSeq_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtInitializerSeq *
+CORBA::ExtInitializerSeq_var::_retn (void)
+{
+  ::CORBA::ExtInitializerSeq *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE
+::CORBA::ExtInitializerSeq *
+CORBA::ExtInitializerSeq_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
+
+// *************************************************************
+// Inline operations for class CORBA::ExtInitializerSeq_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtInitializerSeq_out::ExtInitializerSeq_out (ExtInitializerSeq *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtInitializerSeq_out::ExtInitializerSeq_out (ExtInitializerSeq_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtInitializerSeq_out::ExtInitializerSeq_out (const ::CORBA::ExtInitializerSeq_out &p)
+  : ptr_ (ACE_const_cast (ExtInitializerSeq_out&, p).ptr_)
+{}
+
+ACE_INLINE
+::CORBA::ExtInitializerSeq_out &
+CORBA::ExtInitializerSeq_out::operator= (const ::CORBA::ExtInitializerSeq_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtInitializerSeq_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtInitializerSeq_out &
+CORBA::ExtInitializerSeq_out::operator= (ExtInitializerSeq *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ExtInitializerSeq_out::operator ::CORBA::ExtInitializerSeq *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtInitializerSeq *&
+CORBA::ExtInitializerSeq_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtInitializerSeq *
+CORBA::ExtInitializerSeq_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtInitializer &
+CORBA::ExtInitializerSeq_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 CORBA::UnionMember_var
@@ -3918,7 +6998,7 @@ CORBA::UnionMember_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::UnionMember_out
@@ -3979,7 +7059,7 @@ CORBA::UnionMember_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -4195,7 +7275,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::replace (
 #define _CORBA_UNIONMEMBERSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::UnionMemberSeq_var
@@ -4365,7 +7445,7 @@ CORBA::UnionMemberSeq_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::UnionMemberSeq_out
@@ -4440,7 +7520,7 @@ CORBA::UnionMemberSeq_out::operator[] (CORBA::ULong index)
 #define _CORBA_ENUMMEMBERSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::EnumMemberSeq_var
@@ -4603,7 +7683,7 @@ CORBA::EnumMemberSeq_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::EnumMemberSeq_out
@@ -4675,7 +7755,7 @@ CORBA::EnumMemberSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::Container::Description_var
@@ -4825,7 +7905,7 @@ CORBA::Container::Description_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::Container::Description_out
@@ -4886,7 +7966,7 @@ CORBA::Container::Description_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -5102,7 +8182,7 @@ CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::replac
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::Container::DescriptionSeq_var
@@ -5272,7 +8352,7 @@ CORBA::Container::DescriptionSeq_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::Container::DescriptionSeq_out
@@ -5344,7 +8424,7 @@ CORBA::Container::DescriptionSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_CONTAINER___CI_)
 #define _CORBA_CONTAINER___CI_
@@ -5360,10 +8440,17 @@ CORBA::Container::Container (
   this->CORBA_Container_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::Container::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_IDLTYPE___CI_)
 #define _CORBA_IDLTYPE___CI_
@@ -5374,15 +8461,22 @@ CORBA::IDLType::IDLType (
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
+  : ACE_NESTED_CLASS (CORBA, Object)(objref, _tao_collocated, servant)
 {
   this->CORBA_IDLType_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::IDLType::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_TYPEDEFDEF___CI_)
 #define _CORBA_TYPEDEFDEF___CI_
@@ -5398,10 +8492,17 @@ CORBA::TypedefDef::TypedefDef (
   this->CORBA_TypedefDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::TypedefDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::TypeDescription_var
@@ -5551,7 +8652,7 @@ CORBA::TypeDescription_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::TypeDescription_out
@@ -5612,7 +8713,7 @@ CORBA::TypeDescription_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ci.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
 
 ACE_INLINE
 CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::DefinitionKind &_tao_enumval)
@@ -5636,7 +8737,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::DefinitionKind &_tao_enumv
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5649,7 +8750,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5662,7 +8763,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5675,7 +8776,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5688,7 +8789,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -5729,25 +8830,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_CORBA_ContainedSeq_I_
-#define _TAO_CDR_OP_CORBA_ContainedSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ContainedSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    CORBA::ContainedSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ContainedSeq_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5760,7 +8843,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5773,7 +8856,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5786,7 +8869,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5799,7 +8882,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5812,7 +8895,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5825,7 +8908,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5838,7 +8921,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5851,7 +8934,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_InterfaceDefSeq_I_
 #define _TAO_CDR_OP_CORBA_InterfaceDefSeq_I_
@@ -5869,7 +8952,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_InterfaceDefSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5882,7 +8965,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5895,7 +8978,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5908,7 +8991,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_ValueDefSeq_I_
 #define _TAO_CDR_OP_CORBA_ValueDefSeq_I_
@@ -5926,7 +9009,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ValueDefSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5939,7 +9022,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5952,7 +9035,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_I_
 #define _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_I_
@@ -5970,7 +9053,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5983,7 +9066,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_I_
 #define _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_I_
@@ -6001,7 +9084,149 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtInterfaceDef_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_CORBA_ExtInterfaceDefSeq_I_
+#define _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtInterfaceDefSeq &
+  );
+
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtInterfaceDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtValueDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtValueDef_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_CORBA_ExtValueDefSeq_I_
+#define _TAO_CDR_OP_CORBA_ExtValueDefSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtValueDefSeq &
+  );
+
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtValueDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExtValueDefSeq_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtAbstractInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtAbstractInterfaceDef_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_CORBA_ExtAbstractInterfaceDefSeq_I_
+#define _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtAbstractInterfaceDefSeq &
+  );
+
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtAbstractInterfaceDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtLocalInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtLocalInterfaceDef_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_CORBA_ExtLocalInterfaceDefSeq_I_
+#define _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtLocalInterfaceDefSeq &
+  );
+
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtLocalInterfaceDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+
+#if !defined _TAO_CDR_OP_CORBA_ContainedSeq_I_
+#define _TAO_CDR_OP_CORBA_ContainedSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ContainedSeq &
+  );
+
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ContainedSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ContainedSeq_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -6012,7 +9237,7 @@ CORBA::Boolean operator<< (
   if (
     (strm << _tao_aggregate.name.in ()) &&
     (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.type_def.in ())
+    _tao_aggregate.type_def.in ()->marshal (strm)
    )
     {
       return 1;
@@ -6044,7 +9269,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_StructMemberSeq_I_
 #define _TAO_CDR_OP_CORBA_StructMemberSeq_I_
@@ -6062,7 +9287,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_StructMemberSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -6103,7 +9328,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_InitializerSeq_I_
 #define _TAO_CDR_OP_CORBA_InitializerSeq_I_
@@ -6121,7 +9346,133 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_InitializerSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExceptionDescription &_tao_aggregate
+  )
+{
+  if (
+    (strm << _tao_aggregate.name.in ()) &&
+    (strm << _tao_aggregate.id.in ()) &&
+    (strm << _tao_aggregate.defined_in.in ()) &&
+    (strm << _tao_aggregate.version.in ()) &&
+    (strm << _tao_aggregate.type.in ())
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExceptionDescription &_tao_aggregate
+  )
+{
+  if (
+    (strm >> _tao_aggregate.name.out ()) &&
+    (strm >> _tao_aggregate.id.out ()) &&
+    (strm >> _tao_aggregate.defined_in.out ()) &&
+    (strm >> _tao_aggregate.version.out ()) &&
+    (strm >> _tao_aggregate.type.out ())
+   )
+    {
+      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_CORBA_ExcDescriptionSeq_I_
+#define _TAO_CDR_OP_CORBA_ExcDescriptionSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExcDescriptionSeq &
+  );
+
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ExcDescriptionSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExtInitializer &_tao_aggregate
+  )
+{
+  if (
+    (strm << _tao_aggregate.members) &&
+    (strm << _tao_aggregate.exceptions) &&
+    (strm << _tao_aggregate.name.in ())
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExtInitializer &_tao_aggregate
+  )
+{
+  if (
+    (strm >> _tao_aggregate.members) &&
+    (strm >> _tao_aggregate.exceptions) &&
+    (strm >> _tao_aggregate.name.out ())
+   )
+    {
+      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_CORBA_ExtInitializerSeq_I_
+#define _TAO_CDR_OP_CORBA_ExtInitializerSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtInitializerSeq &
+  );
+
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtInitializerSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExtInitializerSeq_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -6133,7 +9484,7 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.name.in ()) &&
     (strm << _tao_aggregate.label) &&
     (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.type_def.in ())
+    _tao_aggregate.type_def.in ()->marshal (strm)
    )
     {
       return 1;
@@ -6166,7 +9517,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_UnionMemberSeq_I_
 #define _TAO_CDR_OP_CORBA_UnionMemberSeq_I_
@@ -6184,7 +9535,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_UnionMemberSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_EnumMemberSeq_I_
 #define _TAO_CDR_OP_CORBA_EnumMemberSeq_I_
@@ -6202,7 +9553,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_EnumMemberSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -6211,7 +9562,7 @@ CORBA::Boolean operator<< (
   )
 {
   if (
-    (strm << _tao_aggregate.contained_object.in ()) &&
+    _tao_aggregate.contained_object.in ()->marshal (strm) &&
     (strm << _tao_aggregate.kind) &&
     (strm << _tao_aggregate.value)
    )
@@ -6245,7 +9596,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_Container_DescriptionSeq_I_
 #define _TAO_CDR_OP_CORBA_Container_DescriptionSeq_I_
@@ -6263,7 +9614,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_Container_DescriptionSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -6276,7 +9627,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -6322,3 +9673,4 @@ CORBA::Boolean operator>> (
     }
 }
 
+
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index f6004b62cea..ca87f284a62 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -16,50 +16,39 @@
 //   time. This IDL file contains the concrete base interfaces of
 //   the IFR, except for fixed types, valuetypes and CORBA components.
 //
-//   1. Patch this pidl file with
+//   The command used to generate code from this IDL file is:
 //
-//      patch < diffs/IFR_Basic.pidl.diff
-//
-//   This will remove the CORBA module, rename most types foo
-//   declared in it as CORBA_foo, unalias the simple typedefs
-//   which don't have a CORBA_ analog in corbafwd.h.
-//
-//   2. Generate the code. The command used to generate code from this 
-//   IDL file is:
-//
-//     tao_idl -o orig -Ge 1 -I.. \
+//     tao_idl -Ge 1 -I.. \
 //          -Wb,export_macro=TAO_IFR_Client_Export \
 //          -Wb,export_include=ifr_client_export.h \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
 //          IFR_Basic.pidl
 //
-//   3. Copy the generated files to the current directory.
-//
-//   4. Patch the generated files, using
-//      
-//      patch < diffs/IFR_BasicC.h.diff
-//      patch < diffs/IFR_BasicC.i.diff
-//      patch < diffs/IFR_BasicC.cpp.diff
+//   Only the stub files are used in the TAO_IFR_Client library. The
+//   skeleton files can be deleted from this directory.
 //
-//   If this fails for some reason, the files must be patched
-//   by hand, and the diff files regenerated with
+//   No patching of the generated stub files is necessary.
 //
-//      diff -wbu orig/IFR_BasicC.h IFR_BasicC.h > diffs/IFR_BasicC.h.diff
-//      diff -wbu orig/IFR_BasicC.i IFR_BasicC.i > diffs/IFR_BasicC.i.diff
-//      diff -wbu orig/IFR_BasicC.cpp IFR_BasicC.cpp > diffs/IFR_BasicC.cpp.diff
+//   To generate the skeleton files for the IFR Service, the command is:
 //
-//   5. Restore IFR_Base.pidl.
-//
-//   To regenerate the skeleton files IFR_BasicS.{h,i,cpp} and 
-//   IFR_BasicS_T.{h,i.cpp} in ACE_ROOT/TAO/orbsvcs/IFR_Service, use the 
-//   command
-//
-//     tao_idl -o ../../orbsvcs/IFR_Service/orig -Ge 1 \
+//     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
 //          IFR_Basic.pidl
 //
+//   The only modification necessary to the skelton files is to 
+//   change
+//
+//   #include "IFR_BasicC.h"
+//
+//   to
+//
+//   #include "tao/IFR_Client/IFR_BasicC.h"
+//
+//   in IFR_BasicS.h. The stub files may be deleted from the IFRService
+//   directory.
+//
 // ================================================================
 
 #ifndef _IFR_BASIC_IDL_
@@ -67,8 +56,6 @@
 
 #include "IFR_Base.pidl"
 
-#pragma prefix "omg.org"
-
 module CORBA 
 {
   interface PrimitiveDef;
@@ -227,17 +214,7 @@ module CORBA
     attribute StructMemberSeq members;
   };
 
-  struct ExceptionDescription 
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    TypeCode type;
-  };
-
   typedef sequence <ExceptionDef> ExceptionDefSeq;
-  typedef sequence <ExceptionDescription> ExcDescriptionSeq;
 
   enum AttributeMode 
   {
@@ -262,19 +239,42 @@ module CORBA
     AttributeMode mode;
   };
 
+  struct ExtAttributeDescription 
+  {
+    Identifier name;
+    RepositoryId id;
+    RepositoryId defined_in;
+    VersionSpec version;
+    TypeCode type;
+    AttributeMode mode;
+    ExcDescriptionSeq get_exceptions;
+    ExcDescriptionSeq put_exceptions;
+  };
+
+  interface ExtAttributeDef : AttributeDef 
+  {
+    // read/write interface
+    attribute ExcDescriptionSeq get_exceptions;
+    attribute ExcDescriptionSeq set_exceptions;
+    // read interface
+    ExtAttributeDescription describe_attribute ();
+  };
+
   enum OperationMode 
   {
     OP_NORMAL, 
     OP_ONEWAY
   };
 
+// Already defined in corbafwd.h, included from orb.idl
+/*
   enum ParameterMode 
   {
     PARAM_IN, 
     PARAM_OUT, 
     PARAM_INOUT
   };
-
+*/
   struct ParameterDescription 
   {
     Identifier name;
@@ -313,8 +313,11 @@ module CORBA
   typedef sequence <RepositoryId> RepositoryIdSeq;
   typedef sequence <OperationDescription> OpDescriptionSeq;
   typedef sequence <AttributeDescription> AttrDescriptionSeq;
+  typedef sequence <ExtAttributeDescription> ExtAttrDescriptionSeq;
 
-  interface InterfaceDef : Container, Contained, IDLType 
+  interface InterfaceDef : Container, 
+			   Contained, 
+			   IDLType 
   {
     // read/write interface
     attribute InterfaceDefSeq base_interfaces;
@@ -366,15 +369,57 @@ module CORBA
     RepositoryIdSeq base_interfaces;
   };
 
+  interface InterfaceAttrExtension 
+  {
+    // read interface
+    struct ExtFullInterfaceDescription 
+    {
+      Identifier name;
+      RepositoryId id;
+      RepositoryId defined_in;
+      VersionSpec version;
+      OpDescriptionSeq operations;
+      ExtAttrDescriptionSeq attributes;
+      RepositoryIdSeq base_interfaces;
+      TypeCode type;
+    };
+
+    ExtFullInterfaceDescription describe_ext_interface ();
+
+    // write interface
+    ExtAttributeDef create_ext_attribute (
+	in RepositoryId id,
+	in Identifier name,
+	in VersionSpec version,
+	in IDLType type,
+	in AttributeMode mode,
+	in ExceptionDefSeq get_exceptions,
+	in ExceptionDefSeq set_exceptions
+      );
+  };
+
+  interface ExtInterfaceDef : InterfaceDef,
+			      InterfaceAttrExtension 
+  {
+  };
+
   interface AbstractInterfaceDef : InterfaceDef 
   {
   };
 
+  interface ExtAbstractInterfaceDef : AbstractInterfaceDef,
+				      InterfaceAttrExtension 
+  {
+  };
+
   interface LocalInterfaceDef : InterfaceDef 
   {
   };
-};
 
-#pragma prefix ""
+  interface ExtLocalInterfaceDef : LocalInterfaceDef,
+				   InterfaceAttrExtension 
+  {
+  };
+};
 
 #endif /* _IFR_BASIC_IDL_ */
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index cb2f465f522..78d5b96dbfa 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -20,7 +20,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:314
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
 #include "IFR_BasicC.h"
@@ -35,6 +35,7 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -44,7 +45,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_PrimitiveKind[] =
 {
@@ -59,100 +60,100 @@ static const CORBA::Long _oc_CORBA_PrimitiveKind[] =
   ACE_NTOHL (0x6976654b), 
   ACE_NTOHL (0x696e643a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PrimitiveKind:1.0
-14,
+  14,
   ACE_NTOHL (0x5072696d), 
   ACE_NTOHL (0x69746976), 
   ACE_NTOHL (0x654b696e), 
   ACE_NTOHL (0x64000000),  // name = PrimitiveKind
   22, // member count
-8,
+  8,
   ACE_NTOHL (0x706b5f6e), 
   ACE_NTOHL (0x756c6c00),  // name = pk_null
-8,
+  8,
   ACE_NTOHL (0x706b5f76), 
   ACE_NTOHL (0x6f696400),  // name = pk_void
-9,
+  9,
   ACE_NTOHL (0x706b5f73), 
   ACE_NTOHL (0x686f7274), 
   ACE_NTOHL (0x0),  // name = pk_short
-8,
+  8,
   ACE_NTOHL (0x706b5f6c), 
   ACE_NTOHL (0x6f6e6700),  // name = pk_long
-10,
+  10,
   ACE_NTOHL (0x706b5f75), 
   ACE_NTOHL (0x73686f72), 
   ACE_NTOHL (0x74000000),  // name = pk_ushort
-9,
+  9,
   ACE_NTOHL (0x706b5f75), 
   ACE_NTOHL (0x6c6f6e67), 
   ACE_NTOHL (0x0),  // name = pk_ulong
-9,
+  9,
   ACE_NTOHL (0x706b5f66), 
   ACE_NTOHL (0x6c6f6174), 
   ACE_NTOHL (0x0),  // name = pk_float
-10,
+  10,
   ACE_NTOHL (0x706b5f64), 
   ACE_NTOHL (0x6f75626c), 
   ACE_NTOHL (0x65000000),  // name = pk_double
-11,
+  11,
   ACE_NTOHL (0x706b5f62), 
   ACE_NTOHL (0x6f6f6c65), 
   ACE_NTOHL (0x616e0000),  // name = pk_boolean
-8,
+  8,
   ACE_NTOHL (0x706b5f63), 
   ACE_NTOHL (0x68617200),  // name = pk_char
-9,
+  9,
   ACE_NTOHL (0x706b5f6f), 
   ACE_NTOHL (0x63746574), 
   ACE_NTOHL (0x0),  // name = pk_octet
-7,
+  7,
   ACE_NTOHL (0x706b5f61), 
   ACE_NTOHL (0x6e790000),  // name = pk_any
-12,
+  12,
   ACE_NTOHL (0x706b5f54), 
   ACE_NTOHL (0x79706543), 
   ACE_NTOHL (0x6f646500),  // name = pk_TypeCode
-13,
+  13,
   ACE_NTOHL (0x706b5f50), 
   ACE_NTOHL (0x72696e63), 
   ACE_NTOHL (0x6970616c), 
   ACE_NTOHL (0x0),  // name = pk_Principal
-10,
+  10,
   ACE_NTOHL (0x706b5f73), 
   ACE_NTOHL (0x7472696e), 
   ACE_NTOHL (0x67000000),  // name = pk_string
-10,
+  10,
   ACE_NTOHL (0x706b5f6f), 
   ACE_NTOHL (0x626a7265), 
   ACE_NTOHL (0x66000000),  // name = pk_objref
-12,
+  12,
   ACE_NTOHL (0x706b5f6c), 
   ACE_NTOHL (0x6f6e676c), 
   ACE_NTOHL (0x6f6e6700),  // name = pk_longlong
-13,
+  13,
   ACE_NTOHL (0x706b5f75), 
   ACE_NTOHL (0x6c6f6e67), 
   ACE_NTOHL (0x6c6f6e67), 
   ACE_NTOHL (0x0),  // name = pk_ulonglong
-14,
+  14,
   ACE_NTOHL (0x706b5f6c), 
   ACE_NTOHL (0x6f6e6764), 
   ACE_NTOHL (0x6f75626c), 
   ACE_NTOHL (0x65000000),  // name = pk_longdouble
-9,
+  9,
   ACE_NTOHL (0x706b5f77), 
   ACE_NTOHL (0x63686172), 
   ACE_NTOHL (0x0),  // name = pk_wchar
-11,
+  11,
   ACE_NTOHL (0x706b5f77), 
   ACE_NTOHL (0x73747269), 
   ACE_NTOHL (0x6e670000),  // name = pk_wstring
-14,
+  14,
   ACE_NTOHL (0x706b5f76), 
   ACE_NTOHL (0x616c7565), 
   ACE_NTOHL (0x5f626173), 
   ACE_NTOHL (0x65000000),  // name = pk_value_base
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_PrimitiveKind (
     CORBA::tk_enum,
@@ -172,7 +173,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::Repository::_tao_class_id = 0;
 
@@ -219,8 +220,17 @@ tao_CORBA_Repository_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_Repository_marshal (
+    CORBA::Repository_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::Repository_var
@@ -346,7 +356,7 @@ CORBA::Repository_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::Repository_out
@@ -408,12 +418,12 @@ CORBA::Repository_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Repository_lookup_id : public TAO_ClientRequestInfo_i
 {
@@ -444,7 +454,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Repository_lookup_id::TAO_ClientRequestInfo_CORBA_Repository_lookup_id (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -512,7 +522,7 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (::CORBA::Contained_ptr
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode : public TAO_ClientRequestInfo_i
 {
@@ -543,7 +553,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Repository_get_canonical_typecode::TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -611,7 +621,7 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::Ty
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Repository_get_primitive : public TAO_ClientRequestInfo_i
 {
@@ -642,7 +652,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Repository_get_primitive::TAO_ClientRequestInfo_CORBA_Repository_get_primitive (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -710,7 +720,7 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (::CORBA::Primitive
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Repository_create_string : public TAO_ClientRequestInfo_i
 {
@@ -741,7 +751,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Repository_create_string::TAO_ClientRequestInfo_CORBA_Repository_create_string (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -809,7 +819,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::result (::CORBA::StringDef
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Repository_create_wstring : public TAO_ClientRequestInfo_i
 {
@@ -840,7 +850,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Repository_create_wstring::TAO_ClientRequestInfo_CORBA_Repository_create_wstring (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -908,7 +918,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (::CORBA::WstringD
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Repository_create_sequence : public TAO_ClientRequestInfo_i
 {
@@ -941,7 +951,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Repository_create_sequence::TAO_ClientRequestInfo_CORBA_Repository_create_sequence (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -1015,7 +1025,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (::CORBA::Sequenc
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Repository_create_array : public TAO_ClientRequestInfo_i
 {
@@ -1048,7 +1058,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Repository_create_array::TAO_ClientRequestInfo_CORBA_Repository_create_array (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -1122,7 +1132,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::result (::CORBA::ArrayDef_p
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_Repository_create_fixed : public TAO_ClientRequestInfo_i
 {
@@ -1155,7 +1165,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_Repository_create_fixed::TAO_ClientRequestInfo_CORBA_Repository_create_fixed (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -1231,7 +1241,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (::CORBA::FixedDef_p
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -1246,7 +1256,7 @@ CORBA::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (voi
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::Contained_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::lookup_id (
     CORBA::Object *_collocated_tao_target_,
@@ -1315,95 +1325,87 @@ CORBA::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (voi
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << search_id)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << search_id)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::Contained_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::Contained_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
         {
@@ -1414,7 +1416,7 @@ CORBA::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (voi
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -1438,7 +1440,7 @@ CORBA::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (voi
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -1450,24 +1452,26 @@ CORBA::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (voi
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_typecode (
     CORBA::Object *_collocated_tao_target_,
@@ -1536,95 +1540,87 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << tc)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << tc)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::TypeCode_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::TypeCode_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
         {
@@ -1635,7 +1631,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -1659,7 +1655,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -1671,24 +1667,26 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::PrimitiveDef_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_primitive (
     CORBA::Object *_collocated_tao_target_,
@@ -1757,95 +1755,87 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << kind)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << kind)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::PrimitiveDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::PrimitiveDef_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
         {
@@ -1856,7 +1846,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -1880,7 +1870,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -1892,24 +1882,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::StringDef_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::create_string (
     CORBA::Object *_collocated_tao_target_,
@@ -1978,95 +1970,87 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << bound)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << bound)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::StringDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::StringDef_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
         {
@@ -2077,7 +2061,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -2101,7 +2085,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -2113,24 +2097,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::WstringDef_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::create_wstring (
     CORBA::Object *_collocated_tao_target_,
@@ -2199,95 +2185,87 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << bound)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << bound)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::WstringDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::WstringDef_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
         {
@@ -2298,7 +2276,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -2322,7 +2300,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -2334,24 +2312,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::SequenceDef_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::create_sequence (
     CORBA::Object *_collocated_tao_target_,
@@ -2422,96 +2402,88 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << bound) &&
+              (_tao_out << element_type)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << bound) &&
-                  (_tao_out << element_type)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::SequenceDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::SequenceDef_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
         {
@@ -2522,7 +2494,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -2546,7 +2518,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -2558,24 +2530,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ArrayDef_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::create_array (
     CORBA::Object *_collocated_tao_target_,
@@ -2646,96 +2620,88 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << length) &&
+              (_tao_out << element_type)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << length) &&
-                  (_tao_out << element_type)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ArrayDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ArrayDef_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
         {
@@ -2746,7 +2712,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -2770,7 +2736,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -2782,24 +2748,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::FixedDef_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::create_fixed (
     CORBA::Object *_collocated_tao_target_,
@@ -2870,96 +2838,88 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << digits) &&
+              (_tao_out << scale)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << digits) &&
-                  (_tao_out << scale)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::FixedDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::FixedDef_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
         {
@@ -2970,7 +2930,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -2994,7 +2954,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3006,20 +2966,22 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 //
@@ -3027,7 +2989,7 @@ return _tao_retval._retn ();
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -3075,7 +3037,7 @@ CORBA::_TAO_Repository_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::Repository::Repository (int collocated)
 {
@@ -3314,7 +3276,7 @@ const char* CORBA::Repository::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::Contained_ptr CORBA::Repository::lookup_id (
     const char * search_id
@@ -3336,7 +3298,7 @@ const char* CORBA::Repository::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     CORBA::TypeCode_ptr tc
@@ -3358,7 +3320,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::PrimitiveDef_ptr CORBA::Repository::get_primitive (
     CORBA::PrimitiveKind kind
@@ -3380,7 +3342,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::StringDef_ptr CORBA::Repository::create_string (
     CORBA::ULong bound
@@ -3402,7 +3364,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::WstringDef_ptr CORBA::Repository::create_wstring (
     CORBA::ULong bound
@@ -3424,7 +3386,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::SequenceDef_ptr CORBA::Repository::create_sequence (
     CORBA::ULong bound,
@@ -3448,7 +3410,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ArrayDef_ptr CORBA::Repository::create_array (
     CORBA::ULong length,
@@ -3472,7 +3434,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::FixedDef_ptr CORBA::Repository::create_fixed (
     CORBA::UShort digits,
@@ -3496,7 +3458,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_Repository[] =
 {
@@ -3511,11 +3473,11 @@ static const CORBA::Long _oc_CORBA_Repository[] =
   ACE_NTOHL (0x746f7279), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Repository:1.0
-  11,
+    11,
   ACE_NTOHL (0x5265706f), 
   ACE_NTOHL (0x7369746f), 
   ACE_NTOHL (0x72790000),  // name = Repository
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_Repository (
     CORBA::tk_objref,
@@ -3535,7 +3497,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ModuleDef::_tao_class_id = 0;
 
@@ -3582,8 +3544,17 @@ tao_CORBA_ModuleDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ModuleDef_marshal (
+    CORBA::ModuleDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::ModuleDef_var
@@ -3709,7 +3680,7 @@ CORBA::ModuleDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::ModuleDef_out
@@ -3771,14 +3742,14 @@ CORBA::ModuleDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -3797,7 +3768,7 @@ CORBA::_TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Proxy_Impl (void)
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -3845,7 +3816,7 @@ CORBA::_TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::ModuleDef::ModuleDef (int collocated)
 {
@@ -4103,7 +4074,7 @@ const char* CORBA::ModuleDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ModuleDef[] =
 {
@@ -4117,11 +4088,11 @@ static const CORBA::Long _oc_CORBA_ModuleDef[] =
   ACE_NTOHL (0x64756c65), 
   ACE_NTOHL (0x4465663a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ModuleDef:1.0
-  10,
+    10,
   ACE_NTOHL (0x4d6f6475), 
   ACE_NTOHL (0x6c654465), 
   ACE_NTOHL (0x66000000),  // name = ModuleDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ModuleDef (
     CORBA::tk_objref,
@@ -4141,7 +4112,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ModuleDescription[] =
 {
@@ -4157,17 +4128,17 @@ static const CORBA::Long _oc_CORBA_ModuleDescription[] =
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ModuleDescription:1.0
-  18,
+    18,
   ACE_NTOHL (0x4d6f6475), 
   ACE_NTOHL (0x6c654465), 
   ACE_NTOHL (0x73637269), 
   ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e000000),  // name = ModuleDescription
   4, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -4180,16 +4151,16 @@ static const CORBA::Long _oc_CORBA_ModuleDescription[] =
     ACE_NTOHL (0x66696572), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
@@ -4202,24 +4173,24 @@ static const CORBA::Long _oc_CORBA_ModuleDescription[] =
     ACE_NTOHL (0x746f7279), 
     ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
+        13,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x64656669), 
   ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
   ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
@@ -4232,11 +4203,11 @@ static const CORBA::Long _oc_CORBA_ModuleDescription[] =
     ACE_NTOHL (0x6e537065), 
     ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
+        12,
     ACE_NTOHL (0x56657273), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -4259,7 +4230,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ModuleDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -4268,7 +4239,7 @@ void CORBA::ModuleDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ConstantDef::_tao_class_id = 0;
 
@@ -4315,8 +4286,17 @@ tao_CORBA_ConstantDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ConstantDef_marshal (
+    CORBA::ConstantDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::ConstantDef_var
@@ -4442,7 +4422,7 @@ CORBA::ConstantDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::ConstantDef_out
@@ -4504,12 +4484,12 @@ CORBA::ConstantDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ConstantDef_type_get : public TAO_ClientRequestInfo_i
 {
@@ -4538,7 +4518,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ConstantDef_type_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -4596,7 +4576,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::TypeCode_ptr re
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get : public TAO_ClientRequestInfo_i
 {
@@ -4625,7 +4605,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ConstantDef_type_def_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -4683,7 +4663,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (::CORBA::IDLType_p
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set : public TAO_ClientRequestInfo_i
 {
@@ -4710,7 +4690,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ConstantDef_type_def_set::TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -4770,7 +4750,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::result (ACE_ENV_SINGLE_ARG
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ConstantDef_value_get : public TAO_ClientRequestInfo_i
 {
@@ -4799,7 +4779,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ConstantDef_value_get::TAO_ClientRequestInfo_CORBA_ConstantDef_value_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -4857,7 +4837,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Any * result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ConstantDef_value_set : public TAO_ClientRequestInfo_i
 {
@@ -4884,7 +4864,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ConstantDef_value_set::TAO_ClientRequestInfo_CORBA_ConstantDef_value_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -4946,7 +4926,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::result (ACE_ENV_SINGLE_ARG_DE
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -4961,7 +4941,7 @@ CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::_TAO_ConstantDef_Remote_Proxy_Impl (v
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
     CORBA::Object *_collocated_tao_target_
@@ -5028,82 +5008,74 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::TypeCode_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::TypeCode_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
         {
@@ -5114,7 +5086,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5138,7 +5110,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5150,24 +5122,26 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::IDLType_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
     CORBA::Object *_collocated_tao_target_
@@ -5234,82 +5208,74 @@ return _tao_retval._retn ();
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::IDLType_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::IDLType_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
         {
@@ -5320,7 +5286,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5344,7 +5310,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5356,24 +5322,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
     CORBA::Object *_collocated_tao_target_,
@@ -5441,74 +5409,66 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << type_def)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << type_def)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -5519,7 +5479,7 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5543,7 +5503,7 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5555,22 +5515,24 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::Any * CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
     CORBA::Object *_collocated_tao_target_
@@ -5643,82 +5605,74 @@ CORBA::Any * CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Any * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::Any * _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
         {
@@ -5729,7 +5683,7 @@ CORBA::Any * CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5753,7 +5707,7 @@ CORBA::Any * CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5765,24 +5719,26 @@ CORBA::Any * CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
     CORBA::Object *_collocated_tao_target_,
@@ -5850,74 +5806,66 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << value)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << value)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -5928,7 +5876,7 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5952,7 +5900,7 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5964,17 +5912,19 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -5983,7 +5933,7 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -6031,7 +5981,7 @@ CORBA::_TAO_ConstantDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::ConstantDef::ConstantDef (int collocated)
 {
@@ -6270,7 +6220,7 @@ const char* CORBA::ConstantDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::TypeCode_ptr CORBA::ConstantDef::type (
     ACE_ENV_SINGLE_ARG_DECL
@@ -6290,7 +6240,7 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::IDLType_ptr CORBA::ConstantDef::type_def (
     ACE_ENV_SINGLE_ARG_DECL
@@ -6310,7 +6260,7 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ConstantDef::type_def (
     CORBA::IDLType_ptr type_def
@@ -6332,7 +6282,7 @@ void CORBA::ConstantDef::type_def (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::Any * CORBA::ConstantDef::value (
     ACE_ENV_SINGLE_ARG_DECL
@@ -6352,7 +6302,7 @@ CORBA::Any * CORBA::ConstantDef::value (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ConstantDef::value (
     const CORBA::Any & value
@@ -6374,7 +6324,7 @@ void CORBA::ConstantDef::value (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ConstantDef[] =
 {
@@ -6389,11 +6339,11 @@ static const CORBA::Long _oc_CORBA_ConstantDef[] =
   ACE_NTOHL (0x6e744465), 
   ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ConstantDef:1.0
-  12,
+    12,
   ACE_NTOHL (0x436f6e73), 
   ACE_NTOHL (0x74616e74), 
   ACE_NTOHL (0x44656600),  // name = ConstantDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstantDef (
     CORBA::tk_objref,
@@ -6413,7 +6363,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ConstantDescription[] =
 {
@@ -6430,17 +6380,17 @@ static const CORBA::Long _oc_CORBA_ConstantDescription[] =
   ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ConstantDescription:1.0
-  20,
+    20,
   ACE_NTOHL (0x436f6e73), 
   ACE_NTOHL (0x74616e74), 
   ACE_NTOHL (0x44657363), 
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = ConstantDescription
   6, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -6453,16 +6403,16 @@ static const CORBA::Long _oc_CORBA_ConstantDescription[] =
     ACE_NTOHL (0x66696572), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
@@ -6475,24 +6425,24 @@ static const CORBA::Long _oc_CORBA_ConstantDescription[] =
     ACE_NTOHL (0x746f7279), 
     ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
+        13,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x64656669), 
   ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
   ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
@@ -6505,22 +6455,22 @@ static const CORBA::Long _oc_CORBA_ConstantDescription[] =
     ACE_NTOHL (0x6e537065), 
     ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
+        12,
     ACE_NTOHL (0x56657273), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   5,
   ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
+    CORBA::tk_TypeCode,
 
   6,
   ACE_NTOHL (0x76616c75), 
   ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_any,
+    CORBA::tk_any,
 
 };
 
@@ -6542,7 +6492,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ConstantDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -6551,7 +6501,7 @@ void CORBA::ConstantDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::StructDef::_tao_class_id = 0;
 
@@ -6598,8 +6548,17 @@ tao_CORBA_StructDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_StructDef_marshal (
+    CORBA::StructDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::StructDef_var
@@ -6725,7 +6684,7 @@ CORBA::StructDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::StructDef_out
@@ -6787,12 +6746,12 @@ CORBA::StructDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_StructDef_members_get : public TAO_ClientRequestInfo_i
 {
@@ -6821,7 +6780,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_StructDef_members_get::TAO_ClientRequestInfo_CORBA_StructDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -6879,7 +6838,7 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (::CORBA::StructMember
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_StructDef_members_set : public TAO_ClientRequestInfo_i
 {
@@ -6906,7 +6865,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_StructDef_members_set::TAO_ClientRequestInfo_CORBA_StructDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -6968,7 +6927,7 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::result (ACE_ENV_SINGLE_ARG_DE
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -6983,7 +6942,7 @@ CORBA::_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::StructMemberSeq * CORBA::_TAO_StructDef_Remote_Proxy_Impl::members (
     CORBA::Object *_collocated_tao_target_
@@ -7056,82 +7015,74 @@ CORBA::_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::StructMemberSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::StructMemberSeq * _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
         {
@@ -7142,7 +7093,7 @@ CORBA::_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -7166,7 +7117,7 @@ CORBA::_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -7178,24 +7129,26 @@ CORBA::_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_StructDef_Remote_Proxy_Impl::members (
     CORBA::Object *_collocated_tao_target_,
@@ -7263,74 +7216,66 @@ void CORBA::_TAO_StructDef_Remote_Proxy_Impl::members (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << members)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << members)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -7341,7 +7286,7 @@ void CORBA::_TAO_StructDef_Remote_Proxy_Impl::members (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -7365,7 +7310,7 @@ void CORBA::_TAO_StructDef_Remote_Proxy_Impl::members (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -7377,17 +7322,19 @@ void CORBA::_TAO_StructDef_Remote_Proxy_Impl::members (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -7396,7 +7343,7 @@ void CORBA::_TAO_StructDef_Remote_Proxy_Impl::members (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -7444,7 +7391,7 @@ CORBA::_TAO_StructDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::StructDef::StructDef (int collocated)
 {
@@ -7738,7 +7685,7 @@ const char* CORBA::StructDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::StructMemberSeq * CORBA::StructDef::members (
     ACE_ENV_SINGLE_ARG_DECL
@@ -7758,7 +7705,7 @@ const char* CORBA::StructDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::StructDef::members (
     const CORBA::StructMemberSeq & members
@@ -7780,7 +7727,7 @@ void CORBA::StructDef::members (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_StructDef[] =
 {
@@ -7794,11 +7741,11 @@ static const CORBA::Long _oc_CORBA_StructDef[] =
   ACE_NTOHL (0x72756374), 
   ACE_NTOHL (0x4465663a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StructDef:1.0
-  10,
+    10,
   ACE_NTOHL (0x53747275), 
   ACE_NTOHL (0x63744465), 
   ACE_NTOHL (0x66000000),  // name = StructDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_StructDef (
     CORBA::tk_objref,
@@ -7818,7 +7765,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::UnionDef::_tao_class_id = 0;
 
@@ -7865,8 +7812,17 @@ tao_CORBA_UnionDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_UnionDef_marshal (
+    CORBA::UnionDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::UnionDef_var
@@ -7992,7 +7948,7 @@ CORBA::UnionDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::UnionDef_out
@@ -8054,12 +8010,12 @@ CORBA::UnionDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get : public TAO_ClientRequestInfo_i
 {
@@ -8088,7 +8044,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_UnionDef_discriminator_type_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -8146,7 +8102,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::Type
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get : public TAO_ClientRequestInfo_i
 {
@@ -8175,7 +8131,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_UnionDef_discriminator_type_def_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -8233,7 +8189,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (::CORBA
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set : public TAO_ClientRequestInfo_i
 {
@@ -8260,7 +8216,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_UnionDef_discriminator_type_def_set::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -8320,7 +8276,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (ACE_ENV
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_UnionDef_members_get : public TAO_ClientRequestInfo_i
 {
@@ -8349,7 +8305,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_UnionDef_members_get::TAO_ClientRequestInfo_CORBA_UnionDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -8407,7 +8363,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (::CORBA::UnionMemberSe
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_UnionDef_members_set : public TAO_ClientRequestInfo_i
 {
@@ -8434,7 +8390,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_UnionDef_members_set::TAO_ClientRequestInfo_CORBA_UnionDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -8496,7 +8452,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::result (ACE_ENV_SINGLE_ARG_DEC
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -8511,7 +8467,7 @@ CORBA::_TAO_UnionDef_Remote_Proxy_Impl::_TAO_UnionDef_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
     CORBA::Object *_collocated_tao_target_
@@ -8578,82 +8534,74 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::TypeCode_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::TypeCode_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
         {
@@ -8664,7 +8612,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -8688,7 +8636,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -8700,24 +8648,26 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::IDLType_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
     CORBA::Object *_collocated_tao_target_
@@ -8784,82 +8734,74 @@ return _tao_retval._retn ();
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::IDLType_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::IDLType_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
         {
@@ -8870,7 +8812,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -8894,7 +8836,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -8906,24 +8848,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
     CORBA::Object *_collocated_tao_target_,
@@ -8991,74 +8935,66 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << discriminator_type_def)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << discriminator_type_def)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -9069,7 +9005,7 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -9093,7 +9029,7 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -9105,22 +9041,24 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::UnionMemberSeq * CORBA::_TAO_UnionDef_Remote_Proxy_Impl::members (
     CORBA::Object *_collocated_tao_target_
@@ -9193,82 +9131,74 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::UnionMemberSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::UnionMemberSeq * _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
         {
@@ -9279,7 +9209,7 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -9303,7 +9233,7 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -9315,24 +9245,26 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::members (
     CORBA::Object *_collocated_tao_target_,
@@ -9400,74 +9332,66 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::members (
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << members)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << members)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -9478,7 +9402,7 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::members (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -9502,7 +9426,7 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::members (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -9514,17 +9438,19 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::members (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -9533,7 +9459,7 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::members (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -9581,7 +9507,7 @@ CORBA::_TAO_UnionDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::UnionDef::UnionDef (int collocated)
 {
@@ -9875,7 +9801,7 @@ const char* CORBA::UnionDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
     ACE_ENV_SINGLE_ARG_DECL
@@ -9895,7 +9821,7 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::IDLType_ptr CORBA::UnionDef::discriminator_type_def (
     ACE_ENV_SINGLE_ARG_DECL
@@ -9915,7 +9841,7 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::UnionDef::discriminator_type_def (
     CORBA::IDLType_ptr discriminator_type_def
@@ -9937,7 +9863,7 @@ void CORBA::UnionDef::discriminator_type_def (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::UnionMemberSeq * CORBA::UnionDef::members (
     ACE_ENV_SINGLE_ARG_DECL
@@ -9957,7 +9883,7 @@ void CORBA::UnionDef::discriminator_type_def (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::UnionDef::members (
     const CORBA::UnionMemberSeq & members
@@ -9979,7 +9905,7 @@ void CORBA::UnionDef::members (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_UnionDef[] =
 {
@@ -9993,11 +9919,11 @@ static const CORBA::Long _oc_CORBA_UnionDef[] =
   ACE_NTOHL (0x696f6e44), 
   ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/UnionDef:1.0
-  9,
+    9,
   ACE_NTOHL (0x556e696f), 
   ACE_NTOHL (0x6e446566), 
   ACE_NTOHL (0x0),  // name = UnionDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionDef (
     CORBA::tk_objref,
@@ -10017,7 +9943,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::EnumDef::_tao_class_id = 0;
 
@@ -10064,8 +9990,17 @@ tao_CORBA_EnumDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_EnumDef_marshal (
+    CORBA::EnumDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::EnumDef_var
@@ -10191,7 +10126,7 @@ CORBA::EnumDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::EnumDef_out
@@ -10253,12 +10188,12 @@ CORBA::EnumDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_EnumDef_members_get : public TAO_ClientRequestInfo_i
 {
@@ -10287,7 +10222,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_EnumDef_members_get::TAO_ClientRequestInfo_CORBA_EnumDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -10345,7 +10280,7 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (::CORBA::EnumMemberSeq
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_EnumDef_members_set : public TAO_ClientRequestInfo_i
 {
@@ -10372,7 +10307,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_EnumDef_members_set::TAO_ClientRequestInfo_CORBA_EnumDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -10434,7 +10369,7 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -10449,7 +10384,7 @@ CORBA::_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::EnumMemberSeq * CORBA::_TAO_EnumDef_Remote_Proxy_Impl::members (
     CORBA::Object *_collocated_tao_target_
@@ -10522,82 +10457,74 @@ CORBA::_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::EnumMemberSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::EnumMemberSeq * _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
         {
@@ -10608,7 +10535,7 @@ CORBA::_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -10632,7 +10559,7 @@ CORBA::_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -10644,24 +10571,26 @@ CORBA::_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_EnumDef_Remote_Proxy_Impl::members (
     CORBA::Object *_collocated_tao_target_,
@@ -10729,74 +10658,66 @@ void CORBA::_TAO_EnumDef_Remote_Proxy_Impl::members (
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << members)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << members)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -10807,7 +10728,7 @@ void CORBA::_TAO_EnumDef_Remote_Proxy_Impl::members (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -10831,7 +10752,7 @@ void CORBA::_TAO_EnumDef_Remote_Proxy_Impl::members (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -10843,17 +10764,19 @@ void CORBA::_TAO_EnumDef_Remote_Proxy_Impl::members (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -10862,7 +10785,7 @@ void CORBA::_TAO_EnumDef_Remote_Proxy_Impl::members (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -10910,7 +10833,7 @@ CORBA::_TAO_EnumDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::EnumDef::EnumDef (int collocated)
 {
@@ -11185,7 +11108,7 @@ const char* CORBA::EnumDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::EnumMemberSeq * CORBA::EnumDef::members (
     ACE_ENV_SINGLE_ARG_DECL
@@ -11205,7 +11128,7 @@ const char* CORBA::EnumDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::EnumDef::members (
     const CORBA::EnumMemberSeq & members
@@ -11227,7 +11150,7 @@ void CORBA::EnumDef::members (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_EnumDef[] =
 {
@@ -11241,10 +11164,10 @@ static const CORBA::Long _oc_CORBA_EnumDef[] =
   ACE_NTOHL (0x756d4465), 
   ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/EnumDef:1.0
-  8,
+    8,
   ACE_NTOHL (0x456e756d), 
   ACE_NTOHL (0x44656600),  // name = EnumDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_EnumDef (
     CORBA::tk_objref,
@@ -11264,7 +11187,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::AliasDef::_tao_class_id = 0;
 
@@ -11311,8 +11234,17 @@ tao_CORBA_AliasDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_AliasDef_marshal (
+    CORBA::AliasDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::AliasDef_var
@@ -11438,7 +11370,7 @@ CORBA::AliasDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::AliasDef_out
@@ -11500,12 +11432,12 @@ CORBA::AliasDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get : public TAO_ClientRequestInfo_i
 {
@@ -11534,7 +11466,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_AliasDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -11592,7 +11524,7 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (::CORBA::IDL
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set : public TAO_ClientRequestInfo_i
 {
@@ -11619,7 +11551,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_AliasDef_original_type_def_set::TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -11681,7 +11613,7 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::result (ACE_ENV_SING
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -11696,7 +11628,7 @@ CORBA::_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::IDLType_ptr CORBA::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
     CORBA::Object *_collocated_tao_target_
@@ -11763,82 +11695,74 @@ CORBA::_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::IDLType_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::IDLType_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
         {
@@ -11849,7 +11773,7 @@ CORBA::_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -11873,7 +11797,7 @@ CORBA::_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -11885,24 +11809,26 @@ CORBA::_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
     CORBA::Object *_collocated_tao_target_,
@@ -11970,74 +11896,66 @@ void CORBA::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << original_type_def)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << original_type_def)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -12048,7 +11966,7 @@ void CORBA::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12072,7 +11990,7 @@ void CORBA::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12084,17 +12002,19 @@ void CORBA::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -12103,7 +12023,7 @@ void CORBA::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -12151,7 +12071,7 @@ CORBA::_TAO_AliasDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::AliasDef::AliasDef (int collocated)
 {
@@ -12426,7 +12346,7 @@ const char* CORBA::AliasDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::IDLType_ptr CORBA::AliasDef::original_type_def (
     ACE_ENV_SINGLE_ARG_DECL
@@ -12446,7 +12366,7 @@ const char* CORBA::AliasDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::AliasDef::original_type_def (
     CORBA::IDLType_ptr original_type_def
@@ -12468,7 +12388,7 @@ void CORBA::AliasDef::original_type_def (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_AliasDef[] =
 {
@@ -12482,11 +12402,11 @@ static const CORBA::Long _oc_CORBA_AliasDef[] =
   ACE_NTOHL (0x69617344), 
   ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AliasDef:1.0
-  9,
+    9,
   ACE_NTOHL (0x416c6961), 
   ACE_NTOHL (0x73446566), 
   ACE_NTOHL (0x0),  // name = AliasDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_AliasDef (
     CORBA::tk_objref,
@@ -12506,7 +12426,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::NativeDef::_tao_class_id = 0;
 
@@ -12553,8 +12473,17 @@ tao_CORBA_NativeDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_NativeDef_marshal (
+    CORBA::NativeDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::NativeDef_var
@@ -12680,7 +12609,7 @@ CORBA::NativeDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::NativeDef_out
@@ -12742,14 +12671,14 @@ CORBA::NativeDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -12768,7 +12697,7 @@ CORBA::_TAO_NativeDef_Remote_Proxy_Impl::_TAO_NativeDef_Remote_Proxy_Impl (void)
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -12816,7 +12745,7 @@ CORBA::_TAO_NativeDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::NativeDef::NativeDef (int collocated)
 {
@@ -13091,7 +13020,7 @@ const char* CORBA::NativeDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_NativeDef[] =
 {
@@ -13105,11 +13034,11 @@ static const CORBA::Long _oc_CORBA_NativeDef[] =
   ACE_NTOHL (0x74697665), 
   ACE_NTOHL (0x4465663a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/NativeDef:1.0
-  10,
+    10,
   ACE_NTOHL (0x4e617469), 
   ACE_NTOHL (0x76654465), 
   ACE_NTOHL (0x66000000),  // name = NativeDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_NativeDef (
     CORBA::tk_objref,
@@ -13129,7 +13058,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::PrimitiveDef::_tao_class_id = 0;
 
@@ -13176,8 +13105,17 @@ tao_CORBA_PrimitiveDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_PrimitiveDef_marshal (
+    CORBA::PrimitiveDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::PrimitiveDef_var
@@ -13303,7 +13241,7 @@ CORBA::PrimitiveDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::PrimitiveDef_out
@@ -13365,12 +13303,12 @@ CORBA::PrimitiveDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get : public TAO_ClientRequestInfo_i
 {
@@ -13399,7 +13337,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_PrimitiveDef_kind_get::TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -13459,7 +13397,7 @@ TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (::CORBA::PrimitiveKin
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -13474,7 +13412,7 @@ CORBA::_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::PrimitiveKind CORBA::_TAO_PrimitiveDef_Remote_Proxy_Impl::kind (
     CORBA::Object *_collocated_tao_target_
@@ -13541,81 +13479,73 @@ CORBA::_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl
           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);
+          
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::PrimitiveKind _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> _tao_retval)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::PrimitiveKind _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -13626,7 +13556,7 @@ CORBA::_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13650,7 +13580,7 @@ CORBA::_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13662,20 +13592,22 @@ CORBA::_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
       
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 //
@@ -13683,7 +13615,7 @@ return _tao_retval;
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -13731,7 +13663,7 @@ CORBA::_TAO_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::PrimitiveDef::PrimitiveDef (int collocated)
 {
@@ -13970,7 +13902,7 @@ const char* CORBA::PrimitiveDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::PrimitiveKind CORBA::PrimitiveDef::kind (
     ACE_ENV_SINGLE_ARG_DECL
@@ -13990,7 +13922,7 @@ const char* CORBA::PrimitiveDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_PrimitiveDef[] =
 {
@@ -14005,12 +13937,12 @@ static const CORBA::Long _oc_CORBA_PrimitiveDef[] =
   ACE_NTOHL (0x69766544), 
   ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/PrimitiveDef:1.0
-  13,
+    13,
   ACE_NTOHL (0x5072696d), 
   ACE_NTOHL (0x69746976), 
   ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x0),  // name = PrimitiveDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_PrimitiveDef (
     CORBA::tk_objref,
@@ -14030,7 +13962,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::StringDef::_tao_class_id = 0;
 
@@ -14077,8 +14009,17 @@ tao_CORBA_StringDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_StringDef_marshal (
+    CORBA::StringDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::StringDef_var
@@ -14204,7 +14145,7 @@ CORBA::StringDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::StringDef_out
@@ -14266,12 +14207,12 @@ CORBA::StringDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_StringDef_bound_get : public TAO_ClientRequestInfo_i
 {
@@ -14300,7 +14241,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_StringDef_bound_get::TAO_ClientRequestInfo_CORBA_StringDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -14358,7 +14299,7 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_get::result (CORBA::ULong result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_StringDef_bound_set : public TAO_ClientRequestInfo_i
 {
@@ -14385,7 +14326,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_StringDef_bound_set::TAO_ClientRequestInfo_CORBA_StringDef_bound_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -14447,7 +14388,7 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -14462,7 +14403,7 @@ CORBA::_TAO_StringDef_Remote_Proxy_Impl::_TAO_StringDef_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::ULong CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
     CORBA::Object *_collocated_tao_target_
@@ -14529,81 +14470,73 @@ CORBA::ULong CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
           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);
+          
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::ULong _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> _tao_retval)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::ULong _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -14614,7 +14547,7 @@ CORBA::ULong CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14638,7 +14571,7 @@ CORBA::ULong CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14650,24 +14583,26 @@ CORBA::ULong CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
       
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
     CORBA::Object *_collocated_tao_target_,
@@ -14735,74 +14670,66 @@ void CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << bound)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << bound)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -14813,7 +14740,7 @@ void CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14837,7 +14764,7 @@ void CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14849,17 +14776,19 @@ void CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -14868,7 +14797,7 @@ void CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -14916,7 +14845,7 @@ CORBA::_TAO_StringDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::StringDef::StringDef (int collocated)
 {
@@ -15155,7 +15084,7 @@ const char* CORBA::StringDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::ULong CORBA::StringDef::bound (
     ACE_ENV_SINGLE_ARG_DECL
@@ -15175,7 +15104,7 @@ CORBA::ULong CORBA::StringDef::bound (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::StringDef::bound (
     CORBA::ULong bound
@@ -15197,7 +15126,7 @@ void CORBA::StringDef::bound (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_StringDef[] =
 {
@@ -15211,11 +15140,11 @@ static const CORBA::Long _oc_CORBA_StringDef[] =
   ACE_NTOHL (0x72696e67), 
   ACE_NTOHL (0x4465663a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringDef:1.0
-  10,
+    10,
   ACE_NTOHL (0x53747269), 
   ACE_NTOHL (0x6e674465), 
   ACE_NTOHL (0x66000000),  // name = StringDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_StringDef (
     CORBA::tk_objref,
@@ -15235,7 +15164,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::WstringDef::_tao_class_id = 0;
 
@@ -15282,8 +15211,17 @@ tao_CORBA_WstringDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_WstringDef_marshal (
+    CORBA::WstringDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::WstringDef_var
@@ -15409,7 +15347,7 @@ CORBA::WstringDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::WstringDef_out
@@ -15471,12 +15409,12 @@ CORBA::WstringDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_WstringDef_bound_get : public TAO_ClientRequestInfo_i
 {
@@ -15505,7 +15443,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_WstringDef_bound_get::TAO_ClientRequestInfo_CORBA_WstringDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -15563,7 +15501,7 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::ULong result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_WstringDef_bound_set : public TAO_ClientRequestInfo_i
 {
@@ -15590,7 +15528,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_WstringDef_bound_set::TAO_ClientRequestInfo_CORBA_WstringDef_bound_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -15652,7 +15590,7 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DEC
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -15667,7 +15605,7 @@ CORBA::_TAO_WstringDef_Remote_Proxy_Impl::_TAO_WstringDef_Remote_Proxy_Impl (voi
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::ULong CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
     CORBA::Object *_collocated_tao_target_
@@ -15734,81 +15672,73 @@ CORBA::ULong CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
           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);
+          
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::ULong _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> _tao_retval)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::ULong _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -15819,7 +15749,7 @@ CORBA::ULong CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -15843,7 +15773,7 @@ CORBA::ULong CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -15855,24 +15785,26 @@ CORBA::ULong CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
       
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
     CORBA::Object *_collocated_tao_target_,
@@ -15940,74 +15872,66 @@ void CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << bound)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << bound)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -16018,7 +15942,7 @@ void CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -16042,7 +15966,7 @@ void CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -16054,17 +15978,19 @@ void CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -16073,7 +15999,7 @@ void CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -16121,7 +16047,7 @@ CORBA::_TAO_WstringDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::WstringDef::WstringDef (int collocated)
 {
@@ -16360,7 +16286,7 @@ const char* CORBA::WstringDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::ULong CORBA::WstringDef::bound (
     ACE_ENV_SINGLE_ARG_DECL
@@ -16380,7 +16306,7 @@ CORBA::ULong CORBA::WstringDef::bound (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::WstringDef::bound (
     CORBA::ULong bound
@@ -16402,7 +16328,7 @@ void CORBA::WstringDef::bound (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_WstringDef[] =
 {
@@ -16417,11 +16343,11 @@ static const CORBA::Long _oc_CORBA_WstringDef[] =
   ACE_NTOHL (0x67446566), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WstringDef:1.0
-  11,
+    11,
   ACE_NTOHL (0x57737472), 
   ACE_NTOHL (0x696e6744), 
   ACE_NTOHL (0x65660000),  // name = WstringDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_WstringDef (
     CORBA::tk_objref,
@@ -16441,7 +16367,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::SequenceDef::_tao_class_id = 0;
 
@@ -16488,8 +16414,17 @@ tao_CORBA_SequenceDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_SequenceDef_marshal (
+    CORBA::SequenceDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::SequenceDef_var
@@ -16615,7 +16550,7 @@ CORBA::SequenceDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::SequenceDef_out
@@ -16677,12 +16612,12 @@ CORBA::SequenceDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get : public TAO_ClientRequestInfo_i
 {
@@ -16711,7 +16646,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_SequenceDef_bound_get::TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -16769,7 +16704,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::ULong result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set : public TAO_ClientRequestInfo_i
 {
@@ -16796,7 +16731,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_SequenceDef_bound_set::TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -16856,7 +16791,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::result (ACE_ENV_SINGLE_ARG_DE
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get : public TAO_ClientRequestInfo_i
 {
@@ -16885,7 +16820,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_SequenceDef_element_type_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -16943,7 +16878,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::TypeCod
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get : public TAO_ClientRequestInfo_i
 {
@@ -16972,7 +16907,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_SequenceDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -17030,7 +16965,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (::CORBA::I
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set : public TAO_ClientRequestInfo_i
 {
@@ -17057,7 +16992,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_SequenceDef_element_type_def_set::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -17119,7 +17054,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::result (ACE_ENV_SI
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -17134,7 +17069,7 @@ CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::_TAO_SequenceDef_Remote_Proxy_Impl (v
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::ULong CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
     CORBA::Object *_collocated_tao_target_
@@ -17201,81 +17136,73 @@ CORBA::ULong CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
           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);
+          
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::ULong _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> _tao_retval)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::ULong _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -17286,7 +17213,7 @@ CORBA::ULong CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -17310,7 +17237,7 @@ CORBA::ULong CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -17322,24 +17249,26 @@ CORBA::ULong CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
       
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
     CORBA::Object *_collocated_tao_target_,
@@ -17407,74 +17336,66 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << bound)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << bound)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -17485,7 +17406,7 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -17509,7 +17430,7 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -17521,22 +17442,24 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
     CORBA::Object *_collocated_tao_target_
@@ -17603,82 +17526,74 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::TypeCode_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::TypeCode_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
         {
@@ -17689,7 +17604,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -17713,7 +17628,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -17725,24 +17640,26 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::IDLType_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
     CORBA::Object *_collocated_tao_target_
@@ -17809,82 +17726,74 @@ return _tao_retval._retn ();
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::IDLType_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::IDLType_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
         {
@@ -17895,7 +17804,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -17919,7 +17828,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -17931,24 +17840,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
     CORBA::Object *_collocated_tao_target_,
@@ -18016,74 +17927,66 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << element_type_def)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << element_type_def)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -18094,7 +17997,7 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -18118,7 +18021,7 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -18130,17 +18033,19 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -18149,7 +18054,7 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -18197,7 +18102,7 @@ CORBA::_TAO_SequenceDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::SequenceDef::SequenceDef (int collocated)
 {
@@ -18436,7 +18341,7 @@ const char* CORBA::SequenceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::ULong CORBA::SequenceDef::bound (
     ACE_ENV_SINGLE_ARG_DECL
@@ -18456,7 +18361,7 @@ CORBA::ULong CORBA::SequenceDef::bound (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::SequenceDef::bound (
     CORBA::ULong bound
@@ -18478,7 +18383,7 @@ void CORBA::SequenceDef::bound (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
     ACE_ENV_SINGLE_ARG_DECL
@@ -18498,7 +18403,7 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::IDLType_ptr CORBA::SequenceDef::element_type_def (
     ACE_ENV_SINGLE_ARG_DECL
@@ -18518,7 +18423,7 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::SequenceDef::element_type_def (
     CORBA::IDLType_ptr element_type_def
@@ -18540,7 +18445,7 @@ void CORBA::SequenceDef::element_type_def (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_SequenceDef[] =
 {
@@ -18555,11 +18460,11 @@ static const CORBA::Long _oc_CORBA_SequenceDef[] =
   ACE_NTOHL (0x63654465), 
   ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/SequenceDef:1.0
-  12,
+    12,
   ACE_NTOHL (0x53657175), 
   ACE_NTOHL (0x656e6365), 
   ACE_NTOHL (0x44656600),  // name = SequenceDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_SequenceDef (
     CORBA::tk_objref,
@@ -18579,7 +18484,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ArrayDef::_tao_class_id = 0;
 
@@ -18626,8 +18531,17 @@ tao_CORBA_ArrayDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ArrayDef_marshal (
+    CORBA::ArrayDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::ArrayDef_var
@@ -18753,7 +18667,7 @@ CORBA::ArrayDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::ArrayDef_out
@@ -18815,12 +18729,12 @@ CORBA::ArrayDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ArrayDef_length_get : public TAO_ClientRequestInfo_i
 {
@@ -18849,7 +18763,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ArrayDef_length_get::TAO_ClientRequestInfo_CORBA_ArrayDef_length_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -18907,7 +18821,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::ULong result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ArrayDef_length_set : public TAO_ClientRequestInfo_i
 {
@@ -18934,7 +18848,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ArrayDef_length_set::TAO_ClientRequestInfo_CORBA_ArrayDef_length_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -18994,7 +18908,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::result (ACE_ENV_SINGLE_ARG_DECL
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get : public TAO_ClientRequestInfo_i
 {
@@ -19023,7 +18937,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ArrayDef_element_type_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -19081,7 +18995,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::TypeCode_p
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get : public TAO_ClientRequestInfo_i
 {
@@ -19110,7 +19024,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ArrayDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -19168,7 +19082,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (::CORBA::IDLT
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set : public TAO_ClientRequestInfo_i
 {
@@ -19195,7 +19109,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ArrayDef_element_type_def_set::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -19257,7 +19171,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::result (ACE_ENV_SINGL
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -19272,7 +19186,7 @@ CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::_TAO_ArrayDef_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::ULong CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
     CORBA::Object *_collocated_tao_target_
@@ -19339,81 +19253,73 @@ CORBA::ULong CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
           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);
+          
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::ULong _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> _tao_retval)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::ULong _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -19424,7 +19330,7 @@ CORBA::ULong CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -19448,7 +19354,7 @@ CORBA::ULong CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -19460,24 +19366,26 @@ CORBA::ULong CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
       
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
     CORBA::Object *_collocated_tao_target_,
@@ -19545,74 +19453,66 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << length)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << length)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -19623,7 +19523,7 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -19647,7 +19547,7 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -19659,22 +19559,24 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
     CORBA::Object *_collocated_tao_target_
@@ -19741,82 +19643,74 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::TypeCode_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::TypeCode_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
         {
@@ -19827,7 +19721,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -19851,7 +19745,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -19863,24 +19757,26 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::IDLType_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
     CORBA::Object *_collocated_tao_target_
@@ -19947,82 +19843,74 @@ return _tao_retval._retn ();
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::IDLType_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::IDLType_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
         {
@@ -20033,7 +19921,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20057,7 +19945,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20069,24 +19957,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
     CORBA::Object *_collocated_tao_target_,
@@ -20154,74 +20044,66 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << element_type_def)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << element_type_def)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -20232,7 +20114,7 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20256,7 +20138,7 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20268,17 +20150,19 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -20287,7 +20171,7 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -20335,7 +20219,7 @@ CORBA::_TAO_ArrayDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::ArrayDef::ArrayDef (int collocated)
 {
@@ -20574,7 +20458,7 @@ const char* CORBA::ArrayDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::ULong CORBA::ArrayDef::length (
     ACE_ENV_SINGLE_ARG_DECL
@@ -20594,7 +20478,7 @@ CORBA::ULong CORBA::ArrayDef::length (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ArrayDef::length (
     CORBA::ULong length
@@ -20616,7 +20500,7 @@ void CORBA::ArrayDef::length (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
     ACE_ENV_SINGLE_ARG_DECL
@@ -20636,7 +20520,7 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::IDLType_ptr CORBA::ArrayDef::element_type_def (
     ACE_ENV_SINGLE_ARG_DECL
@@ -20656,7 +20540,7 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ArrayDef::element_type_def (
     CORBA::IDLType_ptr element_type_def
@@ -20678,7 +20562,7 @@ void CORBA::ArrayDef::element_type_def (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ArrayDef[] =
 {
@@ -20692,11 +20576,11 @@ static const CORBA::Long _oc_CORBA_ArrayDef[] =
   ACE_NTOHL (0x72617944), 
   ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ArrayDef:1.0
-  9,
+    9,
   ACE_NTOHL (0x41727261), 
   ACE_NTOHL (0x79446566), 
   ACE_NTOHL (0x0),  // name = ArrayDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ArrayDef (
     CORBA::tk_objref,
@@ -20716,7 +20600,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ExceptionDef::_tao_class_id = 0;
 
@@ -20763,8 +20647,17 @@ tao_CORBA_ExceptionDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ExceptionDef_marshal (
+    CORBA::ExceptionDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::ExceptionDef_var
@@ -20890,7 +20783,7 @@ CORBA::ExceptionDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::ExceptionDef_out
@@ -20952,12 +20845,12 @@ CORBA::ExceptionDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get : public TAO_ClientRequestInfo_i
 {
@@ -20986,7 +20879,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ExceptionDef_type_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -21044,7 +20937,7 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::TypeCode_ptr r
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get : public TAO_ClientRequestInfo_i
 {
@@ -21073,7 +20966,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ExceptionDef_members_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -21131,7 +21024,7 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (::CORBA::StructMem
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set : public TAO_ClientRequestInfo_i
 {
@@ -21158,7 +21051,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_ExceptionDef_members_set::TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -21220,7 +21113,7 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::result (ACE_ENV_SINGLE_ARG
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -21235,7 +21128,7 @@ CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::_TAO_ExceptionDef_Remote_Proxy_Impl
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
     CORBA::Object *_collocated_tao_target_
@@ -21302,82 +21195,74 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::TypeCode_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::TypeCode_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
         {
@@ -21388,7 +21273,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21412,7 +21297,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21424,24 +21309,26 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::StructMemberSeq * CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
     CORBA::Object *_collocated_tao_target_
@@ -21514,82 +21401,74 @@ return _tao_retval._retn ();
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::StructMemberSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::StructMemberSeq * _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
         {
@@ -21600,7 +21479,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21624,7 +21503,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21636,24 +21515,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
     CORBA::Object *_collocated_tao_target_,
@@ -21721,74 +21602,66 @@ void CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << members)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << members)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -21799,7 +21672,7 @@ void CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21823,7 +21696,7 @@ void CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21835,17 +21708,19 @@ void CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -21854,7 +21729,7 @@ void CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -21902,7 +21777,7 @@ CORBA::_TAO_ExceptionDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::ExceptionDef::ExceptionDef (int collocated)
 {
@@ -22160,7 +22035,7 @@ const char* CORBA::ExceptionDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
     ACE_ENV_SINGLE_ARG_DECL
@@ -22180,7 +22055,7 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::StructMemberSeq * CORBA::ExceptionDef::members (
     ACE_ENV_SINGLE_ARG_DECL
@@ -22200,7 +22075,7 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ExceptionDef::members (
     const CORBA::StructMemberSeq & members
@@ -22222,7 +22097,7 @@ void CORBA::ExceptionDef::members (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ExceptionDef[] =
 {
@@ -22237,12 +22112,12 @@ static const CORBA::Long _oc_CORBA_ExceptionDef[] =
   ACE_NTOHL (0x696f6e44), 
   ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDef:1.0
-  13,
+    13,
   ACE_NTOHL (0x45786365), 
   ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e446566), 
   ACE_NTOHL (0x0),  // name = ExceptionDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDef (
     CORBA::tk_objref,
@@ -22262,141 +22137,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ExceptionDescription[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x63657074), 
-  ACE_NTOHL (0x696f6e44), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-  21,
-  ACE_NTOHL (0x45786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = ExceptionDescription
-  5, // member count
-  5,
-  ACE_NTOHL (0x6e616d65), 
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
-
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
-
-  11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
-  ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
-  0xffffff9c, // negative offset (-100)
-  8,
-  ACE_NTOHL (0x76657273), 
-  ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
-
-  5,
-  ACE_NTOHL (0x74797065), 
-  ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDescription (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ExceptionDescription),
-    (char *) &_oc_CORBA_ExceptionDescription,
-    0,
-    sizeof (CORBA::ExceptionDescription)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ExceptionDescription,
-    &_tc_TAO_tc_CORBA_ExceptionDescription
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
-
-void CORBA::ExceptionDescription::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExceptionDescription *tmp = ACE_static_cast (ExceptionDescription*, _tao_void_pointer);
-  delete tmp;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -22499,7 +22240,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_upcast (void *src)
 #define _CORBA_EXCEPTIONDEFSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::ExceptionDefSeq
@@ -22561,7 +22302,7 @@ void CORBA::ExceptionDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ExceptionDefSeq[] =
 {
@@ -22577,12 +22318,12 @@ static const CORBA::Long _oc_CORBA_ExceptionDefSeq[] =
   ACE_NTOHL (0x65665365), 
   ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExceptionDefSeq:1.0
-  16,
+    16,
   ACE_NTOHL (0x45786365), 
   ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e446566), 
   ACE_NTOHL (0x53657100),  // name = ExceptionDefSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_objref, // typecode kind
@@ -22598,12 +22339,12 @@ static const CORBA::Long _oc_CORBA_ExceptionDefSeq[] =
       ACE_NTOHL (0x696f6e44), 
       ACE_NTOHL (0x65663a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDef:1.0
-      13,
+            13,
       ACE_NTOHL (0x45786365), 
       ACE_NTOHL (0x7074696f), 
       ACE_NTOHL (0x6e446566), 
       ACE_NTOHL (0x0),  // name = ExceptionDef
-
+      
     0U,
 
 };
@@ -22625,280 +22366,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CS_
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ExceptionDescription* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ExceptionDescription *old =
-        ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ExceptionDescription *tmp =
-    ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CS_)
-#define _CORBA_EXCDESCRIPTIONSEQ_CS_
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CORBA::ExcDescriptionSeq
-// *************************************************************
-
-CORBA::ExcDescriptionSeq::ExcDescriptionSeq (void)
-{}
-
-CORBA::ExcDescriptionSeq::ExcDescriptionSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExceptionDescription *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::ExcDescriptionSeq::ExcDescriptionSeq (const ExcDescriptionSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::ExcDescriptionSeq::~ExcDescriptionSeq (void) // dtor
-{}
-
-void CORBA::ExcDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExcDescriptionSeq *tmp = ACE_static_cast (ExcDescriptionSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ExcDescriptionSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x63446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-  18,
-  ACE_NTOHL (0x45786344), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e5365), 
-  ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-  CORBA::tk_sequence, // typecode kind
-  404, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    388, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      43,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4578), 
-      ACE_NTOHL (0x63657074), 
-      ACE_NTOHL (0x696f6e44), 
-      ACE_NTOHL (0x65736372), 
-      ACE_NTOHL (0x69707469), 
-      ACE_NTOHL (0x6f6e3a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-      21,
-      ACE_NTOHL (0x45786365), 
-      ACE_NTOHL (0x7074696f), 
-      ACE_NTOHL (0x6e446573), 
-      ACE_NTOHL (0x63726970), 
-      ACE_NTOHL (0x74696f6e), 
-      ACE_NTOHL (0x0),  // name = ExceptionDescription
-      5, // member count
-      5,
-      ACE_NTOHL (0x6e616d65), 
-      ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
-        ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-        0U, // string length
-
-      3,
-      ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x49643a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
-      ACE_NTOHL (0x696e0000),  // name = defined_in
-      0xffffffff, // indirection
-      0xffffff9c, // negative offset (-100)
-      8,
-      ACE_NTOHL (0x76657273), 
-      ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5665), 
-        ACE_NTOHL (0x7273696f), 
-        ACE_NTOHL (0x6e537065), 
-        ACE_NTOHL (0x633a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
-        ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
-        0U, // string length
-
-      5,
-      ACE_NTOHL (0x74797065), 
-      ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExcDescriptionSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ExcDescriptionSeq),
-    (char *) &_oc_CORBA_ExcDescriptionSeq,
-    0,
-    sizeof (CORBA::ExcDescriptionSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ExcDescriptionSeq,
-    &_tc_TAO_tc_CORBA_ExcDescriptionSeq
-  )
-TAO_NAMESPACE_END
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_AttributeMode[] =
 {
@@ -22913,22 +22382,22 @@ static const CORBA::Long _oc_CORBA_AttributeMode[] =
   ACE_NTOHL (0x7574654d), 
   ACE_NTOHL (0x6f64653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-14,
+  14,
   ACE_NTOHL (0x41747472), 
   ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x654d6f64), 
   ACE_NTOHL (0x65000000),  // name = AttributeMode
   2, // member count
-12,
+  12,
   ACE_NTOHL (0x41545452), 
   ACE_NTOHL (0x5f4e4f52), 
   ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-14,
+  14,
   ACE_NTOHL (0x41545452), 
   ACE_NTOHL (0x5f524541), 
   ACE_NTOHL (0x444f4e4c), 
   ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeMode (
     CORBA::tk_enum,
@@ -22948,7 +22417,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::AttributeDef::_tao_class_id = 0;
 
@@ -22995,8 +22464,17 @@ tao_CORBA_AttributeDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_AttributeDef_marshal (
+    CORBA::AttributeDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::AttributeDef_var
@@ -23122,7 +22600,7 @@ CORBA::AttributeDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::AttributeDef_out
@@ -23184,12 +22662,12 @@ CORBA::AttributeDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_AttributeDef_type_get : public TAO_ClientRequestInfo_i
 {
@@ -23218,7 +22696,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_AttributeDef_type_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -23276,7 +22754,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::TypeCode_ptr r
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get : public TAO_ClientRequestInfo_i
 {
@@ -23305,7 +22783,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_AttributeDef_type_def_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -23363,7 +22841,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (::CORBA::IDLType_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set : public TAO_ClientRequestInfo_i
 {
@@ -23390,7 +22868,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_AttributeDef_type_def_set::TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -23450,7 +22928,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::result (ACE_ENV_SINGLE_AR
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get : public TAO_ClientRequestInfo_i
 {
@@ -23479,7 +22957,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_AttributeDef_mode_get::TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -23537,7 +23015,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::result (::CORBA::AttributeMod
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set : public TAO_ClientRequestInfo_i
 {
@@ -23564,7 +23042,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_AttributeDef_mode_set::TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -23626,7 +23104,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::result (ACE_ENV_SINGLE_ARG_DE
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -23641,7 +23119,7 @@ CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::_TAO_AttributeDef_Remote_Proxy_Impl
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
     CORBA::Object *_collocated_tao_target_
@@ -23708,82 +23186,74 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::TypeCode_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::TypeCode_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
         {
@@ -23794,7 +23264,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -23818,7 +23288,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -23830,24 +23300,26 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::IDLType_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
     CORBA::Object *_collocated_tao_target_
@@ -23914,82 +23386,74 @@ return _tao_retval._retn ();
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::IDLType_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::IDLType_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
         {
@@ -24000,7 +23464,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -24024,7 +23488,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -24036,24 +23500,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
     CORBA::Object *_collocated_tao_target_,
@@ -24121,74 +23587,66 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << type_def)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << type_def)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -24199,7 +23657,7 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -24223,7 +23681,7 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -24235,22 +23693,24 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::AttributeMode CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
     CORBA::Object *_collocated_tao_target_
@@ -24317,81 +23777,73 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
           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);
+          
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::AttributeMode _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> _tao_retval)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::AttributeMode _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -24402,7 +23854,7 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -24426,7 +23878,7 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -24438,24 +23890,26 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
       
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
     CORBA::Object *_collocated_tao_target_,
@@ -24523,74 +23977,66 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << mode)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << mode)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -24601,7 +24047,7 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -24625,7 +24071,7 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -24637,17 +24083,19 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -24656,7 +24104,7 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -24704,7 +24152,7 @@ CORBA::_TAO_AttributeDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::AttributeDef::AttributeDef (int collocated)
 {
@@ -24943,7 +24391,7 @@ const char* CORBA::AttributeDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::TypeCode_ptr CORBA::AttributeDef::type (
     ACE_ENV_SINGLE_ARG_DECL
@@ -24963,7 +24411,7 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::IDLType_ptr CORBA::AttributeDef::type_def (
     ACE_ENV_SINGLE_ARG_DECL
@@ -24983,7 +24431,7 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::AttributeDef::type_def (
     CORBA::IDLType_ptr type_def
@@ -25005,7 +24453,7 @@ void CORBA::AttributeDef::type_def (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::AttributeMode CORBA::AttributeDef::mode (
     ACE_ENV_SINGLE_ARG_DECL
@@ -25025,7 +24473,7 @@ void CORBA::AttributeDef::type_def (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::AttributeDef::mode (
     CORBA::AttributeMode mode
@@ -25047,7 +24495,7 @@ void CORBA::AttributeDef::mode (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_AttributeDef[] =
 {
@@ -25062,12 +24510,12 @@ static const CORBA::Long _oc_CORBA_AttributeDef[] =
   ACE_NTOHL (0x75746544), 
   ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDef:1.0
-  13,
+    13,
   ACE_NTOHL (0x41747472), 
   ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x0),  // name = AttributeDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDef (
     CORBA::tk_objref,
@@ -25087,7 +24535,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_AttributeDescription[] =
 {
@@ -25104,7 +24552,7 @@ static const CORBA::Long _oc_CORBA_AttributeDescription[] =
   ACE_NTOHL (0x69707469), 
   ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-  21,
+    21,
   ACE_NTOHL (0x41747472), 
   ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65446573), 
@@ -25112,10 +24560,10 @@ static const CORBA::Long _oc_CORBA_AttributeDescription[] =
   ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = AttributeDescription
   6, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -25128,16 +24576,16 @@ static const CORBA::Long _oc_CORBA_AttributeDescription[] =
     ACE_NTOHL (0x66696572), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
@@ -25150,24 +24598,24 @@ static const CORBA::Long _oc_CORBA_AttributeDescription[] =
     ACE_NTOHL (0x746f7279), 
     ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
+        13,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x64656669), 
   ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
   ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
@@ -25180,22 +24628,22 @@ static const CORBA::Long _oc_CORBA_AttributeDescription[] =
     ACE_NTOHL (0x6e537065), 
     ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
+        12,
     ACE_NTOHL (0x56657273), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   5,
   ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
+    CORBA::tk_TypeCode,
 
   5,
   ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
-  CORBA::tk_enum, // typecode kind
+    CORBA::tk_enum, // typecode kind
   104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
@@ -25208,22 +24656,22 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x7574654d), 
     ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-14,
+    14,
     ACE_NTOHL (0x41747472), 
     ACE_NTOHL (0x69627574), 
     ACE_NTOHL (0x654d6f64), 
     ACE_NTOHL (0x65000000),  // name = AttributeMode
     2, // member count
-12,
+    12,
     ACE_NTOHL (0x41545452), 
     ACE_NTOHL (0x5f4e4f52), 
     ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-14,
+    14,
     ACE_NTOHL (0x41545452), 
     ACE_NTOHL (0x5f524541), 
     ACE_NTOHL (0x444f4e4c), 
     ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDescription (
@@ -25244,7 +24692,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::AttributeDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -25253,7 +24701,2417 @@ void CORBA::AttributeDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExtAttributeDescription[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  46,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74417474), 
+  ACE_NTOHL (0x72696275), 
+  ACE_NTOHL (0x74654465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
+    24,
+  ACE_NTOHL (0x45787441), 
+  ACE_NTOHL (0x74747269), 
+  ACE_NTOHL (0x62757465), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
+  8, // member count
+    5,
+  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x0),  // name = name
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    33,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+        11,
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x65720000),  // name = Identifier
+        CORBA::tk_string, 
+    0U, // string length
+
+  3,
+  ACE_NTOHL (0x69640000),  // name = id
+    CORBA::tk_alias, // typecode kind for typedefs
+  72, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    35,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+        13,
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x0),  // name = RepositoryId
+        CORBA::tk_string, 
+    0U, // string length
+
+  11,
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x696e0000),  // name = defined_in
+    0xffffffff, // indirection
+  0xffffff9c, // negative offset (-100)
+  8,
+  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x696f6e00),  // name = version
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    34,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+        12,
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x70656300),  // name = VersionSpec
+        CORBA::tk_string, 
+    0U, // string length
+
+  5,
+  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x0),  // name = type
+    CORBA::tk_TypeCode,
+
+  5,
+  ACE_NTOHL (0x6d6f6465), 
+  ACE_NTOHL (0x0),  // name = mode
+    CORBA::tk_enum, // typecode kind
+  104, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+    36,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4174), 
+    ACE_NTOHL (0x74726962), 
+    ACE_NTOHL (0x7574654d), 
+    ACE_NTOHL (0x6f64653a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
+    14,
+    ACE_NTOHL (0x41747472), 
+    ACE_NTOHL (0x69627574), 
+    ACE_NTOHL (0x654d6f64), 
+    ACE_NTOHL (0x65000000),  // name = AttributeMode
+    2, // member count
+    12,
+    ACE_NTOHL (0x41545452), 
+    ACE_NTOHL (0x5f4e4f52), 
+    ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
+    14,
+    ACE_NTOHL (0x41545452), 
+    ACE_NTOHL (0x5f524541), 
+    ACE_NTOHL (0x444f4e4c), 
+    ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
+    
+  15,
+  ACE_NTOHL (0x6765745f), 
+  ACE_NTOHL (0x65786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e730000),  // name = get_exceptions
+    CORBA::tk_alias, // typecode kind for typedefs
+  276, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    40,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x63446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+        18,
+    ACE_NTOHL (0x45786344), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+        CORBA::tk_sequence, // typecode kind
+    196, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      180, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        43,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x63657074), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                21,
+        ACE_NTOHL (0x45786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x0),  // name = ExceptionDescription
+        5, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                0xffffffff, // indirection
+        0xfffffd84, // negative offset (-636)
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                0xffffffff, // indirection
+        0xfffffdc8, // negative offset (-568)
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                0xffffffff, // indirection
+        0xfffffdb0, // negative offset (-592)
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                0xffffffff, // indirection
+        0xfffffe10, // negative offset (-496)
+        5,
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x0),  // name = type
+                CORBA::tk_TypeCode,
+
+
+      0U,
+
+
+  15,
+  ACE_NTOHL (0x7075745f), 
+  ACE_NTOHL (0x65786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e730000),  // name = put_exceptions
+    0xffffffff, // indirection
+  0xfffffecc, // negative offset (-308)
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtAttributeDescription (
+    CORBA::tk_struct,
+    sizeof (_oc_CORBA_ExtAttributeDescription),
+    (char *) &_oc_CORBA_ExtAttributeDescription,
+    0,
+    sizeof (CORBA::ExtAttributeDescription)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtAttributeDescription,
+    &_tc_TAO_tc_CORBA_ExtAttributeDescription
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
+
+void CORBA::ExtAttributeDescription::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtAttributeDescription *tmp = ACE_static_cast (ExtAttributeDescription*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
+int CORBA::ExtAttributeDef::_tao_class_id = 0;
+
+CORBA::ExtAttributeDef_ptr
+tao_CORBA_ExtAttributeDef_duplicate (
+    CORBA::ExtAttributeDef_ptr p
+  )
+{
+  return CORBA::ExtAttributeDef::_duplicate (p);
+}
+
+void
+tao_CORBA_ExtAttributeDef_release (
+    CORBA::ExtAttributeDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA::ExtAttributeDef_ptr
+tao_CORBA_ExtAttributeDef_nil (
+    void
+  )
+{
+  return CORBA::ExtAttributeDef::_nil ();
+}
+
+CORBA::ExtAttributeDef_ptr
+tao_CORBA_ExtAttributeDef_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return CORBA::ExtAttributeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+tao_CORBA_ExtAttributeDef_upcast (
+    void *src
+  )
+{
+  CORBA::ExtAttributeDef **tmp =
+    ACE_static_cast (CORBA::ExtAttributeDef **, src);
+  return *tmp;
+}
+
+CORBA::Boolean
+tao_CORBA_ExtAttributeDef_marshal (
+    CORBA::ExtAttributeDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
+// *************************************************************
+// CORBA::ExtAttributeDef_var
+// *************************************************************
+
+CORBA::ExtAttributeDef_var::ExtAttributeDef_var (void)
+  : ptr_ (ExtAttributeDef::_nil ())
+{}
+
+::CORBA::ExtAttributeDef_ptr
+CORBA::ExtAttributeDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA::ExtAttributeDef_var::ExtAttributeDef_var (const ::CORBA::ExtAttributeDef_var &p)
+  : TAO_Base_var (),
+    ptr_ (ExtAttributeDef::_duplicate (p.ptr ()))
+{}
+
+CORBA::ExtAttributeDef_var::~ExtAttributeDef_var (void)
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA::ExtAttributeDef_var &
+CORBA::ExtAttributeDef_var::operator= (ExtAttributeDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ExtAttributeDef_var &
+CORBA::ExtAttributeDef_var::operator= (const ::CORBA::ExtAttributeDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA::ExtAttributeDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA::ExtAttributeDef_var::operator const ::CORBA::ExtAttributeDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA::ExtAttributeDef_var::operator ::CORBA::ExtAttributeDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtAttributeDef_ptr
+CORBA::ExtAttributeDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtAttributeDef_ptr
+CORBA::ExtAttributeDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtAttributeDef_ptr &
+CORBA::ExtAttributeDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtAttributeDef_ptr &
+CORBA::ExtAttributeDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ExtAttributeDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA::ExtAttributeDef_ptr
+CORBA::ExtAttributeDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA::ExtAttributeDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ExtAttributeDef::_nil ();
+  return val;
+}
+
+::CORBA::ExtAttributeDef_ptr
+CORBA::ExtAttributeDef_var::tao_duplicate (ExtAttributeDef_ptr p)
+{
+  return ::CORBA::ExtAttributeDef::_duplicate (p);
+}
+
+void
+CORBA::ExtAttributeDef_var::tao_release (ExtAttributeDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA::ExtAttributeDef_ptr
+CORBA::ExtAttributeDef_var::tao_nil (void)
+{
+  return ::CORBA::ExtAttributeDef::_nil ();
+}
+
+::CORBA::ExtAttributeDef_ptr
+CORBA::ExtAttributeDef_var::tao_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return ::CORBA::ExtAttributeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+CORBA::ExtAttributeDef_var::tao_upcast (void *src)
+{
+  ExtAttributeDef **tmp =
+    ACE_static_cast (ExtAttributeDef **, src);
+  return *tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
+// *************************************************************
+// CORBA::ExtAttributeDef_out
+// *************************************************************
+
+CORBA::ExtAttributeDef_out::ExtAttributeDef_out (ExtAttributeDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA::ExtAttributeDef::_nil ();
+}
+
+CORBA::ExtAttributeDef_out::ExtAttributeDef_out (ExtAttributeDef_var &p)
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ExtAttributeDef::_nil ();
+}
+
+CORBA::ExtAttributeDef_out::ExtAttributeDef_out (const ::CORBA::ExtAttributeDef_out &p)
+  : ptr_ (ACE_const_cast (ExtAttributeDef_out &, p).ptr_)
+{}
+
+::CORBA::ExtAttributeDef_out &
+CORBA::ExtAttributeDef_out::operator= (const ::CORBA::ExtAttributeDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtAttributeDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA::ExtAttributeDef_out &
+CORBA::ExtAttributeDef_out::operator= (const ::CORBA::ExtAttributeDef_var &p)
+{
+  this->ptr_ = ::CORBA::ExtAttributeDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA::ExtAttributeDef_out &
+CORBA::ExtAttributeDef_out::operator= (ExtAttributeDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ExtAttributeDef_out::operator ::CORBA::ExtAttributeDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtAttributeDef_ptr &
+CORBA::ExtAttributeDef_out::ptr (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtAttributeDef_ptr
+CORBA::ExtAttributeDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::ExcDescriptionSeq * result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get &);
+    
+    ::CORBA::ExcDescriptionSeq * _result;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
+void 
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::result (::CORBA::ExcDescriptionSeq * result)
+{
+  // Update the result. 
+  this->_result = result;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const CORBA::ExcDescriptionSeq & get_exceptions
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set &);
+    const CORBA::ExcDescriptionSeq & get_exceptions_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const CORBA::ExcDescriptionSeq & get_exceptions
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      get_exceptions_ (get_exceptions)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<=  this->get_exceptions_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::ExcDescriptionSeq * result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get &);
+    
+    ::CORBA::ExcDescriptionSeq * _result;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
+void 
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::result (::CORBA::ExcDescriptionSeq * result)
+{
+  // Update the result. 
+  this->_result = result;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const CORBA::ExcDescriptionSeq & set_exceptions
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set &);
+    const CORBA::ExcDescriptionSeq & set_exceptions_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const CORBA::ExcDescriptionSeq & set_exceptions
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      set_exceptions_ (set_exceptions)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<=  this->set_exceptions_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::ExtAttributeDescription * result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute &);
+    
+    ::CORBA::ExtAttributeDescription * _result;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute::TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
+void 
+TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute::result (::CORBA::ExtAttributeDescription * result)
+{
+  // Update the result. 
+  this->_result = result;
+}
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//                Base & Remote Proxy  Implementation. 
+//
+
+CORBA::_TAO_ExtAttributeDef_Proxy_Impl::_TAO_ExtAttributeDef_Proxy_Impl (void)
+{}
+
+CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::_TAO_ExtAttributeDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+::CORBA::ExcDescriptionSeq * CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::get_exceptions (
+    CORBA::Object *_collocated_tao_target_
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::ExcDescriptionSeq_var _tao_retval;
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+  
+  {
+    CORBA::ExcDescriptionSeq *tmp;
+    ACE_NEW_RETURN (tmp, CORBA::ExcDescriptionSeq, _tao_retval._retn ());
+    _tao_retval = tmp;
+  }
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "_get_get_exceptions",
+      19,
+      0,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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 ());
+
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ExcDescriptionSeq * _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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::get_exceptions (
+    CORBA::Object *_collocated_tao_target_,
+    const CORBA::ExcDescriptionSeq & get_exceptions
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "_set_get_exceptions",
+      19,
+      1,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_,
+          get_exceptions
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK;
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << get_exceptions)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
+            }
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
+              continue;
+            }
+#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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK;
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+::CORBA::ExcDescriptionSeq * CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::set_exceptions (
+    CORBA::Object *_collocated_tao_target_
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::ExcDescriptionSeq_var _tao_retval;
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+  
+  {
+    CORBA::ExcDescriptionSeq *tmp;
+    ACE_NEW_RETURN (tmp, CORBA::ExcDescriptionSeq, _tao_retval._retn ());
+    _tao_retval = tmp;
+  }
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "_get_set_exceptions",
+      19,
+      0,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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 ());
+
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ExcDescriptionSeq * _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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::set_exceptions (
+    CORBA::Object *_collocated_tao_target_,
+    const CORBA::ExcDescriptionSeq & set_exceptions
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "_set_set_exceptions",
+      19,
+      1,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_,
+          set_exceptions
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK;
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << set_exceptions)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
+            }
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
+              continue;
+            }
+#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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK;
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+::CORBA::ExtAttributeDescription * CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::describe_attribute (
+    CORBA::Object *_collocated_tao_target_
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::ExtAttributeDescription_var _tao_retval;
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+  
+  {
+    CORBA::ExtAttributeDescription *tmp;
+    ACE_NEW_RETURN (tmp, CORBA::ExtAttributeDescription, _tao_retval._retn ());
+    _tao_retval = tmp;
+  }
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "describe_attribute",
+      18,
+      0,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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 ());
+
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ExtAttributeDescription * _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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+//
+//            End  Base & Remote  Proxy Implemeentation. 
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//           Remote & Base  Proxy Broker Implementation
+//
+
+CORBA::_TAO_ExtAttributeDef_Proxy_Broker::_TAO_ExtAttributeDef_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtAttributeDef_Proxy_Broker::~_TAO_ExtAttributeDef_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtAttributeDef_Proxy_Broker * (*CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+// Factory Member function Implementation.
+CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Broker *
+CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Broker::the_TAO_ExtAttributeDef_Remote_Proxy_Broker (void)
+{
+  static ::CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Broker remote_proxy_broker;
+  return &remote_proxy_broker;
+}
+
+CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Broker::_TAO_ExtAttributeDef_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Broker::~_TAO_ExtAttributeDef_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtAttributeDef_Proxy_Impl&
+CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ExtAttributeDef *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  return this->remote_proxy_impl_;
+}
+
+//
+//           End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+
+CORBA::ExtAttributeDef::ExtAttributeDef (int collocated)
+{
+  this->CORBA_ExtAttributeDef_setup_collocation (collocated);
+}
+
+void
+CORBA::ExtAttributeDef::CORBA_ExtAttributeDef_setup_collocation (int collocated)
+{
+  if (collocated)
+    this->the_TAO_ExtAttributeDef_Proxy_Broker_ =
+      ::CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer (this);
+  else
+    this->the_TAO_ExtAttributeDef_Proxy_Broker_ =
+      ::CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Broker::the_TAO_ExtAttributeDef_Remote_Proxy_Broker ();
+  
+  this->CORBA_AttributeDef_setup_collocation (collocated);
+}
+
+CORBA::ExtAttributeDef::~ExtAttributeDef (void)
+{}
+
+void 
+CORBA::ExtAttributeDef::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtAttributeDef *tmp = ACE_static_cast (ExtAttributeDef *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+CORBA::ExtAttributeDef_ptr
+CORBA::ExtAttributeDef::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return ExtAttributeDef::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/ExtAttributeDef:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
+      ACE_CHECK_RETURN (ExtAttributeDef::_nil ());
+      
+      if (is_a == 0)
+        {
+          return ExtAttributeDef::_nil ();
+        }
+    }
+  
+  return ExtAttributeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::ExtAttributeDef_ptr 
+CORBA::ExtAttributeDef::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return ExtAttributeDef::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      TAO_Stub* stub = obj->_stubobj ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
+      ExtAttributeDef_ptr default_proxy = ExtAttributeDef::_nil ();
+      
+      if (
+          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+          obj->_is_collocated () &&
+          CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer != 0
+        )
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ExtAttributeDef (
+                  stub,
+                  1,
+                  obj->_servant ()
+                ),
+              ExtAttributeDef::_nil ()
+            );
+        }
+      
+      if (CORBA::is_nil (default_proxy))
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ExtAttributeDef (
+                  stub,
+                  0,
+                  obj->_servant ()
+                ),
+              ExtAttributeDef::_nil ()
+            );
+        }
+      
+      return default_proxy;
+    }
+  else 
+    return
+      ACE_reinterpret_cast (
+          ExtAttributeDef_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ExtAttributeDef::_tao_class_id
+                )
+            )
+        );
+}
+
+CORBA::ExtAttributeDef_ptr
+CORBA::ExtAttributeDef::_duplicate (ExtAttributeDef_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+CORBA::ExtAttributeDef::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ExtAttributeDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/AttributeDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Contained:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/IRObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
+}
+
+void *CORBA::ExtAttributeDef::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, ExtAttributeDef)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, AttributeDef)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::AttributeDef_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Contained::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Contained_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::IRObject::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::IRObject_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
+  return retv;
+}
+
+const char* CORBA::ExtAttributeDef::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/CORBA/ExtAttributeDef:1.0";
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::ExcDescriptionSeq * CORBA::ExtAttributeDef::get_exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_ExtAttributeDef_Proxy_Impl &proxy = 
+    this->the_TAO_ExtAttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return proxy.get_exceptions (
+      this
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+void CORBA::ExtAttributeDef::get_exceptions (
+    const CORBA::ExcDescriptionSeq & get_exceptions
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_ExtAttributeDef_Proxy_Impl &proxy = 
+    this->the_TAO_ExtAttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  proxy.get_exceptions (
+      this,
+      get_exceptions
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::ExcDescriptionSeq * CORBA::ExtAttributeDef::set_exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_ExtAttributeDef_Proxy_Impl &proxy = 
+    this->the_TAO_ExtAttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return proxy.set_exceptions (
+      this
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+void CORBA::ExtAttributeDef::set_exceptions (
+    const CORBA::ExcDescriptionSeq & set_exceptions
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_ExtAttributeDef_Proxy_Impl &proxy = 
+    this->the_TAO_ExtAttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  proxy.set_exceptions (
+      this,
+      set_exceptions
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::ExtAttributeDescription * CORBA::ExtAttributeDef::describe_attribute (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_ExtAttributeDef_Proxy_Impl &proxy = 
+    this->the_TAO_ExtAttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return proxy.describe_attribute (
+      this
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExtAttributeDef[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74417474), 
+  ACE_NTOHL (0x72696275), 
+  ACE_NTOHL (0x74654465), 
+  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDef:1.0
+    16,
+  ACE_NTOHL (0x45787441), 
+  ACE_NTOHL (0x74747269), 
+  ACE_NTOHL (0x62757465), 
+  ACE_NTOHL (0x44656600),  // name = ExtAttributeDef
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtAttributeDef (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_ExtAttributeDef),
+    (char *) &_oc_CORBA_ExtAttributeDef,
+    0,
+    sizeof (CORBA::ExtAttributeDef)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtAttributeDef,
+    &_tc_TAO_tc_CORBA_ExtAttributeDef
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_OperationMode[] =
 {
@@ -25268,21 +27126,21 @@ static const CORBA::Long _oc_CORBA_OperationMode[] =
   ACE_NTOHL (0x696f6e4d), 
   ACE_NTOHL (0x6f64653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-14,
+  14,
   ACE_NTOHL (0x4f706572), 
   ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e4d6f64), 
   ACE_NTOHL (0x65000000),  // name = OperationMode
   2, // member count
-10,
+  10,
   ACE_NTOHL (0x4f505f4e), 
   ACE_NTOHL (0x4f524d41), 
   ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-10,
+  10,
   ACE_NTOHL (0x4f505f4f), 
   ACE_NTOHL (0x4e455741), 
   ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationMode (
     CORBA::tk_enum,
@@ -25302,60 +27160,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ParameterMode[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5061), 
-  ACE_NTOHL (0x72616d65), 
-  ACE_NTOHL (0x7465724d), 
-  ACE_NTOHL (0x6f64653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-14,
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x724d6f64), 
-  ACE_NTOHL (0x65000000),  // name = ParameterMode
-  3, // member count
-9,
-  ACE_NTOHL (0x50415241), 
-  ACE_NTOHL (0x4d5f494e), 
-  ACE_NTOHL (0x0),  // name = PARAM_IN
-10,
-  ACE_NTOHL (0x50415241), 
-  ACE_NTOHL (0x4d5f4f55), 
-  ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-12,
-  ACE_NTOHL (0x50415241), 
-  ACE_NTOHL (0x4d5f494e), 
-  ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ParameterMode (
-    CORBA::tk_enum,
-    sizeof (_oc_CORBA_ParameterMode),
-    (char *) &_oc_CORBA_ParameterMode,
-    0,
-    sizeof (CORBA::ParameterMode)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ParameterMode,
-    &_tc_TAO_tc_CORBA_ParameterMode
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ParameterDescription[] =
 {
@@ -25372,7 +27177,7 @@ static const CORBA::Long _oc_CORBA_ParameterDescription[] =
   ACE_NTOHL (0x69707469), 
   ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-  21,
+    21,
   ACE_NTOHL (0x50617261), 
   ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x72446573), 
@@ -25380,10 +27185,10 @@ static const CORBA::Long _oc_CORBA_ParameterDescription[] =
   ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = ParameterDescription
   4, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -25396,23 +27201,23 @@ static const CORBA::Long _oc_CORBA_ParameterDescription[] =
     ACE_NTOHL (0x66696572), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   5,
   ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
+    CORBA::tk_TypeCode,
 
   9,
   ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x5f646566), 
   ACE_NTOHL (0x0),  // name = type_def
-  CORBA::tk_objref, // typecode kind
+    CORBA::tk_objref, // typecode kind
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
@@ -25424,14 +27229,14 @@ static const CORBA::Long _oc_CORBA_ParameterDescription[] =
     ACE_NTOHL (0x4c547970), 
     ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-    8,
+        8,
     ACE_NTOHL (0x49444c54), 
     ACE_NTOHL (0x79706500),  // name = IDLType
-
+    
   5,
   ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
-  CORBA::tk_enum, // typecode kind
+    CORBA::tk_enum, // typecode kind
   116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
@@ -25444,25 +27249,25 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x7465724d), 
     ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-14,
+    14,
     ACE_NTOHL (0x50617261), 
     ACE_NTOHL (0x6d657465), 
     ACE_NTOHL (0x724d6f64), 
     ACE_NTOHL (0x65000000),  // name = ParameterMode
     3, // member count
-9,
+    9,
     ACE_NTOHL (0x50415241), 
     ACE_NTOHL (0x4d5f494e), 
     ACE_NTOHL (0x0),  // name = PARAM_IN
-10,
+    10,
     ACE_NTOHL (0x50415241), 
     ACE_NTOHL (0x4d5f4f55), 
     ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-12,
+    12,
     ACE_NTOHL (0x50415241), 
     ACE_NTOHL (0x4d5f494e), 
     ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ParameterDescription (
@@ -25483,7 +27288,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ParameterDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -25492,7 +27297,7 @@ void CORBA::ParameterDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -25551,7 +27356,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::~_TAO_Unbounded_Sequence
 #define _CORBA_PARDESCRIPTIONSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::ParDescriptionSeq
@@ -25613,7 +27418,7 @@ void CORBA::ParDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
 {
@@ -25629,13 +27434,13 @@ static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
   ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-  18,
+    18,
   ACE_NTOHL (0x50617244), 
   ACE_NTOHL (0x65736372), 
   ACE_NTOHL (0x69707469), 
   ACE_NTOHL (0x6f6e5365), 
   ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   416, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
@@ -25653,7 +27458,7 @@ static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
       ACE_NTOHL (0x69707469), 
       ACE_NTOHL (0x6f6e3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-      21,
+            21,
       ACE_NTOHL (0x50617261), 
       ACE_NTOHL (0x6d657465), 
       ACE_NTOHL (0x72446573), 
@@ -25661,10 +27466,10 @@ static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
       ACE_NTOHL (0x74696f6e), 
       ACE_NTOHL (0x0),  // name = ParameterDescription
       4, // member count
-      5,
+            5,
       ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
@@ -25677,23 +27482,23 @@ static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
         ACE_NTOHL (0x66696572), 
         ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
+                11,
         ACE_NTOHL (0x4964656e), 
         ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+                CORBA::tk_string, 
         0U, // string length
 
       5,
       ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
+            CORBA::tk_TypeCode,
 
       9,
       ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x5f646566), 
       ACE_NTOHL (0x0),  // name = type_def
-      CORBA::tk_objref, // typecode kind
+            CORBA::tk_objref, // typecode kind
       52, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
@@ -25705,14 +27510,14 @@ static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
         ACE_NTOHL (0x4c547970), 
         ACE_NTOHL (0x653a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8,
+                8,
         ACE_NTOHL (0x49444c54), 
         ACE_NTOHL (0x79706500),  // name = IDLType
-
+        
       5,
       ACE_NTOHL (0x6d6f6465), 
       ACE_NTOHL (0x0),  // name = mode
-      CORBA::tk_enum, // typecode kind
+            CORBA::tk_enum, // typecode kind
       116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
@@ -25725,25 +27530,25 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x7465724d), 
         ACE_NTOHL (0x6f64653a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-14,
+        14,
         ACE_NTOHL (0x50617261), 
         ACE_NTOHL (0x6d657465), 
         ACE_NTOHL (0x724d6f64), 
         ACE_NTOHL (0x65000000),  // name = ParameterMode
         3, // member count
-9,
+        9,
         ACE_NTOHL (0x50415241), 
         ACE_NTOHL (0x4d5f494e), 
         ACE_NTOHL (0x0),  // name = PARAM_IN
-10,
+        10,
         ACE_NTOHL (0x50415241), 
         ACE_NTOHL (0x4d5f4f55), 
         ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-12,
+        12,
         ACE_NTOHL (0x50415241), 
         ACE_NTOHL (0x4d5f494e), 
         ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+        
 
     0U,
 
@@ -25767,7 +27572,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ContextIdentifier[] =
 {
@@ -25783,13 +27588,13 @@ static const CORBA::Long _oc_CORBA_ContextIdentifier[] =
   ACE_NTOHL (0x6e746966), 
   ACE_NTOHL (0x6965723a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-  18,
+    18,
   ACE_NTOHL (0x436f6e74), 
   ACE_NTOHL (0x65787449), 
   ACE_NTOHL (0x64656e74), 
   ACE_NTOHL (0x69666965), 
   ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -25802,11 +27607,11 @@ static const CORBA::Long _oc_CORBA_ContextIdentifier[] =
     ACE_NTOHL (0x66696572), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -25832,7 +27637,7 @@ TAO_NAMESPACE_END
 #define _CORBA_CONTEXTIDSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::ContextIdSeq
@@ -25894,7 +27699,7 @@ void CORBA::ContextIdSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ContextIdSeq[] =
 {
@@ -25909,12 +27714,12 @@ static const CORBA::Long _oc_CORBA_ContextIdSeq[] =
   ACE_NTOHL (0x74496453), 
   ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-  13,
+    13,
   ACE_NTOHL (0x436f6e74), 
   ACE_NTOHL (0x65787449), 
   ACE_NTOHL (0x64536571), 
   ACE_NTOHL (0x0),  // name = ContextIdSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
@@ -25931,13 +27736,13 @@ static const CORBA::Long _oc_CORBA_ContextIdSeq[] =
       ACE_NTOHL (0x6e746966), 
       ACE_NTOHL (0x6965723a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-      18,
+            18,
       ACE_NTOHL (0x436f6e74), 
       ACE_NTOHL (0x65787449), 
       ACE_NTOHL (0x64656e74), 
       ACE_NTOHL (0x69666965), 
       ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
@@ -25950,11 +27755,11 @@ static const CORBA::Long _oc_CORBA_ContextIdSeq[] =
         ACE_NTOHL (0x66696572), 
         ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
+                11,
         ACE_NTOHL (0x4964656e), 
         ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+                CORBA::tk_string, 
         0U, // string length
 
 
@@ -25980,7 +27785,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::OperationDef::_tao_class_id = 0;
 
@@ -26027,8 +27832,17 @@ tao_CORBA_OperationDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_OperationDef_marshal (
+    CORBA::OperationDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::OperationDef_var
@@ -26154,7 +27968,7 @@ CORBA::OperationDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::OperationDef_out
@@ -26216,12 +28030,12 @@ CORBA::OperationDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_OperationDef_result_get : public TAO_ClientRequestInfo_i
 {
@@ -26250,7 +28064,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_OperationDef_result_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -26308,7 +28122,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_get::result (CORBA::TypeCode_ptr
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get : public TAO_ClientRequestInfo_i
 {
@@ -26337,7 +28151,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_OperationDef_result_def_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -26395,7 +28209,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (::CORBA::IDLTyp
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set : public TAO_ClientRequestInfo_i
 {
@@ -26422,7 +28236,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_OperationDef_result_def_set::TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -26482,7 +28296,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::result (ACE_ENV_SINGLE_
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_OperationDef_params_get : public TAO_ClientRequestInfo_i
 {
@@ -26511,7 +28325,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_OperationDef_params_get::TAO_ClientRequestInfo_CORBA_OperationDef_params_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -26569,7 +28383,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (::CORBA::ParDescrip
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_OperationDef_params_set : public TAO_ClientRequestInfo_i
 {
@@ -26596,7 +28410,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_OperationDef_params_set::TAO_ClientRequestInfo_CORBA_OperationDef_params_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -26656,7 +28470,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::result (ACE_ENV_SINGLE_ARG_
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_OperationDef_mode_get : public TAO_ClientRequestInfo_i
 {
@@ -26685,7 +28499,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_OperationDef_mode_get::TAO_ClientRequestInfo_CORBA_OperationDef_mode_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -26743,7 +28557,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::result (::CORBA::OperationMod
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_OperationDef_mode_set : public TAO_ClientRequestInfo_i
 {
@@ -26770,7 +28584,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_OperationDef_mode_set::TAO_ClientRequestInfo_CORBA_OperationDef_mode_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -26830,7 +28644,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::result (ACE_ENV_SINGLE_ARG_DE
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get : public TAO_ClientRequestInfo_i
 {
@@ -26859,7 +28673,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_OperationDef_contexts_get::TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -26917,7 +28731,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (::CORBA::ContextI
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set : public TAO_ClientRequestInfo_i
 {
@@ -26944,7 +28758,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_OperationDef_contexts_set::TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -27004,7 +28818,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::result (ACE_ENV_SINGLE_AR
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get : public TAO_ClientRequestInfo_i
 {
@@ -27033,7 +28847,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_OperationDef_exceptions_get::TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -27091,7 +28905,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (::CORBA::Except
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set : public TAO_ClientRequestInfo_i
 {
@@ -27118,7 +28932,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_OperationDef_exceptions_set::TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -27180,7 +28994,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::result (ACE_ENV_SINGLE_
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -27195,7 +29009,7 @@ CORBA::_TAO_OperationDef_Remote_Proxy_Impl::_TAO_OperationDef_Remote_Proxy_Impl
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
     CORBA::Object *_collocated_tao_target_
@@ -27262,82 +29076,74 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::TypeCode_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::TypeCode_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
         {
@@ -27348,7 +29154,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -27372,7 +29178,7 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -27384,24 +29190,26 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::IDLType_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
     CORBA::Object *_collocated_tao_target_
@@ -27468,82 +29276,74 @@ return _tao_retval._retn ();
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::IDLType_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::IDLType_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
         {
@@ -27554,7 +29354,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -27578,7 +29378,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -27590,24 +29390,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
     CORBA::Object *_collocated_tao_target_,
@@ -27675,74 +29477,66 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << result_def)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << result_def)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -27753,7 +29547,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -27777,7 +29571,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -27789,22 +29583,24 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ParDescriptionSeq * CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
     CORBA::Object *_collocated_tao_target_
@@ -27877,82 +29673,74 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ParDescriptionSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ParDescriptionSeq * _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
         {
@@ -27963,7 +29751,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -27987,7 +29775,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -27999,24 +29787,26 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
     CORBA::Object *_collocated_tao_target_,
@@ -28084,74 +29874,66 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << params)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << params)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -28162,7 +29944,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -28186,7 +29968,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -28198,22 +29980,24 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::OperationMode CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
     CORBA::Object *_collocated_tao_target_
@@ -28280,81 +30064,73 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
           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);
+          
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::OperationMode _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> _tao_retval)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::OperationMode _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -28365,7 +30141,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -28389,7 +30165,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -28401,24 +30177,26 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
       
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
     CORBA::Object *_collocated_tao_target_,
@@ -28486,74 +30264,66 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << mode)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << mode)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -28564,7 +30334,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -28588,7 +30358,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -28600,22 +30370,24 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ContextIdSeq * CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
     CORBA::Object *_collocated_tao_target_
@@ -28688,82 +30460,74 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ContextIdSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ContextIdSeq * _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
         {
@@ -28774,7 +30538,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -28798,7 +30562,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -28810,24 +30574,26 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
     CORBA::Object *_collocated_tao_target_,
@@ -28895,74 +30661,66 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << contexts)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << contexts)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -28973,7 +30731,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -28997,7 +30755,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -29009,22 +30767,24 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ExceptionDefSeq * CORBA::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
     CORBA::Object *_collocated_tao_target_
@@ -29097,82 +30857,74 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ExceptionDefSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ExceptionDefSeq * _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
         {
@@ -29183,7 +30935,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -29207,7 +30959,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -29219,24 +30971,26 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
     CORBA::Object *_collocated_tao_target_,
@@ -29304,74 +31058,66 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << exceptions)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << exceptions)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -29382,7 +31128,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -29406,7 +31152,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -29418,17 +31164,19 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
@@ -29437,7 +31185,7 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -29485,7 +31233,7 @@ CORBA::_TAO_OperationDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::OperationDef::OperationDef (int collocated)
 {
@@ -29724,7 +31472,7 @@ const char* CORBA::OperationDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::TypeCode_ptr CORBA::OperationDef::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -29744,7 +31492,7 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::IDLType_ptr CORBA::OperationDef::result_def (
     ACE_ENV_SINGLE_ARG_DECL
@@ -29764,7 +31512,7 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::OperationDef::result_def (
     CORBA::IDLType_ptr result_def
@@ -29786,7 +31534,7 @@ void CORBA::OperationDef::result_def (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ParDescriptionSeq * CORBA::OperationDef::params (
     ACE_ENV_SINGLE_ARG_DECL
@@ -29806,7 +31554,7 @@ void CORBA::OperationDef::result_def (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::OperationDef::params (
     const CORBA::ParDescriptionSeq & params
@@ -29828,7 +31576,7 @@ void CORBA::OperationDef::params (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::OperationMode CORBA::OperationDef::mode (
     ACE_ENV_SINGLE_ARG_DECL
@@ -29848,7 +31596,7 @@ void CORBA::OperationDef::params (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::OperationDef::mode (
     CORBA::OperationMode mode
@@ -29870,7 +31618,7 @@ void CORBA::OperationDef::mode (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ContextIdSeq * CORBA::OperationDef::contexts (
     ACE_ENV_SINGLE_ARG_DECL
@@ -29890,7 +31638,7 @@ void CORBA::OperationDef::mode (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::OperationDef::contexts (
     const CORBA::ContextIdSeq & contexts
@@ -29912,7 +31660,7 @@ void CORBA::OperationDef::contexts (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ExceptionDefSeq * CORBA::OperationDef::exceptions (
     ACE_ENV_SINGLE_ARG_DECL
@@ -29932,7 +31680,7 @@ void CORBA::OperationDef::contexts (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::OperationDef::exceptions (
     const CORBA::ExceptionDefSeq & exceptions
@@ -29954,7 +31702,7 @@ void CORBA::OperationDef::exceptions (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_OperationDef[] =
 {
@@ -29969,12 +31717,12 @@ static const CORBA::Long _oc_CORBA_OperationDef[] =
   ACE_NTOHL (0x696f6e44), 
   ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDef:1.0
-  13,
+    13,
   ACE_NTOHL (0x4f706572), 
   ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e446566), 
   ACE_NTOHL (0x0),  // name = OperationDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationDef (
     CORBA::tk_objref,
@@ -29994,7 +31742,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_OperationDescription[] =
 {
@@ -30011,7 +31759,7 @@ static const CORBA::Long _oc_CORBA_OperationDescription[] =
   ACE_NTOHL (0x69707469), 
   ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
-  21,
+    21,
   ACE_NTOHL (0x4f706572), 
   ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e446573), 
@@ -30019,10 +31767,10 @@ static const CORBA::Long _oc_CORBA_OperationDescription[] =
   ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = OperationDescription
   9, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -30035,16 +31783,16 @@ static const CORBA::Long _oc_CORBA_OperationDescription[] =
     ACE_NTOHL (0x66696572), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
@@ -30057,24 +31805,24 @@ static const CORBA::Long _oc_CORBA_OperationDescription[] =
     ACE_NTOHL (0x746f7279), 
     ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
+        13,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x64656669), 
   ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
   ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
@@ -30087,22 +31835,22 @@ static const CORBA::Long _oc_CORBA_OperationDescription[] =
     ACE_NTOHL (0x6e537065), 
     ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
+        12,
     ACE_NTOHL (0x56657273), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   7,
   ACE_NTOHL (0x72657375), 
   ACE_NTOHL (0x6c740000),  // name = result
-  CORBA::tk_TypeCode,
+    CORBA::tk_TypeCode,
 
   5,
   ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
-  CORBA::tk_enum, // typecode kind
+    CORBA::tk_enum, // typecode kind
   100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
@@ -30115,26 +31863,26 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x696f6e4d), 
     ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-14,
+    14,
     ACE_NTOHL (0x4f706572), 
     ACE_NTOHL (0x6174696f), 
     ACE_NTOHL (0x6e4d6f64), 
     ACE_NTOHL (0x65000000),  // name = OperationMode
     2, // member count
-10,
+    10,
     ACE_NTOHL (0x4f505f4e), 
     ACE_NTOHL (0x4f524d41), 
     ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-10,
+    10,
     ACE_NTOHL (0x4f505f4f), 
     ACE_NTOHL (0x4e455741), 
     ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
+    
   9,
   ACE_NTOHL (0x636f6e74), 
   ACE_NTOHL (0x65787473), 
   ACE_NTOHL (0x0),  // name = contexts
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   168, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
@@ -30147,12 +31895,12 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x74496453), 
     ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-    13,
+        13,
     ACE_NTOHL (0x436f6e74), 
     ACE_NTOHL (0x65787449), 
     ACE_NTOHL (0x64536571), 
     ACE_NTOHL (0x0),  // name = ContextIdSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     96, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_alias, // typecode kind for typedefs
@@ -30169,13 +31917,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x6e746966), 
         ACE_NTOHL (0x6965723a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-        18,
+                18,
         ACE_NTOHL (0x436f6e74), 
         ACE_NTOHL (0x65787449), 
         ACE_NTOHL (0x64656e74), 
         ACE_NTOHL (0x69666965), 
         ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffdac, // negative offset (-596)
 
       0U,
@@ -30185,7 +31933,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
   ACE_NTOHL (0x70617261), 
   ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x72730000),  // name = parameters
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   428, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
@@ -30199,13 +31947,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-    18,
+        18,
     ACE_NTOHL (0x50617244), 
     ACE_NTOHL (0x65736372), 
     ACE_NTOHL (0x69707469), 
     ACE_NTOHL (0x6f6e5365), 
     ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     348, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
@@ -30223,7 +31971,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x69707469), 
         ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-        21,
+                21,
         ACE_NTOHL (0x50617261), 
         ACE_NTOHL (0x6d657465), 
         ACE_NTOHL (0x72446573), 
@@ -30231,21 +31979,21 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = ParameterDescription
         4, // member count
-        5,
+                5,
         ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffccc, // negative offset (-820)
         5,
         ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
+                CORBA::tk_TypeCode,
 
         9,
         ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x5f646566), 
         ACE_NTOHL (0x0),  // name = type_def
-        CORBA::tk_objref, // typecode kind
+                CORBA::tk_objref, // typecode kind
         52, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           30,
@@ -30257,14 +32005,14 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           ACE_NTOHL (0x4c547970), 
           ACE_NTOHL (0x653a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-          8,
+                    8,
           ACE_NTOHL (0x49444c54), 
           ACE_NTOHL (0x79706500),  // name = IDLType
-
+          
         5,
         ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
+                CORBA::tk_enum, // typecode kind
         116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
@@ -30277,25 +32025,25 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           ACE_NTOHL (0x7465724d), 
           ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-14,
+          14,
           ACE_NTOHL (0x50617261), 
           ACE_NTOHL (0x6d657465), 
           ACE_NTOHL (0x724d6f64), 
           ACE_NTOHL (0x65000000),  // name = ParameterMode
           3, // member count
-9,
+          9,
           ACE_NTOHL (0x50415241), 
           ACE_NTOHL (0x4d5f494e), 
           ACE_NTOHL (0x0),  // name = PARAM_IN
-10,
+          10,
           ACE_NTOHL (0x50415241), 
           ACE_NTOHL (0x4d5f4f55), 
           ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-12,
+          12,
           ACE_NTOHL (0x50415241), 
           ACE_NTOHL (0x4d5f494e), 
           ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+          
 
       0U,
 
@@ -30304,7 +32052,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
   ACE_NTOHL (0x65786365), 
   ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e730000),  // name = exceptions
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   276, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
@@ -30318,13 +32066,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-    18,
+        18,
     ACE_NTOHL (0x45786344), 
     ACE_NTOHL (0x65736372), 
     ACE_NTOHL (0x69707469), 
     ACE_NTOHL (0x6f6e5365), 
     ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     196, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
@@ -30342,7 +32090,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x69707469), 
         ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-        21,
+                21,
         ACE_NTOHL (0x45786365), 
         ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e446573), 
@@ -30350,30 +32098,30 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = ExceptionDescription
         5, // member count
-        5,
+                5,
         ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffb08, // negative offset (-1272)
         3,
         ACE_NTOHL (0x69640000),  // name = id
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffb4c, // negative offset (-1204)
         11,
         ACE_NTOHL (0x64656669), 
         ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffb34, // negative offset (-1228)
         8,
         ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffb94, // negative offset (-1132)
         5,
         ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
+                CORBA::tk_TypeCode,
 
 
       0U,
@@ -30399,7 +32147,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::OperationDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -30411,7 +32159,7 @@ void CORBA::OperationDescription::_tao_any_destructor (void *_tao_void_pointer)
 #define _CORBA_REPOSITORYIDSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::RepositoryIdSeq
@@ -30473,7 +32221,7 @@ void CORBA::RepositoryIdSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_RepositoryIdSeq[] =
 {
@@ -30489,12 +32237,12 @@ static const CORBA::Long _oc_CORBA_RepositoryIdSeq[] =
   ACE_NTOHL (0x49645365), 
   ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-  16,
+    16,
   ACE_NTOHL (0x5265706f), 
   ACE_NTOHL (0x7369746f), 
   ACE_NTOHL (0x72794964), 
   ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   88, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
@@ -30510,12 +32258,12 @@ static const CORBA::Long _oc_CORBA_RepositoryIdSeq[] =
       ACE_NTOHL (0x746f7279), 
       ACE_NTOHL (0x49643a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-      13,
+            13,
       ACE_NTOHL (0x5265706f), 
       ACE_NTOHL (0x7369746f), 
       ACE_NTOHL (0x72794964), 
       ACE_NTOHL (0x0),  // name = RepositoryId
-      CORBA::tk_string, 
+            CORBA::tk_string, 
       0U, // string length
 
     0U,
@@ -30540,7 +32288,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -30599,7 +32347,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::~_TAO_Unbounded_Sequence_
 #define _CORBA_OPDESCRIPTIONSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::OpDescriptionSeq
@@ -30661,7 +32409,7 @@ void CORBA::OpDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
 {
@@ -30677,13 +32425,13 @@ static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
   ACE_NTOHL (0x696f6e53), 
   ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
-  17,
+    17,
   ACE_NTOHL (0x4f704465), 
   ACE_NTOHL (0x73637269), 
   ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e536571), 
   ACE_NTOHL (0x0),  // name = OpDescriptionSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   1468, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
@@ -30701,7 +32449,7 @@ static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
       ACE_NTOHL (0x69707469), 
       ACE_NTOHL (0x6f6e3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
-      21,
+            21,
       ACE_NTOHL (0x4f706572), 
       ACE_NTOHL (0x6174696f), 
       ACE_NTOHL (0x6e446573), 
@@ -30709,10 +32457,10 @@ static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
       ACE_NTOHL (0x74696f6e), 
       ACE_NTOHL (0x0),  // name = OperationDescription
       9, // member count
-      5,
+            5,
       ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
@@ -30725,16 +32473,16 @@ static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
         ACE_NTOHL (0x66696572), 
         ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
+                11,
         ACE_NTOHL (0x4964656e), 
         ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+                CORBA::tk_string, 
         0U, // string length
 
       3,
       ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
@@ -30747,24 +32495,24 @@ static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
         ACE_NTOHL (0x746f7279), 
         ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
+                13,
         ACE_NTOHL (0x5265706f), 
         ACE_NTOHL (0x7369746f), 
         ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+                CORBA::tk_string, 
         0U, // string length
 
       11,
       ACE_NTOHL (0x64656669), 
       ACE_NTOHL (0x6e65645f), 
       ACE_NTOHL (0x696e0000),  // name = defined_in
-      0xffffffff, // indirection
+            0xffffffff, // indirection
       0xffffff9c, // negative offset (-100)
       8,
       ACE_NTOHL (0x76657273), 
       ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
@@ -30777,22 +32525,22 @@ static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
         ACE_NTOHL (0x6e537065), 
         ACE_NTOHL (0x633a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12,
+                12,
         ACE_NTOHL (0x56657273), 
         ACE_NTOHL (0x696f6e53), 
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+                CORBA::tk_string, 
         0U, // string length
 
       7,
       ACE_NTOHL (0x72657375), 
       ACE_NTOHL (0x6c740000),  // name = result
-      CORBA::tk_TypeCode,
+            CORBA::tk_TypeCode,
 
       5,
       ACE_NTOHL (0x6d6f6465), 
       ACE_NTOHL (0x0),  // name = mode
-      CORBA::tk_enum, // typecode kind
+            CORBA::tk_enum, // typecode kind
       100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
@@ -30805,26 +32553,26 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x696f6e4d), 
         ACE_NTOHL (0x6f64653a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-14,
+        14,
         ACE_NTOHL (0x4f706572), 
         ACE_NTOHL (0x6174696f), 
         ACE_NTOHL (0x6e4d6f64), 
         ACE_NTOHL (0x65000000),  // name = OperationMode
         2, // member count
-10,
+        10,
         ACE_NTOHL (0x4f505f4e), 
         ACE_NTOHL (0x4f524d41), 
         ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-10,
+        10,
         ACE_NTOHL (0x4f505f4f), 
         ACE_NTOHL (0x4e455741), 
         ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
+        
       9,
       ACE_NTOHL (0x636f6e74), 
       ACE_NTOHL (0x65787473), 
       ACE_NTOHL (0x0),  // name = contexts
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       168, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
@@ -30837,12 +32585,12 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x74496453), 
         ACE_NTOHL (0x65713a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-        13,
+                13,
         ACE_NTOHL (0x436f6e74), 
         ACE_NTOHL (0x65787449), 
         ACE_NTOHL (0x64536571), 
         ACE_NTOHL (0x0),  // name = ContextIdSeq
-        CORBA::tk_sequence, // typecode kind
+                CORBA::tk_sequence, // typecode kind
         96, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           CORBA::tk_alias, // typecode kind for typedefs
@@ -30859,13 +32607,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             ACE_NTOHL (0x6e746966), 
             ACE_NTOHL (0x6965723a), 
             ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-            18,
+                        18,
             ACE_NTOHL (0x436f6e74), 
             ACE_NTOHL (0x65787449), 
             ACE_NTOHL (0x64656e74), 
             ACE_NTOHL (0x69666965), 
             ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-            0xffffffff, // indirection
+                        0xffffffff, // indirection
             0xfffffdac, // negative offset (-596)
 
           0U,
@@ -30875,7 +32623,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       ACE_NTOHL (0x70617261), 
       ACE_NTOHL (0x6d657465), 
       ACE_NTOHL (0x72730000),  // name = parameters
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       428, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
@@ -30889,13 +32637,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x5365713a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-        18,
+                18,
         ACE_NTOHL (0x50617244), 
         ACE_NTOHL (0x65736372), 
         ACE_NTOHL (0x69707469), 
         ACE_NTOHL (0x6f6e5365), 
         ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-        CORBA::tk_sequence, // typecode kind
+                CORBA::tk_sequence, // typecode kind
         348, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           CORBA::tk_struct, // typecode kind
@@ -30913,7 +32661,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             ACE_NTOHL (0x69707469), 
             ACE_NTOHL (0x6f6e3a31), 
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-            21,
+                        21,
             ACE_NTOHL (0x50617261), 
             ACE_NTOHL (0x6d657465), 
             ACE_NTOHL (0x72446573), 
@@ -30921,21 +32669,21 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             ACE_NTOHL (0x74696f6e), 
             ACE_NTOHL (0x0),  // name = ParameterDescription
             4, // member count
-            5,
+                        5,
             ACE_NTOHL (0x6e616d65), 
             ACE_NTOHL (0x0),  // name = name
-            0xffffffff, // indirection
+                        0xffffffff, // indirection
             0xfffffccc, // negative offset (-820)
             5,
             ACE_NTOHL (0x74797065), 
             ACE_NTOHL (0x0),  // name = type
-            CORBA::tk_TypeCode,
+                        CORBA::tk_TypeCode,
 
             9,
             ACE_NTOHL (0x74797065), 
             ACE_NTOHL (0x5f646566), 
             ACE_NTOHL (0x0),  // name = type_def
-            CORBA::tk_objref, // typecode kind
+                        CORBA::tk_objref, // typecode kind
             52, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               30,
@@ -30947,14 +32695,14 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               ACE_NTOHL (0x4c547970), 
               ACE_NTOHL (0x653a312e), 
               ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-              8,
+                            8,
               ACE_NTOHL (0x49444c54), 
               ACE_NTOHL (0x79706500),  // name = IDLType
-
+              
             5,
             ACE_NTOHL (0x6d6f6465), 
             ACE_NTOHL (0x0),  // name = mode
-            CORBA::tk_enum, // typecode kind
+                        CORBA::tk_enum, // typecode kind
             116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
               36,
@@ -30967,25 +32715,25 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               ACE_NTOHL (0x7465724d), 
               ACE_NTOHL (0x6f64653a), 
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-14,
+              14,
               ACE_NTOHL (0x50617261), 
               ACE_NTOHL (0x6d657465), 
               ACE_NTOHL (0x724d6f64), 
               ACE_NTOHL (0x65000000),  // name = ParameterMode
               3, // member count
-9,
+              9,
               ACE_NTOHL (0x50415241), 
               ACE_NTOHL (0x4d5f494e), 
               ACE_NTOHL (0x0),  // name = PARAM_IN
-10,
+              10,
               ACE_NTOHL (0x50415241), 
               ACE_NTOHL (0x4d5f4f55), 
               ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-12,
+              12,
               ACE_NTOHL (0x50415241), 
               ACE_NTOHL (0x4d5f494e), 
               ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+              
 
           0U,
 
@@ -30994,7 +32742,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       ACE_NTOHL (0x65786365), 
       ACE_NTOHL (0x7074696f), 
       ACE_NTOHL (0x6e730000),  // name = exceptions
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       276, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
@@ -31008,13 +32756,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x5365713a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-        18,
+                18,
         ACE_NTOHL (0x45786344), 
         ACE_NTOHL (0x65736372), 
         ACE_NTOHL (0x69707469), 
         ACE_NTOHL (0x6f6e5365), 
         ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-        CORBA::tk_sequence, // typecode kind
+                CORBA::tk_sequence, // typecode kind
         196, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           CORBA::tk_struct, // typecode kind
@@ -31032,7 +32780,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             ACE_NTOHL (0x69707469), 
             ACE_NTOHL (0x6f6e3a31), 
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-            21,
+                        21,
             ACE_NTOHL (0x45786365), 
             ACE_NTOHL (0x7074696f), 
             ACE_NTOHL (0x6e446573), 
@@ -31040,30 +32788,30 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             ACE_NTOHL (0x74696f6e), 
             ACE_NTOHL (0x0),  // name = ExceptionDescription
             5, // member count
-            5,
+                        5,
             ACE_NTOHL (0x6e616d65), 
             ACE_NTOHL (0x0),  // name = name
-            0xffffffff, // indirection
+                        0xffffffff, // indirection
             0xfffffb08, // negative offset (-1272)
             3,
             ACE_NTOHL (0x69640000),  // name = id
-            0xffffffff, // indirection
+                        0xffffffff, // indirection
             0xfffffb4c, // negative offset (-1204)
             11,
             ACE_NTOHL (0x64656669), 
             ACE_NTOHL (0x6e65645f), 
             ACE_NTOHL (0x696e0000),  // name = defined_in
-            0xffffffff, // indirection
+                        0xffffffff, // indirection
             0xfffffb34, // negative offset (-1228)
             8,
             ACE_NTOHL (0x76657273), 
             ACE_NTOHL (0x696f6e00),  // name = version
-            0xffffffff, // indirection
+                        0xffffffff, // indirection
             0xfffffb94, // negative offset (-1132)
             5,
             ACE_NTOHL (0x74797065), 
             ACE_NTOHL (0x0),  // name = type
-            CORBA::tk_TypeCode,
+                        CORBA::tk_TypeCode,
 
 
           0U,
@@ -31092,7 +32840,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -31151,7 +32899,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::~_TAO_Unbounded_Sequenc
 #define _CORBA_ATTRDESCRIPTIONSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::AttrDescriptionSeq
@@ -31213,7 +32961,7 @@ void CORBA::AttrDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
 {
@@ -31230,13 +32978,13 @@ static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
   ACE_NTOHL (0x6e536571), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
-  19,
+    19,
   ACE_NTOHL (0x41747472), 
   ACE_NTOHL (0x44657363), 
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e53), 
   ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   528, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
@@ -31254,7 +33002,7 @@ static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
       ACE_NTOHL (0x69707469), 
       ACE_NTOHL (0x6f6e3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-      21,
+            21,
       ACE_NTOHL (0x41747472), 
       ACE_NTOHL (0x69627574), 
       ACE_NTOHL (0x65446573), 
@@ -31262,10 +33010,10 @@ static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
       ACE_NTOHL (0x74696f6e), 
       ACE_NTOHL (0x0),  // name = AttributeDescription
       6, // member count
-      5,
+            5,
       ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
@@ -31278,16 +33026,16 @@ static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
         ACE_NTOHL (0x66696572), 
         ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
+                11,
         ACE_NTOHL (0x4964656e), 
         ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+                CORBA::tk_string, 
         0U, // string length
 
       3,
       ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
@@ -31300,24 +33048,24 @@ static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
         ACE_NTOHL (0x746f7279), 
         ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
+                13,
         ACE_NTOHL (0x5265706f), 
         ACE_NTOHL (0x7369746f), 
         ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+                CORBA::tk_string, 
         0U, // string length
 
       11,
       ACE_NTOHL (0x64656669), 
       ACE_NTOHL (0x6e65645f), 
       ACE_NTOHL (0x696e0000),  // name = defined_in
-      0xffffffff, // indirection
+            0xffffffff, // indirection
       0xffffff9c, // negative offset (-100)
       8,
       ACE_NTOHL (0x76657273), 
       ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
@@ -31330,22 +33078,22 @@ static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
         ACE_NTOHL (0x6e537065), 
         ACE_NTOHL (0x633a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12,
+                12,
         ACE_NTOHL (0x56657273), 
         ACE_NTOHL (0x696f6e53), 
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+                CORBA::tk_string, 
         0U, // string length
 
       5,
       ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
+            CORBA::tk_TypeCode,
 
       5,
       ACE_NTOHL (0x6d6f6465), 
       ACE_NTOHL (0x0),  // name = mode
-      CORBA::tk_enum, // typecode kind
+            CORBA::tk_enum, // typecode kind
       104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
@@ -31358,22 +33106,22 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x7574654d), 
         ACE_NTOHL (0x6f64653a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-14,
+        14,
         ACE_NTOHL (0x41747472), 
         ACE_NTOHL (0x69627574), 
         ACE_NTOHL (0x654d6f64), 
         ACE_NTOHL (0x65000000),  // name = AttributeMode
         2, // member count
-12,
+        12,
         ACE_NTOHL (0x41545452), 
         ACE_NTOHL (0x5f4e4f52), 
         ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-14,
+        14,
         ACE_NTOHL (0x41545452), 
         ACE_NTOHL (0x5f524541), 
         ACE_NTOHL (0x444f4e4c), 
         ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+        
 
     0U,
 
@@ -31396,8 +33144,402 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXTATTRDESCRIPTIONSEQ_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXTATTRDESCRIPTIONSEQ_CS_
+
+void
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::ExtAttributeDescription* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::ExtAttributeDescription *old =
+        ACE_reinterpret_cast (CORBA::ExtAttributeDescription *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::freebuf (old);
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
+
+void
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ExtAttributeDescription *tmp =
+    ACE_reinterpret_cast (CORBA::ExtAttributeDescription *, this->buffer_);
+  _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (void)
+{
+  this->_deallocate_buffer ();
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ_CS_)
+#define _CORBA_EXTATTRDESCRIPTIONSEQ_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
+
+// *************************************************************
+// CORBA::ExtAttrDescriptionSeq
+// *************************************************************
+
+CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (void)
+{}
+
+CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ExtAttributeDescription>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ExtAttributeDescription *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ExtAttributeDescription>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (const ExtAttrDescriptionSeq &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ExtAttributeDescription>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ExtAttrDescriptionSeq::~ExtAttrDescriptionSeq (void) // dtor
+{}
+
+void CORBA::ExtAttrDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtAttrDescriptionSeq *tmp = ACE_static_cast (ExtAttrDescriptionSeq*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExtAttrDescriptionSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74417474), 
+  ACE_NTOHL (0x72446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x5365713a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
+    22,
+  ACE_NTOHL (0x45787441), 
+  ACE_NTOHL (0x74747244), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e5365), 
+  ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
+    CORBA::tk_sequence, // typecode kind
+  864, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    848, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      46,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x74417474), 
+      ACE_NTOHL (0x72696275), 
+      ACE_NTOHL (0x74654465), 
+      ACE_NTOHL (0x73637269), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e3a312e), 
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
+            24,
+      ACE_NTOHL (0x45787441), 
+      ACE_NTOHL (0x74747269), 
+      ACE_NTOHL (0x62757465), 
+      ACE_NTOHL (0x44657363), 
+      ACE_NTOHL (0x72697074), 
+      ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
+      8, // member count
+            5,
+      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x0),  // name = name
+            CORBA::tk_alias, // typecode kind for typedefs
+      68, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        33,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                11,
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x65720000),  // name = Identifier
+                CORBA::tk_string, 
+        0U, // string length
+
+      3,
+      ACE_NTOHL (0x69640000),  // name = id
+            CORBA::tk_alias, // typecode kind for typedefs
+      72, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        35,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                13,
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x0),  // name = RepositoryId
+                CORBA::tk_string, 
+        0U, // string length
+
+      11,
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x696e0000),  // name = defined_in
+            0xffffffff, // indirection
+      0xffffff9c, // negative offset (-100)
+      8,
+      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x696f6e00),  // name = version
+            CORBA::tk_alias, // typecode kind for typedefs
+      68, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        34,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                12,
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x70656300),  // name = VersionSpec
+                CORBA::tk_string, 
+        0U, // string length
+
+      5,
+      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x0),  // name = type
+            CORBA::tk_TypeCode,
+
+      5,
+      ACE_NTOHL (0x6d6f6465), 
+      ACE_NTOHL (0x0),  // name = mode
+            CORBA::tk_enum, // typecode kind
+      104, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+        36,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4174), 
+        ACE_NTOHL (0x74726962), 
+        ACE_NTOHL (0x7574654d), 
+        ACE_NTOHL (0x6f64653a), 
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
+        14,
+        ACE_NTOHL (0x41747472), 
+        ACE_NTOHL (0x69627574), 
+        ACE_NTOHL (0x654d6f64), 
+        ACE_NTOHL (0x65000000),  // name = AttributeMode
+        2, // member count
+        12,
+        ACE_NTOHL (0x41545452), 
+        ACE_NTOHL (0x5f4e4f52), 
+        ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
+        14,
+        ACE_NTOHL (0x41545452), 
+        ACE_NTOHL (0x5f524541), 
+        ACE_NTOHL (0x444f4e4c), 
+        ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
+        
+      15,
+      ACE_NTOHL (0x6765745f), 
+      ACE_NTOHL (0x65786365), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e730000),  // name = get_exceptions
+            CORBA::tk_alias, // typecode kind for typedefs
+      276, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        40,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x63446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x5365713a), 
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+                18,
+        ACE_NTOHL (0x45786344), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e5365), 
+        ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+                CORBA::tk_sequence, // typecode kind
+        196, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          CORBA::tk_struct, // typecode kind
+          180, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            43,
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x434f5242), 
+            ACE_NTOHL (0x412f4578), 
+            ACE_NTOHL (0x63657074), 
+            ACE_NTOHL (0x696f6e44), 
+            ACE_NTOHL (0x65736372), 
+            ACE_NTOHL (0x69707469), 
+            ACE_NTOHL (0x6f6e3a31), 
+            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                        21,
+            ACE_NTOHL (0x45786365), 
+            ACE_NTOHL (0x7074696f), 
+            ACE_NTOHL (0x6e446573), 
+            ACE_NTOHL (0x63726970), 
+            ACE_NTOHL (0x74696f6e), 
+            ACE_NTOHL (0x0),  // name = ExceptionDescription
+            5, // member count
+                        5,
+            ACE_NTOHL (0x6e616d65), 
+            ACE_NTOHL (0x0),  // name = name
+                        0xffffffff, // indirection
+            0xfffffd84, // negative offset (-636)
+            3,
+            ACE_NTOHL (0x69640000),  // name = id
+                        0xffffffff, // indirection
+            0xfffffdc8, // negative offset (-568)
+            11,
+            ACE_NTOHL (0x64656669), 
+            ACE_NTOHL (0x6e65645f), 
+            ACE_NTOHL (0x696e0000),  // name = defined_in
+                        0xffffffff, // indirection
+            0xfffffdb0, // negative offset (-592)
+            8,
+            ACE_NTOHL (0x76657273), 
+            ACE_NTOHL (0x696f6e00),  // name = version
+                        0xffffffff, // indirection
+            0xfffffe10, // negative offset (-496)
+            5,
+            ACE_NTOHL (0x74797065), 
+            ACE_NTOHL (0x0),  // name = type
+                        CORBA::tk_TypeCode,
+
+
+          0U,
+
+
+      15,
+      ACE_NTOHL (0x7075745f), 
+      ACE_NTOHL (0x65786365), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e730000),  // name = put_exceptions
+            0xffffffff, // indirection
+      0xfffffecc, // negative offset (-308)
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtAttrDescriptionSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ExtAttrDescriptionSeq),
+    (char *) &_oc_CORBA_ExtAttrDescriptionSeq,
+    0,
+    sizeof (CORBA::ExtAttrDescriptionSeq)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtAttrDescriptionSeq,
+    &_tc_TAO_tc_CORBA_ExtAttrDescriptionSeq
+  )
+TAO_NAMESPACE_END
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::InterfaceDef::_tao_class_id = 0;
 
@@ -31444,8 +33586,17 @@ tao_CORBA_InterfaceDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_InterfaceDef_marshal (
+    CORBA::InterfaceDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::InterfaceDef_var
@@ -31571,7 +33722,7 @@ CORBA::InterfaceDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::InterfaceDef_out
@@ -31633,12 +33784,12 @@ CORBA::InterfaceDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get : public TAO_ClientRequestInfo_i
 {
@@ -31667,7 +33818,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -31725,7 +33876,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (::CORBA::I
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set : public TAO_ClientRequestInfo_i
 {
@@ -31752,7 +33903,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_InterfaceDef_base_interfaces_set::TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -31812,7 +33963,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (ACE_ENV_SI
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a : public TAO_ClientRequestInfo_i
 {
@@ -31843,7 +33994,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_InterfaceDef_is_a::TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -31911,7 +34062,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Boolean result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface : public TAO_ClientRequestInfo_i
 {
@@ -31940,7 +34091,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_InterfaceDef_describe_interface::TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -31998,7 +34149,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (::CORBA::In
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute : public TAO_ClientRequestInfo_i
 {
@@ -32037,7 +34188,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_InterfaceDef_create_attribute::TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -32129,7 +34280,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (::CORBA::Attr
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation : public TAO_ClientRequestInfo_i
 {
@@ -32174,7 +34325,7 @@ public:
   };
   
   // TAO_IDL - Generated from
-  // 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_InterfaceDef_create_operation::TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation (
       TAO_GIOP_Invocation *_tao_invocation,
@@ -32286,7 +34437,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (::CORBA::Oper
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -32301,7 +34452,7 @@ CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::InterfaceDefSeq * CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
     CORBA::Object *_collocated_tao_target_
@@ -32374,82 +34525,74 @@ CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::InterfaceDefSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::InterfaceDefSeq * _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
         {
@@ -32460,7 +34603,7 @@ CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -32484,7 +34627,7 @@ CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -32496,24 +34639,26 @@ CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
     CORBA::Object *_collocated_tao_target_,
@@ -32581,74 +34726,66 @@ void CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << base_interfaces)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << base_interfaces)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -32659,7 +34796,7 @@ void CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -32683,7 +34820,7 @@ void CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -32695,22 +34832,24 @@ void CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
       ACE_ENDTRY;
       ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
     CORBA::Object *_collocated_tao_target_,
@@ -32779,94 +34918,86 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
           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);
+          
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << interface_id)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  _tao_retval
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << interface_id)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      _tao_retval
-                    );
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-                  
-                  if (!(
-                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Boolean _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::Boolean _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -32877,7 +35008,7 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -32901,7 +35032,7 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -32913,24 +35044,26 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
       
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::InterfaceDef::FullInterfaceDescription * CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::describe_interface (
     CORBA::Object *_collocated_tao_target_
@@ -33003,82 +35136,74 @@ return _tao_retval;
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::InterfaceDef::FullInterfaceDescription * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::InterfaceDef::FullInterfaceDescription * _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
         {
@@ -33089,7 +35214,7 @@ return _tao_retval;
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -33113,7 +35238,7 @@ return _tao_retval;
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -33125,24 +35250,26 @@ return _tao_retval;
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::AttributeDef_ptr CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::create_attribute (
     CORBA::Object *_collocated_tao_target_,
@@ -33219,99 +35346,91 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << type) &&
+              (_tao_out << mode)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << type) &&
-                  (_tao_out << mode)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::AttributeDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::AttributeDef_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
         {
@@ -33322,7 +35441,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -33346,7 +35465,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -33358,24 +35477,26 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::OperationDef_ptr CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
     CORBA::Object *_collocated_tao_target_,
@@ -33458,102 +35579,94 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << result) &&
+              (_tao_out << mode) &&
+              (_tao_out << params) &&
+              (_tao_out << exceptions) &&
+              (_tao_out << contexts)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << result) &&
-                  (_tao_out << mode) &&
-                  (_tao_out << params) &&
-                  (_tao_out << exceptions) &&
-                  (_tao_out << contexts)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::OperationDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::OperationDef_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
         {
@@ -33564,7 +35677,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -33588,7 +35701,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -33600,20 +35713,22 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 //
@@ -33621,7 +35736,7 @@ return _tao_retval._retn ();
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -33669,7 +35784,7 @@ CORBA::_TAO_InterfaceDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::InterfaceDef::InterfaceDef (int collocated)
 {
@@ -33946,7 +36061,7 @@ const char* CORBA::InterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::InterfaceDefSeq * CORBA::InterfaceDef::base_interfaces (
     ACE_ENV_SINGLE_ARG_DECL
@@ -33966,7 +36081,7 @@ const char* CORBA::InterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::InterfaceDef::base_interfaces (
     const CORBA::InterfaceDefSeq & base_interfaces
@@ -33988,7 +36103,7 @@ void CORBA::InterfaceDef::base_interfaces (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::Boolean CORBA::InterfaceDef::is_a (
     const char * interface_id
@@ -34010,7 +36125,7 @@ CORBA::Boolean CORBA::InterfaceDef::is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
 {
@@ -34031,7 +36146,7 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef/FullInterfaceDescription:1.0
-  25,
+    25,
   ACE_NTOHL (0x46756c6c), 
   ACE_NTOHL (0x496e7465), 
   ACE_NTOHL (0x72666163), 
@@ -34040,10 +36155,10 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
   ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = FullInterfaceDescription
   8, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -34056,16 +36171,16 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
     ACE_NTOHL (0x66696572), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
@@ -34078,24 +36193,24 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
     ACE_NTOHL (0x746f7279), 
     ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
+        13,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x64656669), 
   ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
   ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
@@ -34108,18 +36223,18 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
     ACE_NTOHL (0x6e537065), 
     ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
+        12,
     ACE_NTOHL (0x56657273), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x6f706572), 
   ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e730000),  // name = operations
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   1340, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
@@ -34133,13 +36248,13 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
-    17,
+        17,
     ACE_NTOHL (0x4f704465), 
     ACE_NTOHL (0x73637269), 
     ACE_NTOHL (0x7074696f), 
     ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     1260, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
@@ -34157,7 +36272,7 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
         ACE_NTOHL (0x69707469), 
         ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
-        21,
+                21,
         ACE_NTOHL (0x4f706572), 
         ACE_NTOHL (0x6174696f), 
         ACE_NTOHL (0x6e446573), 
@@ -34165,35 +36280,35 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
         ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
-        5,
+                5,
         ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffe14, // negative offset (-492)
         3,
         ACE_NTOHL (0x69640000),  // name = id
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffe58, // negative offset (-424)
         11,
         ACE_NTOHL (0x64656669), 
         ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffe40, // negative offset (-448)
         8,
         ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffea0, // negative offset (-352)
         7,
         ACE_NTOHL (0x72657375), 
         ACE_NTOHL (0x6c740000),  // name = result
-        CORBA::tk_TypeCode,
+                CORBA::tk_TypeCode,
 
         5,
         ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
+                CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
@@ -34206,26 +36321,26 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           ACE_NTOHL (0x696f6e4d), 
           ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-14,
+          14,
           ACE_NTOHL (0x4f706572), 
           ACE_NTOHL (0x6174696f), 
           ACE_NTOHL (0x6e4d6f64), 
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
-10,
+          10,
           ACE_NTOHL (0x4f505f4e), 
           ACE_NTOHL (0x4f524d41), 
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-10,
+          10,
           ACE_NTOHL (0x4f505f4f), 
           ACE_NTOHL (0x4e455741), 
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
+          
         9,
         ACE_NTOHL (0x636f6e74), 
         ACE_NTOHL (0x65787473), 
         ACE_NTOHL (0x0),  // name = contexts
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         168, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
@@ -34238,12 +36353,12 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           ACE_NTOHL (0x74496453), 
           ACE_NTOHL (0x65713a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-          13,
+                    13,
           ACE_NTOHL (0x436f6e74), 
           ACE_NTOHL (0x65787449), 
           ACE_NTOHL (0x64536571), 
           ACE_NTOHL (0x0),  // name = ContextIdSeq
-          CORBA::tk_sequence, // typecode kind
+                    CORBA::tk_sequence, // typecode kind
           96, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_alias, // typecode kind for typedefs
@@ -34260,13 +36375,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               ACE_NTOHL (0x6e746966), 
               ACE_NTOHL (0x6965723a), 
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-              18,
+                            18,
               ACE_NTOHL (0x436f6e74), 
               ACE_NTOHL (0x65787449), 
               ACE_NTOHL (0x64656e74), 
               ACE_NTOHL (0x69666965), 
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffffc94, // negative offset (-876)
 
             0U,
@@ -34276,7 +36391,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x70617261), 
         ACE_NTOHL (0x6d657465), 
         ACE_NTOHL (0x72730000),  // name = parameters
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         428, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
@@ -34290,13 +36405,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           ACE_NTOHL (0x74696f6e), 
           ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-          18,
+                    18,
           ACE_NTOHL (0x50617244), 
           ACE_NTOHL (0x65736372), 
           ACE_NTOHL (0x69707469), 
           ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
+                    CORBA::tk_sequence, // typecode kind
           348, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
@@ -34314,7 +36429,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               ACE_NTOHL (0x69707469), 
               ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-              21,
+                            21,
               ACE_NTOHL (0x50617261), 
               ACE_NTOHL (0x6d657465), 
               ACE_NTOHL (0x72446573), 
@@ -34322,21 +36437,21 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
-              5,
+                            5,
               ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffffbb4, // negative offset (-1100)
               5,
               ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
+                            CORBA::tk_TypeCode,
 
               9,
               ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x5f646566), 
               ACE_NTOHL (0x0),  // name = type_def
-              CORBA::tk_objref, // typecode kind
+                            CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
@@ -34348,14 +36463,14 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 ACE_NTOHL (0x4c547970), 
                 ACE_NTOHL (0x653a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                8,
+                                8,
                 ACE_NTOHL (0x49444c54), 
                 ACE_NTOHL (0x79706500),  // name = IDLType
-
+                
               5,
               ACE_NTOHL (0x6d6f6465), 
               ACE_NTOHL (0x0),  // name = mode
-              CORBA::tk_enum, // typecode kind
+                            CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
@@ -34368,25 +36483,25 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 ACE_NTOHL (0x7465724d), 
                 ACE_NTOHL (0x6f64653a), 
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-14,
+                14,
                 ACE_NTOHL (0x50617261), 
                 ACE_NTOHL (0x6d657465), 
                 ACE_NTOHL (0x724d6f64), 
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
-9,
+                9,
                 ACE_NTOHL (0x50415241), 
                 ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x0),  // name = PARAM_IN
-10,
+                10,
                 ACE_NTOHL (0x50415241), 
                 ACE_NTOHL (0x4d5f4f55), 
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-12,
+                12,
                 ACE_NTOHL (0x50415241), 
                 ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+                
 
             0U,
 
@@ -34395,7 +36510,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x65786365), 
         ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = exceptions
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         276, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
@@ -34409,13 +36524,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           ACE_NTOHL (0x74696f6e), 
           ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-          18,
+                    18,
           ACE_NTOHL (0x45786344), 
           ACE_NTOHL (0x65736372), 
           ACE_NTOHL (0x69707469), 
           ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
+                    CORBA::tk_sequence, // typecode kind
           196, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
@@ -34433,7 +36548,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               ACE_NTOHL (0x69707469), 
               ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-              21,
+                            21,
               ACE_NTOHL (0x45786365), 
               ACE_NTOHL (0x7074696f), 
               ACE_NTOHL (0x6e446573), 
@@ -34441,30 +36556,30 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
-              5,
+                            5,
               ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffff9f0, // negative offset (-1552)
               3,
               ACE_NTOHL (0x69640000),  // name = id
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffffa34, // negative offset (-1484)
               11,
               ACE_NTOHL (0x64656669), 
               ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffffa1c, // negative offset (-1508)
               8,
               ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffffa7c, // negative offset (-1412)
               5,
               ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
+                            CORBA::tk_TypeCode,
 
 
             0U,
@@ -34478,7 +36593,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
   ACE_NTOHL (0x61747472), 
   ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65730000),  // name = attributes
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   404, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
@@ -34493,13 +36608,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
-    19,
+        19,
     ACE_NTOHL (0x41747472), 
     ACE_NTOHL (0x44657363), 
     ACE_NTOHL (0x72697074), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     320, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
@@ -34517,7 +36632,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x69707469), 
         ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-        21,
+                21,
         ACE_NTOHL (0x41747472), 
         ACE_NTOHL (0x69627574), 
         ACE_NTOHL (0x65446573), 
@@ -34525,35 +36640,35 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = AttributeDescription
         6, // member count
-        5,
+                5,
         ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff8bc, // negative offset (-1860)
         3,
         ACE_NTOHL (0x69640000),  // name = id
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff900, // negative offset (-1792)
         11,
         ACE_NTOHL (0x64656669), 
         ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff8e8, // negative offset (-1816)
         8,
         ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff948, // negative offset (-1720)
         5,
         ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
+                CORBA::tk_TypeCode,
 
         5,
         ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
+                CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
@@ -34566,22 +36681,22 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           ACE_NTOHL (0x7574654d), 
           ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-14,
+          14,
           ACE_NTOHL (0x41747472), 
           ACE_NTOHL (0x69627574), 
           ACE_NTOHL (0x654d6f64), 
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
-12,
+          12,
           ACE_NTOHL (0x41545452), 
           ACE_NTOHL (0x5f4e4f52), 
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-14,
+          14,
           ACE_NTOHL (0x41545452), 
           ACE_NTOHL (0x5f524541), 
           ACE_NTOHL (0x444f4e4c), 
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+          
 
       0U,
 
@@ -34591,7 +36706,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
   ACE_NTOHL (0x5f696e74), 
   ACE_NTOHL (0x65726661), 
   ACE_NTOHL (0x63657300),  // name = base_interfaces
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   92, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
@@ -34605,12 +36720,12 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x49645365), 
     ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-    16,
+        16,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       0xffffffff, // indirection
@@ -34621,7 +36736,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
   5,
   ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
+    CORBA::tk_TypeCode,
 
 };
 
@@ -34637,7 +36752,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDef_FullInterfaceDescription (
   &_tc_TAO_tc_CORBA_InterfaceDef_FullInterfaceDescription;
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -34646,7 +36761,7 @@ void CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::InterfaceDef::FullInterfaceDescription * CORBA::InterfaceDef::describe_interface (
     ACE_ENV_SINGLE_ARG_DECL
@@ -34666,7 +36781,7 @@ void CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::AttributeDef_ptr CORBA::InterfaceDef::create_attribute (
     const char * id,
@@ -34696,7 +36811,7 @@ void CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::OperationDef_ptr CORBA::InterfaceDef::create_operation (
     const char * id,
@@ -34732,7 +36847,7 @@ void CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_InterfaceDef[] =
 {
@@ -34747,12 +36862,12 @@ static const CORBA::Long _oc_CORBA_InterfaceDef[] =
   ACE_NTOHL (0x61636544), 
   ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-  13,
+    13,
   ACE_NTOHL (0x496e7465), 
   ACE_NTOHL (0x72666163), 
   ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x0),  // name = InterfaceDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDef (
     CORBA::tk_objref,
@@ -34772,7 +36887,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
 {
@@ -34789,7 +36904,7 @@ static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
   ACE_NTOHL (0x69707469), 
   ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDescription:1.0
-  21,
+    21,
   ACE_NTOHL (0x496e7465), 
   ACE_NTOHL (0x72666163), 
   ACE_NTOHL (0x65446573), 
@@ -34797,10 +36912,10 @@ static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
   ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = InterfaceDescription
   5, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -34813,16 +36928,16 @@ static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
     ACE_NTOHL (0x66696572), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
@@ -34835,24 +36950,24 @@ static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
     ACE_NTOHL (0x746f7279), 
     ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
+        13,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x64656669), 
   ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
   ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
@@ -34865,11 +36980,11 @@ static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
     ACE_NTOHL (0x6e537065), 
     ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
+        12,
     ACE_NTOHL (0x56657273), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   16,
@@ -34877,7 +36992,7 @@ static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
   ACE_NTOHL (0x5f696e74), 
   ACE_NTOHL (0x65726661), 
   ACE_NTOHL (0x63657300),  // name = base_interfaces
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   92, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
@@ -34891,12 +37006,12 @@ static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
     ACE_NTOHL (0x49645365), 
     ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-    16,
+        16,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       0xffffffff, // indirection
@@ -34924,7 +37039,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::InterfaceDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -34933,7 +37048,2627 @@ void CORBA::InterfaceDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
+int CORBA::InterfaceAttrExtension::_tao_class_id = 0;
+
+CORBA::InterfaceAttrExtension_ptr
+tao_CORBA_InterfaceAttrExtension_duplicate (
+    CORBA::InterfaceAttrExtension_ptr p
+  )
+{
+  return CORBA::InterfaceAttrExtension::_duplicate (p);
+}
+
+void
+tao_CORBA_InterfaceAttrExtension_release (
+    CORBA::InterfaceAttrExtension_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA::InterfaceAttrExtension_ptr
+tao_CORBA_InterfaceAttrExtension_nil (
+    void
+  )
+{
+  return CORBA::InterfaceAttrExtension::_nil ();
+}
+
+CORBA::InterfaceAttrExtension_ptr
+tao_CORBA_InterfaceAttrExtension_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return CORBA::InterfaceAttrExtension::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+tao_CORBA_InterfaceAttrExtension_upcast (
+    void *src
+  )
+{
+  CORBA::InterfaceAttrExtension **tmp =
+    ACE_static_cast (CORBA::InterfaceAttrExtension **, src);
+  return *tmp;
+}
+
+CORBA::Boolean
+tao_CORBA_InterfaceAttrExtension_marshal (
+    CORBA::InterfaceAttrExtension_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
+// *************************************************************
+// CORBA::InterfaceAttrExtension_var
+// *************************************************************
+
+CORBA::InterfaceAttrExtension_var::InterfaceAttrExtension_var (void)
+  : ptr_ (InterfaceAttrExtension::_nil ())
+{}
+
+::CORBA::InterfaceAttrExtension_ptr
+CORBA::InterfaceAttrExtension_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA::InterfaceAttrExtension_var::InterfaceAttrExtension_var (const ::CORBA::InterfaceAttrExtension_var &p)
+  : TAO_Base_var (),
+    ptr_ (InterfaceAttrExtension::_duplicate (p.ptr ()))
+{}
+
+CORBA::InterfaceAttrExtension_var::~InterfaceAttrExtension_var (void)
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA::InterfaceAttrExtension_var &
+CORBA::InterfaceAttrExtension_var::operator= (InterfaceAttrExtension_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::InterfaceAttrExtension_var &
+CORBA::InterfaceAttrExtension_var::operator= (const ::CORBA::InterfaceAttrExtension_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA::InterfaceAttrExtension::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA::InterfaceAttrExtension_var::operator const ::CORBA::InterfaceAttrExtension_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA::InterfaceAttrExtension_var::operator ::CORBA::InterfaceAttrExtension_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA::InterfaceAttrExtension_ptr
+CORBA::InterfaceAttrExtension_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::InterfaceAttrExtension_ptr
+CORBA::InterfaceAttrExtension_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::InterfaceAttrExtension_ptr &
+CORBA::InterfaceAttrExtension_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::InterfaceAttrExtension_ptr &
+CORBA::InterfaceAttrExtension_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::InterfaceAttrExtension::_nil ();
+  return this->ptr_;
+}
+
+::CORBA::InterfaceAttrExtension_ptr
+CORBA::InterfaceAttrExtension_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA::InterfaceAttrExtension_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::InterfaceAttrExtension::_nil ();
+  return val;
+}
+
+::CORBA::InterfaceAttrExtension_ptr
+CORBA::InterfaceAttrExtension_var::tao_duplicate (InterfaceAttrExtension_ptr p)
+{
+  return ::CORBA::InterfaceAttrExtension::_duplicate (p);
+}
+
+void
+CORBA::InterfaceAttrExtension_var::tao_release (InterfaceAttrExtension_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA::InterfaceAttrExtension_ptr
+CORBA::InterfaceAttrExtension_var::tao_nil (void)
+{
+  return ::CORBA::InterfaceAttrExtension::_nil ();
+}
+
+::CORBA::InterfaceAttrExtension_ptr
+CORBA::InterfaceAttrExtension_var::tao_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return ::CORBA::InterfaceAttrExtension::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+CORBA::InterfaceAttrExtension_var::tao_upcast (void *src)
+{
+  InterfaceAttrExtension **tmp =
+    ACE_static_cast (InterfaceAttrExtension **, src);
+  return *tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
+// *************************************************************
+// CORBA::InterfaceAttrExtension_out
+// *************************************************************
+
+CORBA::InterfaceAttrExtension_out::InterfaceAttrExtension_out (InterfaceAttrExtension_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA::InterfaceAttrExtension::_nil ();
+}
+
+CORBA::InterfaceAttrExtension_out::InterfaceAttrExtension_out (InterfaceAttrExtension_var &p)
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::InterfaceAttrExtension::_nil ();
+}
+
+CORBA::InterfaceAttrExtension_out::InterfaceAttrExtension_out (const ::CORBA::InterfaceAttrExtension_out &p)
+  : ptr_ (ACE_const_cast (InterfaceAttrExtension_out &, p).ptr_)
+{}
+
+::CORBA::InterfaceAttrExtension_out &
+CORBA::InterfaceAttrExtension_out::operator= (const ::CORBA::InterfaceAttrExtension_out &p)
+{
+  this->ptr_ = ACE_const_cast (InterfaceAttrExtension_out&, p).ptr_;
+  return *this;
+}
+
+CORBA::InterfaceAttrExtension_out &
+CORBA::InterfaceAttrExtension_out::operator= (const ::CORBA::InterfaceAttrExtension_var &p)
+{
+  this->ptr_ = ::CORBA::InterfaceAttrExtension::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA::InterfaceAttrExtension_out &
+CORBA::InterfaceAttrExtension_out::operator= (InterfaceAttrExtension_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::InterfaceAttrExtension_out::operator ::CORBA::InterfaceAttrExtension_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA::InterfaceAttrExtension_ptr &
+CORBA::InterfaceAttrExtension_out::ptr (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::InterfaceAttrExtension_ptr
+CORBA::InterfaceAttrExtension_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface (const TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface &);
+    
+    ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * _result;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
+void 
+TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::result (::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * result)
+{
+  // Update the result. 
+  this->_result = result;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::IDLType_ptr type,
+      CORBA::AttributeMode & mode,
+      const CORBA::ExceptionDefSeq & get_exceptions,
+      const CORBA::ExceptionDefSeq & set_exceptions
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::ExtAttributeDef_ptr result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute (const TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute &);
+    const char * id_;
+    const char * name_;
+    const char * version_;
+    CORBA::IDLType_ptr type_;
+    const CORBA::AttributeMode & mode_;
+    const CORBA::ExceptionDefSeq & get_exceptions_;
+    const CORBA::ExceptionDefSeq & set_exceptions_;
+    
+    ::CORBA::ExtAttributeDef_ptr _result;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::IDLType_ptr type,
+      CORBA::AttributeMode & mode,
+      const CORBA::ExceptionDefSeq & get_exceptions,
+      const CORBA::ExceptionDefSeq & set_exceptions
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      id_ (id),
+      name_ (name),
+      version_ (version),
+      type_ (type),
+      mode_ (mode),
+      get_exceptions_ (get_exceptions),
+      set_exceptions_ (set_exceptions)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (7);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->mode_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->get_exceptions_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->set_exceptions_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
+void 
+TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::result (::CORBA::ExtAttributeDef_ptr result)
+{
+  // Update the result. 
+  this->_result = result;
+}
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//                Base & Remote Proxy  Implementation. 
+//
+
+CORBA::_TAO_InterfaceAttrExtension_Proxy_Impl::_TAO_InterfaceAttrExtension_Proxy_Impl (void)
+{}
+
+CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::describe_ext_interface (
+    CORBA::Object *_collocated_tao_target_
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var _tao_retval;
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+  
+  {
+    CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *tmp;
+    ACE_NEW_RETURN (tmp, CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription, _tao_retval._retn ());
+    _tao_retval = tmp;
+  }
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "describe_ext_interface",
+      22,
+      0,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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 ());
+
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * _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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+::CORBA::ExtAttributeDef_ptr CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::create_ext_attribute (
+    CORBA::Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA::IDLType_ptr type,
+    CORBA::AttributeMode mode,
+    const CORBA::ExceptionDefSeq & get_exceptions,
+    const CORBA::ExceptionDefSeq & set_exceptions
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::ExtAttributeDef_var _tao_retval (CORBA::ExtAttributeDef::_nil ());
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+    
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_ext_attribute",
+      20,
+      7,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_,
+          id,
+          name,
+          version,
+          type,
+          mode,
+          get_exceptions,
+          set_exceptions
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << type) &&
+              (_tao_out << mode) &&
+              (_tao_out << get_exceptions) &&
+              (_tao_out << set_exceptions)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
+                );
+            }
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ExtAttributeDef_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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+//
+//            End  Base & Remote  Proxy Implemeentation. 
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//           Remote & Base  Proxy Broker Implementation
+//
+
+CORBA::_TAO_InterfaceAttrExtension_Proxy_Broker::_TAO_InterfaceAttrExtension_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_InterfaceAttrExtension_Proxy_Broker::~_TAO_InterfaceAttrExtension_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_InterfaceAttrExtension_Proxy_Broker * (*CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+// Factory Member function Implementation.
+CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Broker *
+CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Broker::the_TAO_InterfaceAttrExtension_Remote_Proxy_Broker (void)
+{
+  static ::CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Broker remote_proxy_broker;
+  return &remote_proxy_broker;
+}
+
+CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Broker::_TAO_InterfaceAttrExtension_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Broker::~_TAO_InterfaceAttrExtension_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_InterfaceAttrExtension_Proxy_Impl&
+CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::InterfaceAttrExtension *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  return this->remote_proxy_impl_;
+}
+
+//
+//           End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+
+CORBA::InterfaceAttrExtension::InterfaceAttrExtension (int collocated)
+{
+  this->CORBA_InterfaceAttrExtension_setup_collocation (collocated);
+}
+
+void
+CORBA::InterfaceAttrExtension::CORBA_InterfaceAttrExtension_setup_collocation (int collocated)
+{
+  if (collocated)
+    this->the_TAO_InterfaceAttrExtension_Proxy_Broker_ =
+      ::CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer (this);
+  else
+    this->the_TAO_InterfaceAttrExtension_Proxy_Broker_ =
+      ::CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Broker::the_TAO_InterfaceAttrExtension_Remote_Proxy_Broker ();
+}
+
+CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
+{}
+
+void 
+CORBA::InterfaceAttrExtension::_tao_any_destructor (void *_tao_void_pointer)
+{
+  InterfaceAttrExtension *tmp = ACE_static_cast (InterfaceAttrExtension *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+CORBA::InterfaceAttrExtension_ptr
+CORBA::InterfaceAttrExtension::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return InterfaceAttrExtension::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
+      ACE_CHECK_RETURN (InterfaceAttrExtension::_nil ());
+      
+      if (is_a == 0)
+        {
+          return InterfaceAttrExtension::_nil ();
+        }
+    }
+  
+  return InterfaceAttrExtension::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::InterfaceAttrExtension_ptr 
+CORBA::InterfaceAttrExtension::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return InterfaceAttrExtension::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      TAO_Stub* stub = obj->_stubobj ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
+      InterfaceAttrExtension_ptr default_proxy = InterfaceAttrExtension::_nil ();
+      
+      if (
+          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+          obj->_is_collocated () &&
+          CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer != 0
+        )
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::InterfaceAttrExtension (
+                  stub,
+                  1,
+                  obj->_servant ()
+                ),
+              InterfaceAttrExtension::_nil ()
+            );
+        }
+      
+      if (CORBA::is_nil (default_proxy))
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::InterfaceAttrExtension (
+                  stub,
+                  0,
+                  obj->_servant ()
+                ),
+              InterfaceAttrExtension::_nil ()
+            );
+        }
+      
+      return default_proxy;
+    }
+  else 
+    return
+      ACE_reinterpret_cast (
+          InterfaceAttrExtension_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &InterfaceAttrExtension::_tao_class_id
+                )
+            )
+        );
+}
+
+CORBA::InterfaceAttrExtension_ptr
+CORBA::InterfaceAttrExtension::_duplicate (InterfaceAttrExtension_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+CORBA::InterfaceAttrExtension::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
+}
+
+void *CORBA::InterfaceAttrExtension::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, InterfaceAttrExtension)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
+  return retv;
+}
+
+const char* CORBA::InterfaceAttrExtension::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/CORBA/InterfaceAttrExtension:1.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_InterfaceAttrExtension_ExtFullInterfaceDescription[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  73,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636541), 
+  ACE_NTOHL (0x74747245), 
+  ACE_NTOHL (0x7874656e), 
+  ACE_NTOHL (0x73696f6e), 
+  ACE_NTOHL (0x2f457874), 
+  ACE_NTOHL (0x46756c6c), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InterfaceAttrExtension/ExtFullInterfaceDescription:1.0
+    28,
+  ACE_NTOHL (0x45787446), 
+  ACE_NTOHL (0x756c6c49), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e00),  // name = ExtFullInterfaceDescription
+  8, // member count
+    5,
+  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x0),  // name = name
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    33,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+        11,
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x65720000),  // name = Identifier
+        CORBA::tk_string, 
+    0U, // string length
+
+  3,
+  ACE_NTOHL (0x69640000),  // name = id
+    CORBA::tk_alias, // typecode kind for typedefs
+  72, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    35,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+        13,
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x0),  // name = RepositoryId
+        CORBA::tk_string, 
+    0U, // string length
+
+  11,
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x696e0000),  // name = defined_in
+    0xffffffff, // indirection
+  0xffffff9c, // negative offset (-100)
+  8,
+  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x696f6e00),  // name = version
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    34,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+        12,
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x70656300),  // name = VersionSpec
+        CORBA::tk_string, 
+    0U, // string length
+
+  11,
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e730000),  // name = operations
+    CORBA::tk_alias, // typecode kind for typedefs
+  1340, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    39,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f70), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
+        17,
+    ACE_NTOHL (0x4f704465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x0),  // name = OpDescriptionSeq
+        CORBA::tk_sequence, // typecode kind
+    1260, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      1244, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        43,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f70), 
+        ACE_NTOHL (0x65726174), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
+                21,
+        ACE_NTOHL (0x4f706572), 
+        ACE_NTOHL (0x6174696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x0),  // name = OperationDescription
+        9, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                0xffffffff, // indirection
+        0xfffffe14, // negative offset (-492)
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                0xffffffff, // indirection
+        0xfffffe58, // negative offset (-424)
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                0xffffffff, // indirection
+        0xfffffe40, // negative offset (-448)
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                0xffffffff, // indirection
+        0xfffffea0, // negative offset (-352)
+        7,
+        ACE_NTOHL (0x72657375), 
+        ACE_NTOHL (0x6c740000),  // name = result
+                CORBA::tk_TypeCode,
+
+        5,
+        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x0),  // name = mode
+                CORBA::tk_enum, // typecode kind
+        100, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+          36,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4f70), 
+          ACE_NTOHL (0x65726174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
+          14,
+          ACE_NTOHL (0x4f706572), 
+          ACE_NTOHL (0x6174696f), 
+          ACE_NTOHL (0x6e4d6f64), 
+          ACE_NTOHL (0x65000000),  // name = OperationMode
+          2, // member count
+          10,
+          ACE_NTOHL (0x4f505f4e), 
+          ACE_NTOHL (0x4f524d41), 
+          ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
+          10,
+          ACE_NTOHL (0x4f505f4f), 
+          ACE_NTOHL (0x4e455741), 
+          ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
+          
+        9,
+        ACE_NTOHL (0x636f6e74), 
+        ACE_NTOHL (0x65787473), 
+        ACE_NTOHL (0x0),  // name = contexts
+                CORBA::tk_alias, // typecode kind for typedefs
+        168, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          35,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f436f), 
+          ACE_NTOHL (0x6e746578), 
+          ACE_NTOHL (0x74496453), 
+          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
+                    13,
+          ACE_NTOHL (0x436f6e74), 
+          ACE_NTOHL (0x65787449), 
+          ACE_NTOHL (0x64536571), 
+          ACE_NTOHL (0x0),  // name = ContextIdSeq
+                    CORBA::tk_sequence, // typecode kind
+          96, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_alias, // typecode kind for typedefs
+            80, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              40,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f436f), 
+              ACE_NTOHL (0x6e746578), 
+              ACE_NTOHL (0x74496465), 
+              ACE_NTOHL (0x6e746966), 
+              ACE_NTOHL (0x6965723a), 
+              ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
+                            18,
+              ACE_NTOHL (0x436f6e74), 
+              ACE_NTOHL (0x65787449), 
+              ACE_NTOHL (0x64656e74), 
+              ACE_NTOHL (0x69666965), 
+              ACE_NTOHL (0x72000000),  // name = ContextIdentifier
+                            0xffffffff, // indirection
+              0xfffffc94, // negative offset (-876)
+
+            0U,
+
+
+        11,
+        ACE_NTOHL (0x70617261), 
+        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x72730000),  // name = parameters
+                CORBA::tk_alias, // typecode kind for typedefs
+        428, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          40,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5061), 
+          ACE_NTOHL (0x72446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
+                    18,
+          ACE_NTOHL (0x50617244), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
+                    CORBA::tk_sequence, // typecode kind
+          348, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_struct, // typecode kind
+            332, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              43,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5061), 
+              ACE_NTOHL (0x72616d65), 
+              ACE_NTOHL (0x74657244), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
+                            21,
+              ACE_NTOHL (0x50617261), 
+              ACE_NTOHL (0x6d657465), 
+              ACE_NTOHL (0x72446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x0),  // name = ParameterDescription
+              4, // member count
+                            5,
+              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x0),  // name = name
+                            0xffffffff, // indirection
+              0xfffffbb4, // negative offset (-1100)
+              5,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x0),  // name = type
+                            CORBA::tk_TypeCode,
+
+              9,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x0),  // name = type_def
+                            CORBA::tk_objref, // typecode kind
+              52, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                30,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x653a312e), 
+                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                                8,
+                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x79706500),  // name = IDLType
+                
+              5,
+              ACE_NTOHL (0x6d6f6465), 
+              ACE_NTOHL (0x0),  // name = mode
+                            CORBA::tk_enum, // typecode kind
+              116, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+                36,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5061), 
+                ACE_NTOHL (0x72616d65), 
+                ACE_NTOHL (0x7465724d), 
+                ACE_NTOHL (0x6f64653a), 
+                ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+                14,
+                ACE_NTOHL (0x50617261), 
+                ACE_NTOHL (0x6d657465), 
+                ACE_NTOHL (0x724d6f64), 
+                ACE_NTOHL (0x65000000),  // name = ParameterMode
+                3, // member count
+                9,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x0),  // name = PARAM_IN
+                10,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f4f55), 
+                ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+                12,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+                
+
+            0U,
+
+
+        11,
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = exceptions
+                CORBA::tk_alias, // typecode kind for typedefs
+        276, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          40,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+                    18,
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+                    CORBA::tk_sequence, // typecode kind
+          196, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_struct, // typecode kind
+            180, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              43,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                            21,
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x0),  // name = ExceptionDescription
+              5, // member count
+                            5,
+              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x0),  // name = name
+                            0xffffffff, // indirection
+              0xfffff9f0, // negative offset (-1552)
+              3,
+              ACE_NTOHL (0x69640000),  // name = id
+                            0xffffffff, // indirection
+              0xfffffa34, // negative offset (-1484)
+              11,
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x696e0000),  // name = defined_in
+                            0xffffffff, // indirection
+              0xfffffa1c, // negative offset (-1508)
+              8,
+              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x696f6e00),  // name = version
+                            0xffffffff, // indirection
+              0xfffffa7c, // negative offset (-1412)
+              5,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x0),  // name = type
+                            CORBA::tk_TypeCode,
+
+
+            0U,
+
+
+
+      0U,
+
+
+  11,
+  ACE_NTOHL (0x61747472), 
+  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x65730000),  // name = attributes
+    CORBA::tk_alias, // typecode kind for typedefs
+  468, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    44,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x74417474), 
+    ACE_NTOHL (0x72446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
+        22,
+    ACE_NTOHL (0x45787441), 
+    ACE_NTOHL (0x74747244), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
+        CORBA::tk_sequence, // typecode kind
+    380, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      364, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        46,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x74417474), 
+        ACE_NTOHL (0x72696275), 
+        ACE_NTOHL (0x74654465), 
+        ACE_NTOHL (0x73637269), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e3a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
+                24,
+        ACE_NTOHL (0x45787441), 
+        ACE_NTOHL (0x74747269), 
+        ACE_NTOHL (0x62757465), 
+        ACE_NTOHL (0x44657363), 
+        ACE_NTOHL (0x72697074), 
+        ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
+        8, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                0xffffffff, // indirection
+        0xfffff8b4, // negative offset (-1868)
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                0xffffffff, // indirection
+        0xfffff8f8, // negative offset (-1800)
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                0xffffffff, // indirection
+        0xfffff8e0, // negative offset (-1824)
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                0xffffffff, // indirection
+        0xfffff940, // negative offset (-1728)
+        5,
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x0),  // name = type
+                CORBA::tk_TypeCode,
+
+        5,
+        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x0),  // name = mode
+                CORBA::tk_enum, // typecode kind
+        104, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+          36,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4174), 
+          ACE_NTOHL (0x74726962), 
+          ACE_NTOHL (0x7574654d), 
+          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
+          14,
+          ACE_NTOHL (0x41747472), 
+          ACE_NTOHL (0x69627574), 
+          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x65000000),  // name = AttributeMode
+          2, // member count
+          12,
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
+          14,
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f524541), 
+          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
+          
+        15,
+        ACE_NTOHL (0x6765745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = get_exceptions
+                0xffffffff, // indirection
+        0xfffffd18, // negative offset (-744)
+        15,
+        ACE_NTOHL (0x7075745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = put_exceptions
+                0xffffffff, // indirection
+        0xfffffcfc, // negative offset (-772)
+
+      0U,
+
+
+  16,
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f696e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63657300),  // name = base_interfaces
+    CORBA::tk_alias, // typecode kind for typedefs
+  92, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    38,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
+        16,
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
+        CORBA::tk_sequence, // typecode kind
+    16, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      0xffffffff, // indirection
+      0xfffff790, // negative offset (-2160)
+      0U,
+
+
+  5,
+  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x0),  // name = type
+    CORBA::tk_TypeCode,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription (
+    CORBA::tk_struct,
+    sizeof (_oc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription),
+    (char *) &_oc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription,
+    0,
+    sizeof (CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription)
+  );
+
+::CORBA::TypeCode_ptr CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription =
+  &_tc_TAO_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
+
+void CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtFullInterfaceDescription *tmp = ACE_static_cast (ExtFullInterfaceDescription*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * CORBA::InterfaceAttrExtension::describe_ext_interface (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_InterfaceAttrExtension_Proxy_Impl &proxy = 
+    this->the_TAO_InterfaceAttrExtension_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return proxy.describe_ext_interface (
+      this
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::ExtAttributeDef_ptr CORBA::InterfaceAttrExtension::create_ext_attribute (
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA::IDLType_ptr type,
+    CORBA::AttributeMode mode,
+    const CORBA::ExceptionDefSeq & get_exceptions,
+    const CORBA::ExceptionDefSeq & set_exceptions
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_InterfaceAttrExtension_Proxy_Impl &proxy = 
+    this->the_TAO_InterfaceAttrExtension_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return proxy.create_ext_attribute (
+      this,
+      id,
+      name,
+      version,
+      type,
+      mode,
+      get_exceptions,
+      set_exceptions
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_InterfaceAttrExtension[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636541), 
+  ACE_NTOHL (0x74747245), 
+  ACE_NTOHL (0x7874656e), 
+  ACE_NTOHL (0x73696f6e), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InterfaceAttrExtension:1.0
+    23,
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65417474), 
+  ACE_NTOHL (0x72457874), 
+  ACE_NTOHL (0x656e7369), 
+  ACE_NTOHL (0x6f6e0000),  // name = InterfaceAttrExtension
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceAttrExtension (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_InterfaceAttrExtension),
+    (char *) &_oc_CORBA_InterfaceAttrExtension,
+    0,
+    sizeof (CORBA::InterfaceAttrExtension)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_InterfaceAttrExtension,
+    &_tc_TAO_tc_CORBA_InterfaceAttrExtension
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
+int CORBA::ExtInterfaceDef::_tao_class_id = 0;
+
+CORBA::ExtInterfaceDef_ptr
+tao_CORBA_ExtInterfaceDef_duplicate (
+    CORBA::ExtInterfaceDef_ptr p
+  )
+{
+  return CORBA::ExtInterfaceDef::_duplicate (p);
+}
+
+void
+tao_CORBA_ExtInterfaceDef_release (
+    CORBA::ExtInterfaceDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA::ExtInterfaceDef_ptr
+tao_CORBA_ExtInterfaceDef_nil (
+    void
+  )
+{
+  return CORBA::ExtInterfaceDef::_nil ();
+}
+
+CORBA::ExtInterfaceDef_ptr
+tao_CORBA_ExtInterfaceDef_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return CORBA::ExtInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+tao_CORBA_ExtInterfaceDef_upcast (
+    void *src
+  )
+{
+  CORBA::ExtInterfaceDef **tmp =
+    ACE_static_cast (CORBA::ExtInterfaceDef **, src);
+  return *tmp;
+}
+
+CORBA::Boolean
+tao_CORBA_ExtInterfaceDef_marshal (
+    CORBA::ExtInterfaceDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
+// *************************************************************
+// CORBA::ExtInterfaceDef_var
+// *************************************************************
+
+CORBA::ExtInterfaceDef_var::ExtInterfaceDef_var (void)
+  : ptr_ (ExtInterfaceDef::_nil ())
+{}
+
+::CORBA::ExtInterfaceDef_ptr
+CORBA::ExtInterfaceDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA::ExtInterfaceDef_var::ExtInterfaceDef_var (const ::CORBA::ExtInterfaceDef_var &p)
+  : TAO_Base_var (),
+    ptr_ (ExtInterfaceDef::_duplicate (p.ptr ()))
+{}
+
+CORBA::ExtInterfaceDef_var::~ExtInterfaceDef_var (void)
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA::ExtInterfaceDef_var &
+CORBA::ExtInterfaceDef_var::operator= (ExtInterfaceDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ExtInterfaceDef_var &
+CORBA::ExtInterfaceDef_var::operator= (const ::CORBA::ExtInterfaceDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA::ExtInterfaceDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA::ExtInterfaceDef_var::operator const ::CORBA::ExtInterfaceDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA::ExtInterfaceDef_var::operator ::CORBA::ExtInterfaceDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtInterfaceDef_ptr
+CORBA::ExtInterfaceDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtInterfaceDef_ptr
+CORBA::ExtInterfaceDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtInterfaceDef_ptr &
+CORBA::ExtInterfaceDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtInterfaceDef_ptr &
+CORBA::ExtInterfaceDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ExtInterfaceDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA::ExtInterfaceDef_ptr
+CORBA::ExtInterfaceDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA::ExtInterfaceDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ExtInterfaceDef::_nil ();
+  return val;
+}
+
+::CORBA::ExtInterfaceDef_ptr
+CORBA::ExtInterfaceDef_var::tao_duplicate (ExtInterfaceDef_ptr p)
+{
+  return ::CORBA::ExtInterfaceDef::_duplicate (p);
+}
+
+void
+CORBA::ExtInterfaceDef_var::tao_release (ExtInterfaceDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA::ExtInterfaceDef_ptr
+CORBA::ExtInterfaceDef_var::tao_nil (void)
+{
+  return ::CORBA::ExtInterfaceDef::_nil ();
+}
+
+::CORBA::ExtInterfaceDef_ptr
+CORBA::ExtInterfaceDef_var::tao_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return ::CORBA::ExtInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+CORBA::ExtInterfaceDef_var::tao_upcast (void *src)
+{
+  ExtInterfaceDef **tmp =
+    ACE_static_cast (ExtInterfaceDef **, src);
+  return *tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
+// *************************************************************
+// CORBA::ExtInterfaceDef_out
+// *************************************************************
+
+CORBA::ExtInterfaceDef_out::ExtInterfaceDef_out (ExtInterfaceDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA::ExtInterfaceDef::_nil ();
+}
+
+CORBA::ExtInterfaceDef_out::ExtInterfaceDef_out (ExtInterfaceDef_var &p)
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ExtInterfaceDef::_nil ();
+}
+
+CORBA::ExtInterfaceDef_out::ExtInterfaceDef_out (const ::CORBA::ExtInterfaceDef_out &p)
+  : ptr_ (ACE_const_cast (ExtInterfaceDef_out &, p).ptr_)
+{}
+
+::CORBA::ExtInterfaceDef_out &
+CORBA::ExtInterfaceDef_out::operator= (const ::CORBA::ExtInterfaceDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtInterfaceDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA::ExtInterfaceDef_out &
+CORBA::ExtInterfaceDef_out::operator= (const ::CORBA::ExtInterfaceDef_var &p)
+{
+  this->ptr_ = ::CORBA::ExtInterfaceDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA::ExtInterfaceDef_out &
+CORBA::ExtInterfaceDef_out::operator= (ExtInterfaceDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ExtInterfaceDef_out::operator ::CORBA::ExtInterfaceDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtInterfaceDef_ptr &
+CORBA::ExtInterfaceDef_out::ptr (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtInterfaceDef_ptr
+CORBA::ExtInterfaceDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//                Base & Remote Proxy  Implementation. 
+//
+
+CORBA::_TAO_ExtInterfaceDef_Proxy_Impl::_TAO_ExtInterfaceDef_Proxy_Impl (void)
+{}
+
+CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Impl::_TAO_ExtInterfaceDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+//
+//            End  Base & Remote  Proxy Implemeentation. 
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//           Remote & Base  Proxy Broker Implementation
+//
+
+CORBA::_TAO_ExtInterfaceDef_Proxy_Broker::_TAO_ExtInterfaceDef_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtInterfaceDef_Proxy_Broker::~_TAO_ExtInterfaceDef_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtInterfaceDef_Proxy_Broker * (*CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+// Factory Member function Implementation.
+CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Broker *
+CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Broker::the_TAO_ExtInterfaceDef_Remote_Proxy_Broker (void)
+{
+  static ::CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
+  return &remote_proxy_broker;
+}
+
+CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Broker::_TAO_ExtInterfaceDef_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Broker::~_TAO_ExtInterfaceDef_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtInterfaceDef_Proxy_Impl&
+CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ExtInterfaceDef *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  return this->remote_proxy_impl_;
+}
+
+//
+//           End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+
+CORBA::ExtInterfaceDef::ExtInterfaceDef (int collocated)
+{
+  this->CORBA_ExtInterfaceDef_setup_collocation (collocated);
+}
+
+void
+CORBA::ExtInterfaceDef::CORBA_ExtInterfaceDef_setup_collocation (int collocated)
+{
+  if (collocated)
+    this->the_TAO_ExtInterfaceDef_Proxy_Broker_ =
+      ::CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
+  else
+    this->the_TAO_ExtInterfaceDef_Proxy_Broker_ =
+      ::CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Broker::the_TAO_ExtInterfaceDef_Remote_Proxy_Broker ();
+  
+  this->CORBA_InterfaceDef_setup_collocation (collocated);
+  this->CORBA_InterfaceAttrExtension_setup_collocation (collocated);
+}
+
+CORBA::ExtInterfaceDef::~ExtInterfaceDef (void)
+{}
+
+void 
+CORBA::ExtInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtInterfaceDef *tmp = ACE_static_cast (ExtInterfaceDef *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+CORBA::ExtInterfaceDef_ptr
+CORBA::ExtInterfaceDef::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return ExtInterfaceDef::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
+      ACE_CHECK_RETURN (ExtInterfaceDef::_nil ());
+      
+      if (is_a == 0)
+        {
+          return ExtInterfaceDef::_nil ();
+        }
+    }
+  
+  return ExtInterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::ExtInterfaceDef_ptr 
+CORBA::ExtInterfaceDef::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return ExtInterfaceDef::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      TAO_Stub* stub = obj->_stubobj ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
+      ExtInterfaceDef_ptr default_proxy = ExtInterfaceDef::_nil ();
+      
+      if (
+          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+          obj->_is_collocated () &&
+          CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer != 0
+        )
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ExtInterfaceDef (
+                  stub,
+                  1,
+                  obj->_servant ()
+                ),
+              ExtInterfaceDef::_nil ()
+            );
+        }
+      
+      if (CORBA::is_nil (default_proxy))
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ExtInterfaceDef (
+                  stub,
+                  0,
+                  obj->_servant ()
+                ),
+              ExtInterfaceDef::_nil ()
+            );
+        }
+      
+      return default_proxy;
+    }
+  else 
+    return
+      ACE_reinterpret_cast (
+          ExtInterfaceDef_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ExtInterfaceDef::_tao_class_id
+                )
+            )
+        );
+}
+
+CORBA::ExtInterfaceDef_ptr
+CORBA::ExtInterfaceDef::_duplicate (ExtInterfaceDef_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+CORBA::ExtInterfaceDef::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Container:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Contained:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/IDLType:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/IRObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
+}
+
+void *CORBA::ExtInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, ExtInterfaceDef)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, InterfaceDef)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::InterfaceDef_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, InterfaceAttrExtension)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::InterfaceAttrExtension_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Container::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Container_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Contained::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Contained_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::IDLType::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::IDLType_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::IRObject::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::IRObject_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
+  return retv;
+}
+
+const char* CORBA::ExtInterfaceDef::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/CORBA/ExtInterfaceDef:1.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_ExtInterfaceDef[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63654465), 
+  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtInterfaceDef:1.0
+    16,
+  ACE_NTOHL (0x45787449), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x44656600),  // name = ExtInterfaceDef
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInterfaceDef (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_ExtInterfaceDef),
+    (char *) &_oc_CORBA_ExtInterfaceDef,
+    0,
+    sizeof (CORBA::ExtInterfaceDef)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtInterfaceDef,
+    &_tc_TAO_tc_CORBA_ExtInterfaceDef
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::AbstractInterfaceDef::_tao_class_id = 0;
 
@@ -34980,8 +39715,17 @@ tao_CORBA_AbstractInterfaceDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_AbstractInterfaceDef_marshal (
+    CORBA::AbstractInterfaceDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::AbstractInterfaceDef_var
@@ -35107,7 +39851,7 @@ CORBA::AbstractInterfaceDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::AbstractInterfaceDef_out
@@ -35169,14 +39913,14 @@ CORBA::AbstractInterfaceDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -35195,7 +39939,7 @@ CORBA::_TAO_AbstractInterfaceDef_Remote_Proxy_Impl::_TAO_AbstractInterfaceDef_Re
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -35243,7 +39987,7 @@ CORBA::_TAO_AbstractInterfaceDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::AbstractInterfaceDef::AbstractInterfaceDef (int collocated)
 {
@@ -35536,7 +40280,7 @@ const char* CORBA::AbstractInterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_AbstractInterfaceDef[] =
 {
@@ -35553,14 +40297,14 @@ static const CORBA::Long _oc_CORBA_AbstractInterfaceDef[] =
   ACE_NTOHL (0x61636544), 
   ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDef:1.0
-  21,
+    21,
   ACE_NTOHL (0x41627374), 
   ACE_NTOHL (0x72616374), 
   ACE_NTOHL (0x496e7465), 
   ACE_NTOHL (0x72666163), 
   ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x0),  // name = AbstractInterfaceDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_AbstractInterfaceDef (
     CORBA::tk_objref,
@@ -35580,7 +40324,701 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
+int CORBA::ExtAbstractInterfaceDef::_tao_class_id = 0;
+
+CORBA::ExtAbstractInterfaceDef_ptr
+tao_CORBA_ExtAbstractInterfaceDef_duplicate (
+    CORBA::ExtAbstractInterfaceDef_ptr p
+  )
+{
+  return CORBA::ExtAbstractInterfaceDef::_duplicate (p);
+}
+
+void
+tao_CORBA_ExtAbstractInterfaceDef_release (
+    CORBA::ExtAbstractInterfaceDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA::ExtAbstractInterfaceDef_ptr
+tao_CORBA_ExtAbstractInterfaceDef_nil (
+    void
+  )
+{
+  return CORBA::ExtAbstractInterfaceDef::_nil ();
+}
+
+CORBA::ExtAbstractInterfaceDef_ptr
+tao_CORBA_ExtAbstractInterfaceDef_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return CORBA::ExtAbstractInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+tao_CORBA_ExtAbstractInterfaceDef_upcast (
+    void *src
+  )
+{
+  CORBA::ExtAbstractInterfaceDef **tmp =
+    ACE_static_cast (CORBA::ExtAbstractInterfaceDef **, src);
+  return *tmp;
+}
+
+CORBA::Boolean
+tao_CORBA_ExtAbstractInterfaceDef_marshal (
+    CORBA::ExtAbstractInterfaceDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
+// *************************************************************
+// CORBA::ExtAbstractInterfaceDef_var
+// *************************************************************
+
+CORBA::ExtAbstractInterfaceDef_var::ExtAbstractInterfaceDef_var (void)
+  : ptr_ (ExtAbstractInterfaceDef::_nil ())
+{}
+
+::CORBA::ExtAbstractInterfaceDef_ptr
+CORBA::ExtAbstractInterfaceDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA::ExtAbstractInterfaceDef_var::ExtAbstractInterfaceDef_var (const ::CORBA::ExtAbstractInterfaceDef_var &p)
+  : TAO_Base_var (),
+    ptr_ (ExtAbstractInterfaceDef::_duplicate (p.ptr ()))
+{}
+
+CORBA::ExtAbstractInterfaceDef_var::~ExtAbstractInterfaceDef_var (void)
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA::ExtAbstractInterfaceDef_var &
+CORBA::ExtAbstractInterfaceDef_var::operator= (ExtAbstractInterfaceDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ExtAbstractInterfaceDef_var &
+CORBA::ExtAbstractInterfaceDef_var::operator= (const ::CORBA::ExtAbstractInterfaceDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA::ExtAbstractInterfaceDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA::ExtAbstractInterfaceDef_var::operator const ::CORBA::ExtAbstractInterfaceDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA::ExtAbstractInterfaceDef_var::operator ::CORBA::ExtAbstractInterfaceDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtAbstractInterfaceDef_ptr
+CORBA::ExtAbstractInterfaceDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtAbstractInterfaceDef_ptr
+CORBA::ExtAbstractInterfaceDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtAbstractInterfaceDef_ptr &
+CORBA::ExtAbstractInterfaceDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtAbstractInterfaceDef_ptr &
+CORBA::ExtAbstractInterfaceDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ExtAbstractInterfaceDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA::ExtAbstractInterfaceDef_ptr
+CORBA::ExtAbstractInterfaceDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA::ExtAbstractInterfaceDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ExtAbstractInterfaceDef::_nil ();
+  return val;
+}
+
+::CORBA::ExtAbstractInterfaceDef_ptr
+CORBA::ExtAbstractInterfaceDef_var::tao_duplicate (ExtAbstractInterfaceDef_ptr p)
+{
+  return ::CORBA::ExtAbstractInterfaceDef::_duplicate (p);
+}
+
+void
+CORBA::ExtAbstractInterfaceDef_var::tao_release (ExtAbstractInterfaceDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA::ExtAbstractInterfaceDef_ptr
+CORBA::ExtAbstractInterfaceDef_var::tao_nil (void)
+{
+  return ::CORBA::ExtAbstractInterfaceDef::_nil ();
+}
+
+::CORBA::ExtAbstractInterfaceDef_ptr
+CORBA::ExtAbstractInterfaceDef_var::tao_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return ::CORBA::ExtAbstractInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+CORBA::ExtAbstractInterfaceDef_var::tao_upcast (void *src)
+{
+  ExtAbstractInterfaceDef **tmp =
+    ACE_static_cast (ExtAbstractInterfaceDef **, src);
+  return *tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
+// *************************************************************
+// CORBA::ExtAbstractInterfaceDef_out
+// *************************************************************
+
+CORBA::ExtAbstractInterfaceDef_out::ExtAbstractInterfaceDef_out (ExtAbstractInterfaceDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA::ExtAbstractInterfaceDef::_nil ();
+}
+
+CORBA::ExtAbstractInterfaceDef_out::ExtAbstractInterfaceDef_out (ExtAbstractInterfaceDef_var &p)
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ExtAbstractInterfaceDef::_nil ();
+}
+
+CORBA::ExtAbstractInterfaceDef_out::ExtAbstractInterfaceDef_out (const ::CORBA::ExtAbstractInterfaceDef_out &p)
+  : ptr_ (ACE_const_cast (ExtAbstractInterfaceDef_out &, p).ptr_)
+{}
+
+::CORBA::ExtAbstractInterfaceDef_out &
+CORBA::ExtAbstractInterfaceDef_out::operator= (const ::CORBA::ExtAbstractInterfaceDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtAbstractInterfaceDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA::ExtAbstractInterfaceDef_out &
+CORBA::ExtAbstractInterfaceDef_out::operator= (const ::CORBA::ExtAbstractInterfaceDef_var &p)
+{
+  this->ptr_ = ::CORBA::ExtAbstractInterfaceDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA::ExtAbstractInterfaceDef_out &
+CORBA::ExtAbstractInterfaceDef_out::operator= (ExtAbstractInterfaceDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ExtAbstractInterfaceDef_out::operator ::CORBA::ExtAbstractInterfaceDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtAbstractInterfaceDef_ptr &
+CORBA::ExtAbstractInterfaceDef_out::ptr (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtAbstractInterfaceDef_ptr
+CORBA::ExtAbstractInterfaceDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//                Base & Remote Proxy  Implementation. 
+//
+
+CORBA::_TAO_ExtAbstractInterfaceDef_Proxy_Impl::_TAO_ExtAbstractInterfaceDef_Proxy_Impl (void)
+{}
+
+CORBA::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+//
+//            End  Base & Remote  Proxy Implemeentation. 
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//           Remote & Base  Proxy Broker Implementation
+//
+
+CORBA::_TAO_ExtAbstractInterfaceDef_Proxy_Broker::_TAO_ExtAbstractInterfaceDef_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtAbstractInterfaceDef_Proxy_Broker::~_TAO_ExtAbstractInterfaceDef_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtAbstractInterfaceDef_Proxy_Broker * (*CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+// Factory Member function Implementation.
+CORBA::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker *
+CORBA::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker::the_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker (void)
+{
+  static ::CORBA::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
+  return &remote_proxy_broker;
+}
+
+CORBA::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker::~_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtAbstractInterfaceDef_Proxy_Impl&
+CORBA::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ExtAbstractInterfaceDef *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  return this->remote_proxy_impl_;
+}
+
+//
+//           End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+
+CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (int collocated)
+{
+  this->CORBA_ExtAbstractInterfaceDef_setup_collocation (collocated);
+}
+
+void
+CORBA::ExtAbstractInterfaceDef::CORBA_ExtAbstractInterfaceDef_setup_collocation (int collocated)
+{
+  if (collocated)
+    this->the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_ =
+      ::CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
+  else
+    this->the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_ =
+      ::CORBA::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker::the_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker ();
+  
+  this->CORBA_AbstractInterfaceDef_setup_collocation (collocated);
+  this->CORBA_InterfaceAttrExtension_setup_collocation (collocated);
+}
+
+CORBA::ExtAbstractInterfaceDef::~ExtAbstractInterfaceDef (void)
+{}
+
+void 
+CORBA::ExtAbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtAbstractInterfaceDef *tmp = ACE_static_cast (ExtAbstractInterfaceDef *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+CORBA::ExtAbstractInterfaceDef_ptr
+CORBA::ExtAbstractInterfaceDef::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return ExtAbstractInterfaceDef::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
+      ACE_CHECK_RETURN (ExtAbstractInterfaceDef::_nil ());
+      
+      if (is_a == 0)
+        {
+          return ExtAbstractInterfaceDef::_nil ();
+        }
+    }
+  
+  return ExtAbstractInterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::ExtAbstractInterfaceDef_ptr 
+CORBA::ExtAbstractInterfaceDef::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return ExtAbstractInterfaceDef::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      TAO_Stub* stub = obj->_stubobj ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
+      ExtAbstractInterfaceDef_ptr default_proxy = ExtAbstractInterfaceDef::_nil ();
+      
+      if (
+          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+          obj->_is_collocated () &&
+          CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer != 0
+        )
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ExtAbstractInterfaceDef (
+                  stub,
+                  1,
+                  obj->_servant ()
+                ),
+              ExtAbstractInterfaceDef::_nil ()
+            );
+        }
+      
+      if (CORBA::is_nil (default_proxy))
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ExtAbstractInterfaceDef (
+                  stub,
+                  0,
+                  obj->_servant ()
+                ),
+              ExtAbstractInterfaceDef::_nil ()
+            );
+        }
+      
+      return default_proxy;
+    }
+  else 
+    return
+      ACE_reinterpret_cast (
+          ExtAbstractInterfaceDef_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ExtAbstractInterfaceDef::_tao_class_id
+                )
+            )
+        );
+}
+
+CORBA::ExtAbstractInterfaceDef_ptr
+CORBA::ExtAbstractInterfaceDef::_duplicate (ExtAbstractInterfaceDef_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+CORBA::ExtAbstractInterfaceDef::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Container:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Contained:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/IDLType:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/IRObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
+}
+
+void *CORBA::ExtAbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, ExtAbstractInterfaceDef)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, AbstractInterfaceDef)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::AbstractInterfaceDef_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, InterfaceAttrExtension)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::InterfaceAttrExtension_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, InterfaceDef)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::InterfaceDef_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Container::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Container_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Contained::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Contained_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::IDLType::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::IDLType_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::IRObject::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::IRObject_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
+  return retv;
+}
+
+const char* CORBA::ExtAbstractInterfaceDef::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.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_ExtAbstractInterfaceDef[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  46,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74416273), 
+  ACE_NTOHL (0x74726163), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63654465), 
+  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0
+    24,
+  ACE_NTOHL (0x45787441), 
+  ACE_NTOHL (0x62737472), 
+  ACE_NTOHL (0x61637449), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x44656600),  // name = ExtAbstractInterfaceDef
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtAbstractInterfaceDef (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_ExtAbstractInterfaceDef),
+    (char *) &_oc_CORBA_ExtAbstractInterfaceDef,
+    0,
+    sizeof (CORBA::ExtAbstractInterfaceDef)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtAbstractInterfaceDef,
+    &_tc_TAO_tc_CORBA_ExtAbstractInterfaceDef
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::LocalInterfaceDef::_tao_class_id = 0;
 
@@ -35627,8 +41065,17 @@ tao_CORBA_LocalInterfaceDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_LocalInterfaceDef_marshal (
+    CORBA::LocalInterfaceDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::LocalInterfaceDef_var
@@ -35754,7 +41201,7 @@ CORBA::LocalInterfaceDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::LocalInterfaceDef_out
@@ -35816,14 +41263,14 @@ CORBA::LocalInterfaceDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -35842,7 +41289,7 @@ CORBA::_TAO_LocalInterfaceDef_Remote_Proxy_Impl::_TAO_LocalInterfaceDef_Remote_P
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -35890,7 +41337,7 @@ CORBA::_TAO_LocalInterfaceDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::LocalInterfaceDef::LocalInterfaceDef (int collocated)
 {
@@ -36183,7 +41630,7 @@ const char* CORBA::LocalInterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_LocalInterfaceDef[] =
 {
@@ -36199,13 +41646,13 @@ static const CORBA::Long _oc_CORBA_LocalInterfaceDef[] =
   ACE_NTOHL (0x66616365), 
   ACE_NTOHL (0x4465663a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDef:1.0
-  18,
+    18,
   ACE_NTOHL (0x4c6f6361), 
   ACE_NTOHL (0x6c496e74), 
   ACE_NTOHL (0x65726661), 
   ACE_NTOHL (0x63654465), 
   ACE_NTOHL (0x66000000),  // name = LocalInterfaceDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_LocalInterfaceDef (
     CORBA::tk_objref,
@@ -36225,52 +41672,737 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
+int CORBA::ExtLocalInterfaceDef::_tao_class_id = 0;
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::PrimitiveKind _tao_elem)
+CORBA::ExtLocalInterfaceDef_ptr
+tao_CORBA_ExtLocalInterfaceDef_duplicate (
+    CORBA::ExtLocalInterfaceDef_ptr p
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_PrimitiveKind,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  return CORBA::ExtLocalInterfaceDef::_duplicate (p);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveKind &_tao_elem)
+void
+tao_CORBA_ExtLocalInterfaceDef_release (
+    CORBA::ExtLocalInterfaceDef_ptr p
+  )
 {
-  ACE_TRY_NEW_ENV
+  CORBA::release (p);
+}
+
+CORBA::ExtLocalInterfaceDef_ptr
+tao_CORBA_ExtLocalInterfaceDef_nil (
+    void
+  )
+{
+  return CORBA::ExtLocalInterfaceDef::_nil ();
+}
+
+CORBA::ExtLocalInterfaceDef_ptr
+tao_CORBA_ExtLocalInterfaceDef_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return CORBA::ExtLocalInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+tao_CORBA_ExtLocalInterfaceDef_upcast (
+    void *src
+  )
+{
+  CORBA::ExtLocalInterfaceDef **tmp =
+    ACE_static_cast (CORBA::ExtLocalInterfaceDef **, src);
+  return *tmp;
+}
+
+CORBA::Boolean
+tao_CORBA_ExtLocalInterfaceDef_marshal (
+    CORBA::ExtLocalInterfaceDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
+// *************************************************************
+// CORBA::ExtLocalInterfaceDef_var
+// *************************************************************
+
+CORBA::ExtLocalInterfaceDef_var::ExtLocalInterfaceDef_var (void)
+  : ptr_ (ExtLocalInterfaceDef::_nil ())
+{}
+
+::CORBA::ExtLocalInterfaceDef_ptr
+CORBA::ExtLocalInterfaceDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA::ExtLocalInterfaceDef_var::ExtLocalInterfaceDef_var (const ::CORBA::ExtLocalInterfaceDef_var &p)
+  : TAO_Base_var (),
+    ptr_ (ExtLocalInterfaceDef::_duplicate (p.ptr ()))
+{}
+
+CORBA::ExtLocalInterfaceDef_var::~ExtLocalInterfaceDef_var (void)
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA::ExtLocalInterfaceDef_var &
+CORBA::ExtLocalInterfaceDef_var::operator= (ExtLocalInterfaceDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ExtLocalInterfaceDef_var &
+CORBA::ExtLocalInterfaceDef_var::operator= (const ::CORBA::ExtLocalInterfaceDef_var &p)
+{
+  if (this != &p)
   {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result = type->equivalent (CORBA::_tc_PrimitiveKind ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      return 0; // not equivalent
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
-      );
-    if (stream >> _tao_elem)
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA::ExtLocalInterfaceDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA::ExtLocalInterfaceDef_var::operator const ::CORBA::ExtLocalInterfaceDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA::ExtLocalInterfaceDef_var::operator ::CORBA::ExtLocalInterfaceDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtLocalInterfaceDef_ptr
+CORBA::ExtLocalInterfaceDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtLocalInterfaceDef_ptr
+CORBA::ExtLocalInterfaceDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtLocalInterfaceDef_ptr &
+CORBA::ExtLocalInterfaceDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtLocalInterfaceDef_ptr &
+CORBA::ExtLocalInterfaceDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ExtLocalInterfaceDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA::ExtLocalInterfaceDef_ptr
+CORBA::ExtLocalInterfaceDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA::ExtLocalInterfaceDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ExtLocalInterfaceDef::_nil ();
+  return val;
+}
+
+::CORBA::ExtLocalInterfaceDef_ptr
+CORBA::ExtLocalInterfaceDef_var::tao_duplicate (ExtLocalInterfaceDef_ptr p)
+{
+  return ::CORBA::ExtLocalInterfaceDef::_duplicate (p);
+}
+
+void
+CORBA::ExtLocalInterfaceDef_var::tao_release (ExtLocalInterfaceDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA::ExtLocalInterfaceDef_ptr
+CORBA::ExtLocalInterfaceDef_var::tao_nil (void)
+{
+  return ::CORBA::ExtLocalInterfaceDef::_nil ();
+}
+
+::CORBA::ExtLocalInterfaceDef_ptr
+CORBA::ExtLocalInterfaceDef_var::tao_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return ::CORBA::ExtLocalInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+CORBA::ExtLocalInterfaceDef_var::tao_upcast (void *src)
+{
+  ExtLocalInterfaceDef **tmp =
+    ACE_static_cast (ExtLocalInterfaceDef **, src);
+  return *tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
+// *************************************************************
+// CORBA::ExtLocalInterfaceDef_out
+// *************************************************************
+
+CORBA::ExtLocalInterfaceDef_out::ExtLocalInterfaceDef_out (ExtLocalInterfaceDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA::ExtLocalInterfaceDef::_nil ();
+}
+
+CORBA::ExtLocalInterfaceDef_out::ExtLocalInterfaceDef_out (ExtLocalInterfaceDef_var &p)
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ExtLocalInterfaceDef::_nil ();
+}
+
+CORBA::ExtLocalInterfaceDef_out::ExtLocalInterfaceDef_out (const ::CORBA::ExtLocalInterfaceDef_out &p)
+  : ptr_ (ACE_const_cast (ExtLocalInterfaceDef_out &, p).ptr_)
+{}
+
+::CORBA::ExtLocalInterfaceDef_out &
+CORBA::ExtLocalInterfaceDef_out::operator= (const ::CORBA::ExtLocalInterfaceDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtLocalInterfaceDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA::ExtLocalInterfaceDef_out &
+CORBA::ExtLocalInterfaceDef_out::operator= (const ::CORBA::ExtLocalInterfaceDef_var &p)
+{
+  this->ptr_ = ::CORBA::ExtLocalInterfaceDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA::ExtLocalInterfaceDef_out &
+CORBA::ExtLocalInterfaceDef_out::operator= (ExtLocalInterfaceDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ExtLocalInterfaceDef_out::operator ::CORBA::ExtLocalInterfaceDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtLocalInterfaceDef_ptr &
+CORBA::ExtLocalInterfaceDef_out::ptr (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtLocalInterfaceDef_ptr
+CORBA::ExtLocalInterfaceDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//                Base & Remote Proxy  Implementation. 
+//
+
+CORBA::_TAO_ExtLocalInterfaceDef_Proxy_Impl::_TAO_ExtLocalInterfaceDef_Proxy_Impl (void)
+{}
+
+CORBA::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+//
+//            End  Base & Remote  Proxy Implemeentation. 
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//           Remote & Base  Proxy Broker Implementation
+//
+
+CORBA::_TAO_ExtLocalInterfaceDef_Proxy_Broker::_TAO_ExtLocalInterfaceDef_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtLocalInterfaceDef_Proxy_Broker::~_TAO_ExtLocalInterfaceDef_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtLocalInterfaceDef_Proxy_Broker * (*CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+// Factory Member function Implementation.
+CORBA::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker *
+CORBA::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker::the_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker (void)
+{
+  static ::CORBA::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
+  return &remote_proxy_broker;
+}
+
+CORBA::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker::~_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtLocalInterfaceDef_Proxy_Impl&
+CORBA::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ExtLocalInterfaceDef *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  return this->remote_proxy_impl_;
+}
+
+//
+//           End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+
+CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (int collocated)
+{
+  this->CORBA_ExtLocalInterfaceDef_setup_collocation (collocated);
+}
+
+void
+CORBA::ExtLocalInterfaceDef::CORBA_ExtLocalInterfaceDef_setup_collocation (int collocated)
+{
+  if (collocated)
+    this->the_TAO_ExtLocalInterfaceDef_Proxy_Broker_ =
+      ::CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
+  else
+    this->the_TAO_ExtLocalInterfaceDef_Proxy_Broker_ =
+      ::CORBA::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker::the_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker ();
+  
+  this->CORBA_LocalInterfaceDef_setup_collocation (collocated);
+  this->CORBA_InterfaceAttrExtension_setup_collocation (collocated);
+}
+
+CORBA::ExtLocalInterfaceDef::~ExtLocalInterfaceDef (void)
+{}
+
+void 
+CORBA::ExtLocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtLocalInterfaceDef *tmp = ACE_static_cast (ExtLocalInterfaceDef *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+CORBA::ExtLocalInterfaceDef_ptr
+CORBA::ExtLocalInterfaceDef::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (CORBA::is_nil (obj))
     {
-      return 1;
+      return ExtLocalInterfaceDef::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
+      ACE_CHECK_RETURN (ExtLocalInterfaceDef::_nil ());
+      
+      if (is_a == 0)
+        {
+          return ExtLocalInterfaceDef::_nil ();
+        }
+    }
+  
+  return ExtLocalInterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::ExtLocalInterfaceDef_ptr 
+CORBA::ExtLocalInterfaceDef::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return ExtLocalInterfaceDef::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      TAO_Stub* stub = obj->_stubobj ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
+      ExtLocalInterfaceDef_ptr default_proxy = ExtLocalInterfaceDef::_nil ();
+      
+      if (
+          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+          obj->_is_collocated () &&
+          CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer != 0
+        )
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ExtLocalInterfaceDef (
+                  stub,
+                  1,
+                  obj->_servant ()
+                ),
+              ExtLocalInterfaceDef::_nil ()
+            );
+        }
+      
+      if (CORBA::is_nil (default_proxy))
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ExtLocalInterfaceDef (
+                  stub,
+                  0,
+                  obj->_servant ()
+                ),
+              ExtLocalInterfaceDef::_nil ()
+            );
+        }
+      
+      return default_proxy;
+    }
+  else 
+    return
+      ACE_reinterpret_cast (
+          ExtLocalInterfaceDef_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ExtLocalInterfaceDef::_tao_class_id
+                )
+            )
+        );
+}
+
+CORBA::ExtLocalInterfaceDef_ptr
+CORBA::ExtLocalInterfaceDef::_duplicate (ExtLocalInterfaceDef_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+CORBA::ExtLocalInterfaceDef::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalInterfaceDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Container:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Contained:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/IDLType:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/IRObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
     }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+}
+
+void *CORBA::ExtLocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, ExtLocalInterfaceDef)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, LocalInterfaceDef)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::LocalInterfaceDef_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, InterfaceAttrExtension)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::InterfaceAttrExtension_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, InterfaceDef)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::InterfaceDef_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Container::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Container_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Contained::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Contained_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::IDLType::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::IDLType_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::IRObject::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::IRObject_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
+  return retv;
+}
+
+const char* CORBA::ExtLocalInterfaceDef::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExtLocalInterfaceDef[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  43,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x744c6f63), 
+  ACE_NTOHL (0x616c496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636544), 
+  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0
+    21,
+  ACE_NTOHL (0x4578744c), 
+  ACE_NTOHL (0x6f63616c), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65446566), 
+  ACE_NTOHL (0x0),  // name = ExtLocalInterfaceDef
+  };
 
-// Copying version.
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtLocalInterfaceDef (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_ExtLocalInterfaceDef),
+    (char *) &_oc_CORBA_ExtLocalInterfaceDef,
+    0,
+    sizeof (CORBA::ExtLocalInterfaceDef)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtLocalInterfaceDef,
+    &_tc_TAO_tc_CORBA_ExtLocalInterfaceDef
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PrimitiveKind _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>::insert (
+      _tao_any,
+      CORBA::_tc_PrimitiveKind,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::PrimitiveKind &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>::extract (
+        _tao_any,
+        CORBA::_tc_PrimitiveKind,
+        _tao_elem 
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// 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,
@@ -36282,26 +42414,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::Repository_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_Repository, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::Repository::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::Repository>::insert (
+      _tao_any,
+      CORBA::Repository::_tao_any_destructor,
+      CORBA::_tc_Repository,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -36310,62 +42435,37 @@ operator>>= (
     CORBA::Repository_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::Repository::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_Repository
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::Repository>::extract (
+        _tao_any,
+        CORBA::Repository::_tao_any_destructor,
+        CORBA::_tc_Repository,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_Repository,
-            1,
-            _tao_elem,
-            CORBA::Repository::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::Repository::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::Repository::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::Repository>::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::Repository,CORBA::Repository_var>;
+  template class TAO::Any_Impl_T<CORBA::Repository>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::Repository,CORBA::Repository_var>
+# pragma instantiate TAO_Object_Manager<CORBA::Repository, CORBA::Repository_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::Repository>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -36377,26 +42477,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::ModuleDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ModuleDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::ModuleDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ModuleDef>::insert (
+      _tao_any,
+      CORBA::ModuleDef::_tao_any_destructor,
+      CORBA::_tc_ModuleDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -36405,60 +42498,35 @@ operator>>= (
     CORBA::ModuleDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ModuleDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ModuleDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ModuleDef>::extract (
+        _tao_any,
+        CORBA::ModuleDef::_tao_any_destructor,
+        CORBA::_tc_ModuleDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ModuleDef,
-            1,
-            _tao_elem,
-            CORBA::ModuleDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::ModuleDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::ModuleDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ModuleDef>::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::ModuleDef,CORBA::ModuleDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ModuleDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::ModuleDef,CORBA::ModuleDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ModuleDef, CORBA::ModuleDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ModuleDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -36466,16 +42534,12 @@ void operator<<= (
     const CORBA::ModuleDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ModuleDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::insert_copy (
+      _tao_any,
+      CORBA::ModuleDescription::_tao_any_destructor,
+      CORBA::_tc_ModuleDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -36484,19 +42548,12 @@ void operator<<= (
     CORBA::ModuleDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ModuleDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ModuleDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::insert (
+      _tao_any,
+      CORBA::ModuleDescription::_tao_any_destructor,
+      CORBA::_tc_ModuleDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -36517,77 +42574,26 @@ CORBA::Boolean operator>>= (
     const CORBA::ModuleDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ModuleDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::ModuleDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::ModuleDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ModuleDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ModuleDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ModuleDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::extract (
+        _tao_any,
+        CORBA::ModuleDescription::_tao_any_destructor,
+        CORBA::_tc_ModuleDescription,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -36599,26 +42605,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::ConstantDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ConstantDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::ConstantDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ConstantDef>::insert (
+      _tao_any,
+      CORBA::ConstantDef::_tao_any_destructor,
+      CORBA::_tc_ConstantDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -36627,60 +42626,35 @@ operator>>= (
     CORBA::ConstantDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ConstantDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ConstantDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ConstantDef>::extract (
+        _tao_any,
+        CORBA::ConstantDef::_tao_any_destructor,
+        CORBA::_tc_ConstantDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ConstantDef,
-            1,
-            _tao_elem,
-            CORBA::ConstantDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::ConstantDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::ConstantDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ConstantDef>::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::ConstantDef,CORBA::ConstantDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ConstantDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::ConstantDef,CORBA::ConstantDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ConstantDef, CORBA::ConstantDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ConstantDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -36688,16 +42662,12 @@ void operator<<= (
     const CORBA::ConstantDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ConstantDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::insert_copy (
+      _tao_any,
+      CORBA::ConstantDescription::_tao_any_destructor,
+      CORBA::_tc_ConstantDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -36706,19 +42676,12 @@ void operator<<= (
     CORBA::ConstantDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ConstantDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ConstantDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::insert (
+      _tao_any,
+      CORBA::ConstantDescription::_tao_any_destructor,
+      CORBA::_tc_ConstantDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -36739,77 +42702,26 @@ CORBA::Boolean operator>>= (
     const CORBA::ConstantDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ConstantDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::ConstantDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::ConstantDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ConstantDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ConstantDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ConstantDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::extract (
+        _tao_any,
+        CORBA::ConstantDescription::_tao_any_destructor,
+        CORBA::_tc_ConstantDescription,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -36821,26 +42733,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::StructDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_StructDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::StructDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::StructDef>::insert (
+      _tao_any,
+      CORBA::StructDef::_tao_any_destructor,
+      CORBA::_tc_StructDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -36849,62 +42754,37 @@ operator>>= (
     CORBA::StructDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::StructDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_StructDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::StructDef>::extract (
+        _tao_any,
+        CORBA::StructDef::_tao_any_destructor,
+        CORBA::_tc_StructDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_StructDef,
-            1,
-            _tao_elem,
-            CORBA::StructDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::StructDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::StructDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::StructDef>::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::StructDef,CORBA::StructDef_var>;
+  template class TAO::Any_Impl_T<CORBA::StructDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::StructDef,CORBA::StructDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::StructDef, CORBA::StructDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::StructDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -36916,26 +42796,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::UnionDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_UnionDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::UnionDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::UnionDef>::insert (
+      _tao_any,
+      CORBA::UnionDef::_tao_any_destructor,
+      CORBA::_tc_UnionDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -36944,62 +42817,37 @@ operator>>= (
     CORBA::UnionDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::UnionDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_UnionDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::UnionDef>::extract (
+        _tao_any,
+        CORBA::UnionDef::_tao_any_destructor,
+        CORBA::_tc_UnionDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_UnionDef,
-            1,
-            _tao_elem,
-            CORBA::UnionDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::UnionDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::UnionDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::UnionDef>::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::UnionDef,CORBA::UnionDef_var>;
+  template class TAO::Any_Impl_T<CORBA::UnionDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::UnionDef,CORBA::UnionDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::UnionDef, CORBA::UnionDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::UnionDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -37011,26 +42859,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::EnumDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_EnumDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::EnumDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::EnumDef>::insert (
+      _tao_any,
+      CORBA::EnumDef::_tao_any_destructor,
+      CORBA::_tc_EnumDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -37039,62 +42880,37 @@ operator>>= (
     CORBA::EnumDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::EnumDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_EnumDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::EnumDef>::extract (
+        _tao_any,
+        CORBA::EnumDef::_tao_any_destructor,
+        CORBA::_tc_EnumDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_EnumDef,
-            1,
-            _tao_elem,
-            CORBA::EnumDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::EnumDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::EnumDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::EnumDef>::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::EnumDef,CORBA::EnumDef_var>;
+  template class TAO::Any_Impl_T<CORBA::EnumDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::EnumDef,CORBA::EnumDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::EnumDef, CORBA::EnumDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::EnumDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -37106,26 +42922,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::AliasDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_AliasDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::AliasDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::AliasDef>::insert (
+      _tao_any,
+      CORBA::AliasDef::_tao_any_destructor,
+      CORBA::_tc_AliasDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -37134,62 +42943,37 @@ operator>>= (
     CORBA::AliasDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::AliasDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_AliasDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::AliasDef>::extract (
+        _tao_any,
+        CORBA::AliasDef::_tao_any_destructor,
+        CORBA::_tc_AliasDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_AliasDef,
-            1,
-            _tao_elem,
-            CORBA::AliasDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::AliasDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::AliasDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::AliasDef>::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::AliasDef,CORBA::AliasDef_var>;
+  template class TAO::Any_Impl_T<CORBA::AliasDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::AliasDef,CORBA::AliasDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::AliasDef, CORBA::AliasDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::AliasDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -37201,26 +42985,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::NativeDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_NativeDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::NativeDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::NativeDef>::insert (
+      _tao_any,
+      CORBA::NativeDef::_tao_any_destructor,
+      CORBA::_tc_NativeDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -37229,62 +43006,37 @@ operator>>= (
     CORBA::NativeDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::NativeDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_NativeDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::NativeDef>::extract (
+        _tao_any,
+        CORBA::NativeDef::_tao_any_destructor,
+        CORBA::_tc_NativeDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_NativeDef,
-            1,
-            _tao_elem,
-            CORBA::NativeDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::NativeDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::NativeDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::NativeDef>::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::NativeDef,CORBA::NativeDef_var>;
+  template class TAO::Any_Impl_T<CORBA::NativeDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::NativeDef,CORBA::NativeDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::NativeDef, CORBA::NativeDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::NativeDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -37296,26 +43048,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::PrimitiveDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_PrimitiveDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::PrimitiveDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::PrimitiveDef>::insert (
+      _tao_any,
+      CORBA::PrimitiveDef::_tao_any_destructor,
+      CORBA::_tc_PrimitiveDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -37324,62 +43069,37 @@ operator>>= (
     CORBA::PrimitiveDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::PrimitiveDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_PrimitiveDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::PrimitiveDef>::extract (
+        _tao_any,
+        CORBA::PrimitiveDef::_tao_any_destructor,
+        CORBA::_tc_PrimitiveDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_PrimitiveDef,
-            1,
-            _tao_elem,
-            CORBA::PrimitiveDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::PrimitiveDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::PrimitiveDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::PrimitiveDef>::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::PrimitiveDef,CORBA::PrimitiveDef_var>;
+  template class TAO::Any_Impl_T<CORBA::PrimitiveDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::PrimitiveDef,CORBA::PrimitiveDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::PrimitiveDef, CORBA::PrimitiveDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::PrimitiveDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -37391,26 +43111,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::StringDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_StringDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::StringDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::StringDef>::insert (
+      _tao_any,
+      CORBA::StringDef::_tao_any_destructor,
+      CORBA::_tc_StringDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -37419,62 +43132,37 @@ operator>>= (
     CORBA::StringDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::StringDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_StringDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::StringDef>::extract (
+        _tao_any,
+        CORBA::StringDef::_tao_any_destructor,
+        CORBA::_tc_StringDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_StringDef,
-            1,
-            _tao_elem,
-            CORBA::StringDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::StringDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::StringDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::StringDef>::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::StringDef,CORBA::StringDef_var>;
+  template class TAO::Any_Impl_T<CORBA::StringDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::StringDef,CORBA::StringDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::StringDef, CORBA::StringDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::StringDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -37486,26 +43174,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::WstringDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_WstringDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::WstringDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::WstringDef>::insert (
+      _tao_any,
+      CORBA::WstringDef::_tao_any_destructor,
+      CORBA::_tc_WstringDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -37514,62 +43195,37 @@ operator>>= (
     CORBA::WstringDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::WstringDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_WstringDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::WstringDef>::extract (
+        _tao_any,
+        CORBA::WstringDef::_tao_any_destructor,
+        CORBA::_tc_WstringDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_WstringDef,
-            1,
-            _tao_elem,
-            CORBA::WstringDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::WstringDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::WstringDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::WstringDef>::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::WstringDef,CORBA::WstringDef_var>;
+  template class TAO::Any_Impl_T<CORBA::WstringDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::WstringDef,CORBA::WstringDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::WstringDef, CORBA::WstringDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::WstringDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -37581,26 +43237,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::SequenceDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_SequenceDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::SequenceDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::SequenceDef>::insert (
+      _tao_any,
+      CORBA::SequenceDef::_tao_any_destructor,
+      CORBA::_tc_SequenceDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -37609,62 +43258,37 @@ operator>>= (
     CORBA::SequenceDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::SequenceDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_SequenceDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::SequenceDef>::extract (
+        _tao_any,
+        CORBA::SequenceDef::_tao_any_destructor,
+        CORBA::_tc_SequenceDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_SequenceDef,
-            1,
-            _tao_elem,
-            CORBA::SequenceDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::SequenceDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::SequenceDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::SequenceDef>::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::SequenceDef,CORBA::SequenceDef_var>;
+  template class TAO::Any_Impl_T<CORBA::SequenceDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::SequenceDef,CORBA::SequenceDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::SequenceDef, CORBA::SequenceDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::SequenceDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -37676,26 +43300,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::ArrayDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ArrayDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::ArrayDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ArrayDef>::insert (
+      _tao_any,
+      CORBA::ArrayDef::_tao_any_destructor,
+      CORBA::_tc_ArrayDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -37704,62 +43321,37 @@ operator>>= (
     CORBA::ArrayDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ArrayDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ArrayDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ArrayDef>::extract (
+        _tao_any,
+        CORBA::ArrayDef::_tao_any_destructor,
+        CORBA::_tc_ArrayDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ArrayDef,
-            1,
-            _tao_elem,
-            CORBA::ArrayDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::ArrayDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::ArrayDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ArrayDef>::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::ArrayDef,CORBA::ArrayDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ArrayDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::ArrayDef,CORBA::ArrayDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ArrayDef, CORBA::ArrayDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ArrayDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -37771,26 +43363,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::ExceptionDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ExceptionDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::ExceptionDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ExceptionDef>::insert (
+      _tao_any,
+      CORBA::ExceptionDef::_tao_any_destructor,
+      CORBA::_tc_ExceptionDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -37799,225 +43384,62 @@ operator>>= (
     CORBA::ExceptionDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ExceptionDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ExceptionDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ExceptionDef>::extract (
+        _tao_any,
+        CORBA::ExceptionDef::_tao_any_destructor,
+        CORBA::_tc_ExceptionDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ExceptionDef,
-            1,
-            _tao_elem,
-            CORBA::ExceptionDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::ExceptionDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::ExceptionDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ExceptionDef>::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::ExceptionDef,CORBA::ExceptionDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ExceptionDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ExceptionDef, CORBA::ExceptionDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ExceptionDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::ExceptionDescription &_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ExceptionDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExceptionDescription *_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ExceptionDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ExceptionDescription::_tao_any_destructor
-        );
-    }
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExceptionDescription *&_tao_elem
+    const CORBA::ExceptionDefSeq &_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExceptionDescription *&,
+  TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExceptionDefSeq::_tao_any_destructor,
+      CORBA::_tc_ExceptionDefSeq,
       _tao_elem
     );
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExceptionDescription *&_tao_elem
-  )
-{
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ExceptionDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::ExceptionDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::ExceptionDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ExceptionDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ExceptionDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ExceptionDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExceptionDefSeq &_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ExceptionDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
-}
-
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     CORBA::ExceptionDefSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ExceptionDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ExceptionDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert (
+      _tao_any,
+      CORBA::ExceptionDefSeq::_tao_any_destructor,
+      CORBA::_tc_ExceptionDefSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -38026,8 +43448,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExceptionDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::ExceptionDefSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ExceptionDefSeq *&,
       _tao_elem
     );
 }
@@ -38038,247 +43460,54 @@ CORBA::Boolean operator>>= (
     const CORBA::ExceptionDefSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ExceptionDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::ExceptionDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::ExceptionDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ExceptionDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ExceptionDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ExceptionDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::extract (
+        _tao_any,
+        CORBA::ExceptionDefSeq::_tao_any_destructor,
+        CORBA::_tc_ExceptionDefSeq,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExcDescriptionSeq &_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ExcDescriptionSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
 
-// Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    CORBA::ExcDescriptionSeq *_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ExcDescriptionSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ExcDescriptionSeq::_tao_any_destructor
-        );
-    }
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExcDescriptionSeq *&_tao_elem
+    CORBA::AttributeMode _tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::ExcDescriptionSeq*&,
+  TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::insert (
+      _tao_any,
+      CORBA::_tc_AttributeMode,
       _tao_elem
     );
 }
 
-// Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const CORBA::ExcDescriptionSeq *&_tao_elem
+    CORBA::AttributeMode &_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ExcDescriptionSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::ExcDescriptionSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::ExcDescriptionSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ExcDescriptionSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ExcDescriptionSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ExcDescriptionSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::AttributeMode _tao_elem)
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_AttributeMode,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeMode &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result = type->equivalent (CORBA::_tc_AttributeMode ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      return 0; // not equivalent
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::extract (
+        _tao_any,
+        CORBA::_tc_AttributeMode,
+        _tao_elem 
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<CORBA::AttributeMode>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::AttributeMode>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -38290,26 +43519,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::AttributeDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_AttributeDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::AttributeDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::AttributeDef>::insert (
+      _tao_any,
+      CORBA::AttributeDef::_tao_any_destructor,
+      CORBA::_tc_AttributeDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -38318,60 +43540,35 @@ operator>>= (
     CORBA::AttributeDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::AttributeDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_AttributeDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::AttributeDef>::extract (
+        _tao_any,
+        CORBA::AttributeDef::_tao_any_destructor,
+        CORBA::_tc_AttributeDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_AttributeDef,
-            1,
-            _tao_elem,
-            CORBA::AttributeDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::AttributeDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::AttributeDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::AttributeDef>::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::AttributeDef,CORBA::AttributeDef_var>;
+  template class TAO::Any_Impl_T<CORBA::AttributeDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::AttributeDef,CORBA::AttributeDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::AttributeDef, CORBA::AttributeDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::AttributeDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -38379,16 +43576,12 @@ void operator<<= (
     const CORBA::AttributeDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_AttributeDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::insert_copy (
+      _tao_any,
+      CORBA::AttributeDescription::_tao_any_destructor,
+      CORBA::_tc_AttributeDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -38397,19 +43590,12 @@ void operator<<= (
     CORBA::AttributeDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_AttributeDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::AttributeDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::insert (
+      _tao_any,
+      CORBA::AttributeDescription::_tao_any_destructor,
+      CORBA::_tc_AttributeDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -38430,161 +43616,187 @@ CORBA::Boolean operator>>= (
     const CORBA::AttributeDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_AttributeDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::AttributeDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::AttributeDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::AttributeDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_AttributeDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::AttributeDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::extract (
+        _tao_any,
+        CORBA::AttributeDescription::_tao_any_destructor,
+        CORBA::_tc_AttributeDescription,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>
+#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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtAttributeDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>::insert_copy (
+      _tao_any,
+      CORBA::ExtAttributeDescription::_tao_any_destructor,
+      CORBA::_tc_ExtAttributeDescription,
+      _tao_elem
+    );
 }
 
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAttributeDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>::insert (
+      _tao_any,
+      CORBA::ExtAttributeDescription::_tao_any_destructor,
+      CORBA::_tc_ExtAttributeDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtAttributeDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ExtAttributeDescription *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtAttributeDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>::extract (
+        _tao_any,
+        CORBA::ExtAttributeDescription::_tao_any_destructor,
+        CORBA::_tc_ExtAttributeDescription,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::OperationMode _tao_elem)
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAttributeDef_ptr _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_OperationMode,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+  CORBA::ExtAttributeDef_ptr _tao_objptr =
+    CORBA::ExtAttributeDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAttributeDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ExtAttributeDef>::insert (
+      _tao_any,
+      CORBA::ExtAttributeDef::_tao_any_destructor,
+      CORBA::_tc_ExtAttributeDef,
+      *_tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationMode &_tao_elem)
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtAttributeDef_ptr &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result = type->equivalent (CORBA::_tc_OperationMode ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      return 0; // not equivalent
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ExtAttributeDef>::extract (
+        _tao_any,
+        CORBA::ExtAttributeDef::_tao_any_destructor,
+        CORBA::_tc_ExtAttributeDef,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ExtAttributeDef>::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::ExtAttributeDef,CORBA::ExtAttributeDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ExtAttributeDef>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ExtAttributeDef, CORBA::ExtAttributeDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ExtAttributeDef>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ParameterMode _tao_elem)
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OperationMode _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_ParameterMode,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+  TAO::Any_Basic_Impl_T<CORBA::OperationMode>::insert (
+      _tao_any,
+      CORBA::_tc_OperationMode,
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParameterMode &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::OperationMode &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result = type->equivalent (CORBA::_tc_ParameterMode ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      return 0; // not equivalent
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Basic_Impl_T<CORBA::OperationMode>::extract (
+        _tao_any,
+        CORBA::_tc_OperationMode,
+        _tao_elem 
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<CORBA::OperationMode>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::OperationMode>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -38592,16 +43804,12 @@ void operator<<= (
     const CORBA::ParameterDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ParameterDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::insert_copy (
+      _tao_any,
+      CORBA::ParameterDescription::_tao_any_destructor,
+      CORBA::_tc_ParameterDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -38610,19 +43818,12 @@ void operator<<= (
     CORBA::ParameterDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ParameterDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ParameterDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::insert (
+      _tao_any,
+      CORBA::ParameterDescription::_tao_any_destructor,
+      CORBA::_tc_ParameterDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -38643,75 +43844,24 @@ CORBA::Boolean operator>>= (
     const CORBA::ParameterDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ParameterDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::ParameterDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::ParameterDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ParameterDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ParameterDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ParameterDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::extract (
+        _tao_any,
+        CORBA::ParameterDescription::_tao_any_destructor,
+        CORBA::_tc_ParameterDescription,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -38719,16 +43869,12 @@ void operator<<= (
     const CORBA::ParDescriptionSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ParDescriptionSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ParDescriptionSeq::_tao_any_destructor,
+      CORBA::_tc_ParDescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -38737,19 +43883,12 @@ void operator<<= (
     CORBA::ParDescriptionSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ParDescriptionSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ParDescriptionSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ParDescriptionSeq::_tao_any_destructor,
+      CORBA::_tc_ParDescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -38758,8 +43897,8 @@ CORBA::Boolean operator>>= (
     CORBA::ParDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::ParDescriptionSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ParDescriptionSeq *&,
       _tao_elem
     );
 }
@@ -38770,75 +43909,17 @@ CORBA::Boolean operator>>= (
     const CORBA::ParDescriptionSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ParDescriptionSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::ParDescriptionSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::ParDescriptionSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ParDescriptionSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ParDescriptionSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ParDescriptionSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ParDescriptionSeq::_tao_any_destructor,
+        CORBA::_tc_ParDescriptionSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -38846,16 +43927,12 @@ void operator<<= (
     const CORBA::ContextIdSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ContextIdSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert_copy (
+      _tao_any,
+      CORBA::ContextIdSeq::_tao_any_destructor,
+      CORBA::_tc_ContextIdSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -38864,19 +43941,12 @@ void operator<<= (
     CORBA::ContextIdSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ContextIdSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ContextIdSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert (
+      _tao_any,
+      CORBA::ContextIdSeq::_tao_any_destructor,
+      CORBA::_tc_ContextIdSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -38885,8 +43955,8 @@ CORBA::Boolean operator>>= (
     CORBA::ContextIdSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::ContextIdSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ContextIdSeq *&,
       _tao_elem
     );
 }
@@ -38897,77 +43967,19 @@ CORBA::Boolean operator>>= (
     const CORBA::ContextIdSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ContextIdSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::ContextIdSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::ContextIdSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ContextIdSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ContextIdSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ContextIdSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::extract (
+        _tao_any,
+        CORBA::ContextIdSeq::_tao_any_destructor,
+        CORBA::_tc_ContextIdSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -38979,26 +43991,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::OperationDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_OperationDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::OperationDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::OperationDef>::insert (
+      _tao_any,
+      CORBA::OperationDef::_tao_any_destructor,
+      CORBA::_tc_OperationDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -39007,60 +44012,35 @@ operator>>= (
     CORBA::OperationDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::OperationDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_OperationDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::OperationDef>::extract (
+        _tao_any,
+        CORBA::OperationDef::_tao_any_destructor,
+        CORBA::_tc_OperationDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_OperationDef,
-            1,
-            _tao_elem,
-            CORBA::OperationDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::OperationDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::OperationDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::OperationDef>::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::OperationDef,CORBA::OperationDef_var>;
+  template class TAO::Any_Impl_T<CORBA::OperationDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::OperationDef,CORBA::OperationDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::OperationDef, CORBA::OperationDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::OperationDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -39068,16 +44048,12 @@ void operator<<= (
     const CORBA::OperationDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_OperationDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::insert_copy (
+      _tao_any,
+      CORBA::OperationDescription::_tao_any_destructor,
+      CORBA::_tc_OperationDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -39086,19 +44062,12 @@ void operator<<= (
     CORBA::OperationDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_OperationDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::OperationDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::insert (
+      _tao_any,
+      CORBA::OperationDescription::_tao_any_destructor,
+      CORBA::_tc_OperationDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -39119,75 +44088,24 @@ CORBA::Boolean operator>>= (
     const CORBA::OperationDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_OperationDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::OperationDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::OperationDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::OperationDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_OperationDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::OperationDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::extract (
+        _tao_any,
+        CORBA::OperationDescription::_tao_any_destructor,
+        CORBA::_tc_OperationDescription,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::OperationDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::OperationDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -39195,16 +44113,12 @@ void operator<<= (
     const CORBA::RepositoryIdSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_RepositoryIdSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert_copy (
+      _tao_any,
+      CORBA::RepositoryIdSeq::_tao_any_destructor,
+      CORBA::_tc_RepositoryIdSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -39213,19 +44127,12 @@ void operator<<= (
     CORBA::RepositoryIdSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_RepositoryIdSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::RepositoryIdSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert (
+      _tao_any,
+      CORBA::RepositoryIdSeq::_tao_any_destructor,
+      CORBA::_tc_RepositoryIdSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -39234,8 +44141,8 @@ CORBA::Boolean operator>>= (
     CORBA::RepositoryIdSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::RepositoryIdSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::RepositoryIdSeq *&,
       _tao_elem
     );
 }
@@ -39246,75 +44153,17 @@ CORBA::Boolean operator>>= (
     const CORBA::RepositoryIdSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_RepositoryIdSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::RepositoryIdSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::RepositoryIdSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::RepositoryIdSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_RepositoryIdSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::RepositoryIdSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::extract (
+        _tao_any,
+        CORBA::RepositoryIdSeq::_tao_any_destructor,
+        CORBA::_tc_RepositoryIdSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -39322,16 +44171,12 @@ void operator<<= (
     const CORBA::OpDescriptionSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_OpDescriptionSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::OpDescriptionSeq::_tao_any_destructor,
+      CORBA::_tc_OpDescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -39340,19 +44185,12 @@ void operator<<= (
     CORBA::OpDescriptionSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_OpDescriptionSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::OpDescriptionSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::OpDescriptionSeq::_tao_any_destructor,
+      CORBA::_tc_OpDescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -39361,8 +44199,8 @@ CORBA::Boolean operator>>= (
     CORBA::OpDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::OpDescriptionSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::OpDescriptionSeq *&,
       _tao_elem
     );
 }
@@ -39373,75 +44211,17 @@ CORBA::Boolean operator>>= (
     const CORBA::OpDescriptionSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_OpDescriptionSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::OpDescriptionSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::OpDescriptionSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::OpDescriptionSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_OpDescriptionSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::OpDescriptionSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::OpDescriptionSeq::_tao_any_destructor,
+        CORBA::_tc_OpDescriptionSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -39449,16 +44229,12 @@ void operator<<= (
     const CORBA::AttrDescriptionSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_AttrDescriptionSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::AttrDescriptionSeq::_tao_any_destructor,
+      CORBA::_tc_AttrDescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -39467,19 +44243,12 @@ void operator<<= (
     CORBA::AttrDescriptionSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_AttrDescriptionSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::AttrDescriptionSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::AttrDescriptionSeq::_tao_any_destructor,
+      CORBA::_tc_AttrDescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -39488,8 +44257,8 @@ CORBA::Boolean operator>>= (
     CORBA::AttrDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::AttrDescriptionSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::AttrDescriptionSeq *&,
       _tao_elem
     );
 }
@@ -39500,77 +44269,77 @@ CORBA::Boolean operator>>= (
     const CORBA::AttrDescriptionSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_AttrDescriptionSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::AttrDescriptionSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::AttrDescriptionSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::AttrDescriptionSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_AttrDescriptionSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::AttrDescriptionSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::AttrDescriptionSeq::_tao_any_destructor,
+        CORBA::_tc_AttrDescriptionSeq,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtAttrDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
+      CORBA::_tc_ExtAttrDescriptionSeq,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAttrDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
+      CORBA::_tc_ExtAttrDescriptionSeq,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtAttrDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ExtAttrDescriptionSeq *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtAttrDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
+        CORBA::_tc_ExtAttrDescriptionSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -39582,26 +44351,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::InterfaceDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_InterfaceDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::InterfaceDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::InterfaceDef>::insert (
+      _tao_any,
+      CORBA::InterfaceDef::_tao_any_destructor,
+      CORBA::_tc_InterfaceDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -39610,60 +44372,26 @@ operator>>= (
     CORBA::InterfaceDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::InterfaceDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_InterfaceDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::InterfaceDef>::extract (
+        _tao_any,
+        CORBA::InterfaceDef::_tao_any_destructor,
+        CORBA::_tc_InterfaceDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_InterfaceDef,
-            1,
-            _tao_elem,
-            CORBA::InterfaceDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::InterfaceDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::InterfaceDef::_nil ();
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var>;
+  template class TAO::Any_Impl_T<CORBA::InterfaceDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::InterfaceDef, CORBA::InterfaceDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::InterfaceDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -39671,16 +44399,12 @@ void operator<<= (
     const CORBA::InterfaceDef::FullInterfaceDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::InterfaceDef::_tc_FullInterfaceDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::insert_copy (
+      _tao_any,
+      CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
+      CORBA::InterfaceDef::_tc_FullInterfaceDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -39689,19 +44413,12 @@ void operator<<= (
     CORBA::InterfaceDef::FullInterfaceDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::InterfaceDef::_tc_FullInterfaceDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::insert (
+      _tao_any,
+      CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
+      CORBA::InterfaceDef::_tc_FullInterfaceDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -39722,75 +44439,24 @@ CORBA::Boolean operator>>= (
     const CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::InterfaceDef::_tc_FullInterfaceDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::InterfaceDef::FullInterfaceDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::InterfaceDef::FullInterfaceDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::InterfaceDef::FullInterfaceDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::InterfaceDef::_tc_FullInterfaceDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::extract (
+        _tao_any,
+        CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
+        CORBA::InterfaceDef::_tc_FullInterfaceDescription,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -39798,16 +44464,12 @@ void operator<<= (
     const CORBA::InterfaceDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_InterfaceDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::insert_copy (
+      _tao_any,
+      CORBA::InterfaceDescription::_tao_any_destructor,
+      CORBA::_tc_InterfaceDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -39816,19 +44478,12 @@ void operator<<= (
     CORBA::InterfaceDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_InterfaceDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::InterfaceDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::insert (
+      _tao_any,
+      CORBA::InterfaceDescription::_tao_any_destructor,
+      CORBA::_tc_InterfaceDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -39849,77 +44504,208 @@ CORBA::Boolean operator>>= (
     const CORBA::InterfaceDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_InterfaceDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::InterfaceDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::InterfaceDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::InterfaceDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_InterfaceDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::InterfaceDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::extract (
+        _tao_any,
+        CORBA::InterfaceDescription::_tao_any_destructor,
+        CORBA::_tc_InterfaceDescription,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// 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::InterfaceAttrExtension_ptr _tao_elem
+  )
+{
+  CORBA::InterfaceAttrExtension_ptr _tao_objptr =
+    CORBA::InterfaceAttrExtension::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceAttrExtension_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>::insert (
+      _tao_any,
+      CORBA::InterfaceAttrExtension::_tao_any_destructor,
+      CORBA::_tc_InterfaceAttrExtension,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InterfaceAttrExtension_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>::extract (
+        _tao_any,
+        CORBA::InterfaceAttrExtension::_tao_any_destructor,
+        CORBA::_tc_InterfaceAttrExtension,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO_Object_Manager<CORBA::InterfaceAttrExtension,CORBA::InterfaceAttrExtension_var>;
+  template class TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::InterfaceAttrExtension, CORBA::InterfaceAttrExtension_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>
+#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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::insert_copy (
+      _tao_any,
+      CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor,
+      CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::insert (
+      _tao_any,
+      CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor,
+      CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription,
+      _tao_elem
+    );
 }
 
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::extract (
+        _tao_any,
+        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor,
+        CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtInterfaceDef_ptr _tao_elem
+  )
+{
+  CORBA::ExtInterfaceDef_ptr _tao_objptr =
+    CORBA::ExtInterfaceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtInterfaceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ExtInterfaceDef>::insert (
+      _tao_any,
+      CORBA::ExtInterfaceDef::_tao_any_destructor,
+      CORBA::_tc_ExtInterfaceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtInterfaceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ExtInterfaceDef>::extract (
+        _tao_any,
+        CORBA::ExtInterfaceDef::_tao_any_destructor,
+        CORBA::_tc_ExtInterfaceDef,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ExtInterfaceDef>::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::ExtInterfaceDef,CORBA::ExtInterfaceDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ExtInterfaceDef>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ExtInterfaceDef, CORBA::ExtInterfaceDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ExtInterfaceDef>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// 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,
@@ -39931,26 +44717,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::AbstractInterfaceDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_AbstractInterfaceDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::AbstractInterfaceDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::insert (
+      _tao_any,
+      CORBA::AbstractInterfaceDef::_tao_any_destructor,
+      CORBA::_tc_AbstractInterfaceDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -39959,62 +44738,100 @@ operator>>= (
     CORBA::AbstractInterfaceDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::AbstractInterfaceDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_AbstractInterfaceDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::extract (
+        _tao_any,
+        CORBA::AbstractInterfaceDef::_tao_any_destructor,
+        CORBA::_tc_AbstractInterfaceDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_AbstractInterfaceDef,
-            1,
-            _tao_elem,
-            CORBA::AbstractInterfaceDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::AbstractInterfaceDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::AbstractInterfaceDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::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::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var>;
+  template class TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::AbstractInterfaceDef, CORBA::AbstractInterfaceDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAbstractInterfaceDef_ptr _tao_elem
+  )
+{
+  CORBA::ExtAbstractInterfaceDef_ptr _tao_objptr =
+    CORBA::ExtAbstractInterfaceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAbstractInterfaceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::insert (
+      _tao_any,
+      CORBA::ExtAbstractInterfaceDef::_tao_any_destructor,
+      CORBA::_tc_ExtAbstractInterfaceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtAbstractInterfaceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::extract (
+        _tao_any,
+        CORBA::ExtAbstractInterfaceDef::_tao_any_destructor,
+        CORBA::_tc_ExtAbstractInterfaceDef,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::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::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ExtAbstractInterfaceDef>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ExtAbstractInterfaceDef, CORBA::ExtAbstractInterfaceDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ExtAbstractInterfaceDef>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// 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,
@@ -40026,26 +44843,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::LocalInterfaceDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_LocalInterfaceDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::LocalInterfaceDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::insert (
+      _tao_any,
+      CORBA::LocalInterfaceDef::_tao_any_destructor,
+      CORBA::_tc_LocalInterfaceDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -40054,60 +44864,98 @@ operator>>= (
     CORBA::LocalInterfaceDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::LocalInterfaceDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_LocalInterfaceDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::extract (
+        _tao_any,
+        CORBA::LocalInterfaceDef::_tao_any_destructor,
+        CORBA::_tc_LocalInterfaceDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_LocalInterfaceDef,
-            1,
-            _tao_elem,
-            CORBA::LocalInterfaceDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::LocalInterfaceDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::LocalInterfaceDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::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::LocalInterfaceDef,CORBA::LocalInterfaceDef_var>;
+  template class TAO::Any_Impl_T<CORBA::LocalInterfaceDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::LocalInterfaceDef, CORBA::LocalInterfaceDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::LocalInterfaceDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtLocalInterfaceDef_ptr _tao_elem
+  )
+{
+  CORBA::ExtLocalInterfaceDef_ptr _tao_objptr =
+    CORBA::ExtLocalInterfaceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtLocalInterfaceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ExtLocalInterfaceDef>::insert (
+      _tao_any,
+      CORBA::ExtLocalInterfaceDef::_tao_any_destructor,
+      CORBA::_tc_ExtLocalInterfaceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtLocalInterfaceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ExtLocalInterfaceDef>::extract (
+        _tao_any,
+        CORBA::ExtLocalInterfaceDef::_tao_any_destructor,
+        CORBA::_tc_ExtLocalInterfaceDef,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ExtLocalInterfaceDef>::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::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ExtLocalInterfaceDef>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ExtLocalInterfaceDef, CORBA::ExtLocalInterfaceDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ExtLocalInterfaceDef>
+#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
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40150,7 +44998,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40193,7 +45041,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40236,7 +45084,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40279,7 +45127,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40322,7 +45170,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40365,7 +45213,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40408,7 +45256,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40451,7 +45299,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40494,7 +45342,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40537,7 +45385,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40580,7 +45428,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40623,7 +45471,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40666,7 +45514,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40709,7 +45557,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40725,7 +45573,8 @@ CORBA::Boolean operator<< (
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+          _tao_marshal_flag =
+            _tao_sequence[i].in ()->marshal (strm);
         }
       
       return _tao_marshal_flag;
@@ -40775,77 +45624,54 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ExcDescriptionSeq &_tao_sequence
+    const CORBA::AttributeDef_ptr _tao_objref
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::ExcDescriptionSeq &_tao_sequence
+    CORBA::AttributeDef_ptr &_tao_objref
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    
+    if ((strm >> obj.inout ()) == 0)
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::AttributeDef::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
   return 0;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::AttributeDef_ptr _tao_objref
+    const CORBA::ExtAttributeDef_ptr _tao_objref
   )
 {
   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
@@ -40854,7 +45680,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::AttributeDef_ptr &_tao_objref
+    CORBA::ExtAttributeDef_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
@@ -40868,7 +45694,7 @@ CORBA::Boolean operator>> (
     
     // Narrow to the right type.
     _tao_objref =
-      CORBA::AttributeDef::_unchecked_narrow (
+      CORBA::ExtAttributeDef::_unchecked_narrow (
           obj.in ()
           ACE_ENV_ARG_PARAMETER
         );
@@ -40884,7 +45710,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -40950,7 +45776,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -41016,7 +45842,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -41059,7 +45885,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -41125,7 +45951,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -41191,7 +46017,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -41257,7 +46083,73 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExtAttrDescriptionSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExtAttrDescriptionSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -41300,7 +46192,93 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::InterfaceAttrExtension_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::InterfaceAttrExtension_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    
+    if ((strm >> obj.inout ()) == 0)
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::InterfaceAttrExtension::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExtInterfaceDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExtInterfaceDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    
+    if ((strm >> obj.inout ()) == 0)
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::ExtInterfaceDef::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -41343,7 +46321,50 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExtAbstractInterfaceDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExtAbstractInterfaceDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    
+    if ((strm >> obj.inout ()) == 0)
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::ExtAbstractInterfaceDef::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -41385,3 +46406,47 @@ CORBA::Boolean operator>> (
   return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExtLocalInterfaceDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExtLocalInterfaceDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    
+    if ((strm >> obj.inout ()) == 0)
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::ExtLocalInterfaceDef::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index c8f0346e474..6d87d31ac64 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -20,20 +20,24 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_IFR_BASICC_H_
 #define _TAO_IDL_ORIG_IFR_BASICC_H_
 
 #include "ace/pre.h"
 
-#include "IFR_BaseC.h"
-
+#include "tao/corba.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+#include "ifr_client_export.h"
+
+#include "IFR_BaseC.h"
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -58,50 +62,50 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  CORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class PrimitiveDef;
 
 #if !defined (_CORBA_PRIMITIVEDEF___PTR_CH_)
 #define _CORBA_PRIMITIVEDEF___PTR_CH_
-
+  
   typedef PrimitiveDef *PrimitiveDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_PRIMITIVEDEF___VAR_CH_)
 #define _CORBA_PRIMITIVEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export PrimitiveDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export PrimitiveDef_var : public TAO_Base_var
   {
   public:
     PrimitiveDef_var (void); // default constructor
-    PrimitiveDef_var (PrimitiveDef_ptr p) : ptr_ (p) {}
+    PrimitiveDef_var (PrimitiveDef_ptr p) : ptr_ (p) {} 
     PrimitiveDef_var (const PrimitiveDef_var &); // copy constructor
     ~PrimitiveDef_var (void); // destructor
-
+    
     PrimitiveDef_var &operator= (PrimitiveDef_ptr);
     PrimitiveDef_var &operator= (const PrimitiveDef_var &);
     PrimitiveDef_ptr operator-> (void) const;
-
+    
     operator const PrimitiveDef_ptr &() const;
     operator PrimitiveDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     PrimitiveDef_ptr in (void) const;
     PrimitiveDef_ptr &inout (void);
     PrimitiveDef_ptr &out (void);
     PrimitiveDef_ptr _retn (void);
     PrimitiveDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static PrimitiveDef_ptr tao_duplicate (PrimitiveDef_ptr);
@@ -109,25 +113,25 @@ TAO_NAMESPACE  CORBA
     static PrimitiveDef_ptr tao_nil (void);
     static PrimitiveDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     PrimitiveDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    PrimitiveDef_var (const TAO_Base_var & rhs);
-    PrimitiveDef_var & operator= (const TAO_Base_var & rhs);
+    PrimitiveDef_var (const TAO_Base_var &rhs);
+    PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_PRIMITIVEDEF___OUT_CH_)
 #define _CORBA_PRIMITIVEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export PrimitiveDef_out
   {
   public:
@@ -140,52 +144,52 @@ TAO_NAMESPACE  CORBA
     operator PrimitiveDef_ptr &();
     PrimitiveDef_ptr &ptr (void);
     PrimitiveDef_ptr operator-> (void);
-
+  
   private:
     PrimitiveDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class StringDef;
 
 #if !defined (_CORBA_STRINGDEF___PTR_CH_)
 #define _CORBA_STRINGDEF___PTR_CH_
-
+  
   typedef StringDef *StringDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_STRINGDEF___VAR_CH_)
 #define _CORBA_STRINGDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export StringDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export StringDef_var : public TAO_Base_var
   {
   public:
     StringDef_var (void); // default constructor
-    StringDef_var (StringDef_ptr p) : ptr_ (p) {}
+    StringDef_var (StringDef_ptr p) : ptr_ (p) {} 
     StringDef_var (const StringDef_var &); // copy constructor
     ~StringDef_var (void); // destructor
-
+    
     StringDef_var &operator= (StringDef_ptr);
     StringDef_var &operator= (const StringDef_var &);
     StringDef_ptr operator-> (void) const;
-
+    
     operator const StringDef_ptr &() const;
     operator StringDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     StringDef_ptr in (void) const;
     StringDef_ptr &inout (void);
     StringDef_ptr &out (void);
     StringDef_ptr _retn (void);
     StringDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static StringDef_ptr tao_duplicate (StringDef_ptr);
@@ -193,25 +197,25 @@ TAO_NAMESPACE  CORBA
     static StringDef_ptr tao_nil (void);
     static StringDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     StringDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    StringDef_var (const TAO_Base_var & rhs);
-    StringDef_var & operator= (const TAO_Base_var & rhs);
+    StringDef_var (const TAO_Base_var &rhs);
+    StringDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_STRINGDEF___OUT_CH_)
 #define _CORBA_STRINGDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export StringDef_out
   {
   public:
@@ -224,52 +228,52 @@ TAO_NAMESPACE  CORBA
     operator StringDef_ptr &();
     StringDef_ptr &ptr (void);
     StringDef_ptr operator-> (void);
-
+  
   private:
     StringDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class SequenceDef;
 
 #if !defined (_CORBA_SEQUENCEDEF___PTR_CH_)
 #define _CORBA_SEQUENCEDEF___PTR_CH_
-
+  
   typedef SequenceDef *SequenceDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_SEQUENCEDEF___VAR_CH_)
 #define _CORBA_SEQUENCEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export SequenceDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export SequenceDef_var : public TAO_Base_var
   {
   public:
     SequenceDef_var (void); // default constructor
-    SequenceDef_var (SequenceDef_ptr p) : ptr_ (p) {}
+    SequenceDef_var (SequenceDef_ptr p) : ptr_ (p) {} 
     SequenceDef_var (const SequenceDef_var &); // copy constructor
     ~SequenceDef_var (void); // destructor
-
+    
     SequenceDef_var &operator= (SequenceDef_ptr);
     SequenceDef_var &operator= (const SequenceDef_var &);
     SequenceDef_ptr operator-> (void) const;
-
+    
     operator const SequenceDef_ptr &() const;
     operator SequenceDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     SequenceDef_ptr in (void) const;
     SequenceDef_ptr &inout (void);
     SequenceDef_ptr &out (void);
     SequenceDef_ptr _retn (void);
     SequenceDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static SequenceDef_ptr tao_duplicate (SequenceDef_ptr);
@@ -277,25 +281,25 @@ TAO_NAMESPACE  CORBA
     static SequenceDef_ptr tao_nil (void);
     static SequenceDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     SequenceDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    SequenceDef_var (const TAO_Base_var & rhs);
-    SequenceDef_var & operator= (const TAO_Base_var & rhs);
+    SequenceDef_var (const TAO_Base_var &rhs);
+    SequenceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_SEQUENCEDEF___OUT_CH_)
 #define _CORBA_SEQUENCEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export SequenceDef_out
   {
   public:
@@ -308,52 +312,52 @@ TAO_NAMESPACE  CORBA
     operator SequenceDef_ptr &();
     SequenceDef_ptr &ptr (void);
     SequenceDef_ptr operator-> (void);
-
+  
   private:
     SequenceDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class ArrayDef;
 
 #if !defined (_CORBA_ARRAYDEF___PTR_CH_)
 #define _CORBA_ARRAYDEF___PTR_CH_
-
+  
   typedef ArrayDef *ArrayDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ARRAYDEF___VAR_CH_)
 #define _CORBA_ARRAYDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ArrayDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ArrayDef_var : public TAO_Base_var
   {
   public:
     ArrayDef_var (void); // default constructor
-    ArrayDef_var (ArrayDef_ptr p) : ptr_ (p) {}
+    ArrayDef_var (ArrayDef_ptr p) : ptr_ (p) {} 
     ArrayDef_var (const ArrayDef_var &); // copy constructor
     ~ArrayDef_var (void); // destructor
-
+    
     ArrayDef_var &operator= (ArrayDef_ptr);
     ArrayDef_var &operator= (const ArrayDef_var &);
     ArrayDef_ptr operator-> (void) const;
-
+    
     operator const ArrayDef_ptr &() const;
     operator ArrayDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ArrayDef_ptr in (void) const;
     ArrayDef_ptr &inout (void);
     ArrayDef_ptr &out (void);
     ArrayDef_ptr _retn (void);
     ArrayDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ArrayDef_ptr tao_duplicate (ArrayDef_ptr);
@@ -361,25 +365,25 @@ TAO_NAMESPACE  CORBA
     static ArrayDef_ptr tao_nil (void);
     static ArrayDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ArrayDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ArrayDef_var (const TAO_Base_var & rhs);
-    ArrayDef_var & operator= (const TAO_Base_var & rhs);
+    ArrayDef_var (const TAO_Base_var &rhs);
+    ArrayDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ARRAYDEF___OUT_CH_)
 #define _CORBA_ARRAYDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ArrayDef_out
   {
   public:
@@ -392,52 +396,52 @@ TAO_NAMESPACE  CORBA
     operator ArrayDef_ptr &();
     ArrayDef_ptr &ptr (void);
     ArrayDef_ptr operator-> (void);
-
+  
   private:
     ArrayDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class WstringDef;
 
 #if !defined (_CORBA_WSTRINGDEF___PTR_CH_)
 #define _CORBA_WSTRINGDEF___PTR_CH_
-
+  
   typedef WstringDef *WstringDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_WSTRINGDEF___VAR_CH_)
 #define _CORBA_WSTRINGDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export WstringDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export WstringDef_var : public TAO_Base_var
   {
   public:
     WstringDef_var (void); // default constructor
-    WstringDef_var (WstringDef_ptr p) : ptr_ (p) {}
+    WstringDef_var (WstringDef_ptr p) : ptr_ (p) {} 
     WstringDef_var (const WstringDef_var &); // copy constructor
     ~WstringDef_var (void); // destructor
-
+    
     WstringDef_var &operator= (WstringDef_ptr);
     WstringDef_var &operator= (const WstringDef_var &);
     WstringDef_ptr operator-> (void) const;
-
+    
     operator const WstringDef_ptr &() const;
     operator WstringDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     WstringDef_ptr in (void) const;
     WstringDef_ptr &inout (void);
     WstringDef_ptr &out (void);
     WstringDef_ptr _retn (void);
     WstringDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static WstringDef_ptr tao_duplicate (WstringDef_ptr);
@@ -445,25 +449,25 @@ TAO_NAMESPACE  CORBA
     static WstringDef_ptr tao_nil (void);
     static WstringDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     WstringDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    WstringDef_var (const TAO_Base_var & rhs);
-    WstringDef_var & operator= (const TAO_Base_var & rhs);
+    WstringDef_var (const TAO_Base_var &rhs);
+    WstringDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_WSTRINGDEF___OUT_CH_)
 #define _CORBA_WSTRINGDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export WstringDef_out
   {
   public:
@@ -476,52 +480,52 @@ TAO_NAMESPACE  CORBA
     operator WstringDef_ptr &();
     WstringDef_ptr &ptr (void);
     WstringDef_ptr operator-> (void);
-
+  
   private:
     WstringDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class FixedDef;
 
 #if !defined (_CORBA_FIXEDDEF___PTR_CH_)
 #define _CORBA_FIXEDDEF___PTR_CH_
-
+  
   typedef FixedDef *FixedDef_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_FIXEDDEF___VAR_CH_)
 #define _CORBA_FIXEDDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export FixedDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export FixedDef_var : public TAO_Base_var
   {
   public:
     FixedDef_var (void); // default constructor
-    FixedDef_var (FixedDef_ptr p) : ptr_ (p) {}
+    FixedDef_var (FixedDef_ptr p) : ptr_ (p) {} 
     FixedDef_var (const FixedDef_var &); // copy constructor
     ~FixedDef_var (void); // destructor
-
+    
     FixedDef_var &operator= (FixedDef_ptr);
     FixedDef_var &operator= (const FixedDef_var &);
     FixedDef_ptr operator-> (void) const;
-
+    
     operator const FixedDef_ptr &() const;
     operator FixedDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     FixedDef_ptr in (void) const;
     FixedDef_ptr &inout (void);
     FixedDef_ptr &out (void);
     FixedDef_ptr _retn (void);
     FixedDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static FixedDef_ptr tao_duplicate (FixedDef_ptr);
@@ -529,25 +533,25 @@ TAO_NAMESPACE  CORBA
     static FixedDef_ptr tao_nil (void);
     static FixedDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     FixedDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    FixedDef_var (const TAO_Base_var & rhs);
-    FixedDef_var & operator= (const TAO_Base_var & rhs);
+    FixedDef_var (const TAO_Base_var &rhs);
+    FixedDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_FIXEDDEF___OUT_CH_)
 #define _CORBA_FIXEDDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export FixedDef_out
   {
   public:
@@ -560,27 +564,55 @@ TAO_NAMESPACE  CORBA
     operator FixedDef_ptr &();
     FixedDef_ptr &ptr (void);
     FixedDef_ptr operator-> (void);
-
+  
   private:
     FixedDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_enum/enum_ch.cpp:57
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
+  enum PrimitiveKind
+  {
+    pk_null,
+    pk_void,
+    pk_short,
+    pk_long,
+    pk_ushort,
+    pk_ulong,
+    pk_float,
+    pk_double,
+    pk_boolean,
+    pk_char,
+    pk_octet,
+    pk_any,
+    pk_TypeCode,
+    pk_Principal,
+    pk_string,
+    pk_objref,
+    pk_longlong,
+    pk_ulonglong,
+    pk_longdouble,
+    pk_wchar,
+    pk_wstring,
+    pk_value_base
+  };
+  
+  typedef PrimitiveKind &PrimitiveKind_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_PrimitiveKind;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_REPOSITORY___PTR_CH_)
 #define _CORBA_REPOSITORY___PTR_CH_
-
+  
   class Repository;
   typedef Repository *Repository_ptr;
 
@@ -588,31 +620,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_REPOSITORY___VAR_CH_)
 #define _CORBA_REPOSITORY___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export Repository_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export Repository_var : public TAO_Base_var
   {
   public:
     Repository_var (void); // default constructor
-    Repository_var (Repository_ptr p) : ptr_ (p) {}
+    Repository_var (Repository_ptr p) : ptr_ (p) {} 
     Repository_var (const Repository_var &); // copy constructor
     ~Repository_var (void); // destructor
-
+    
     Repository_var &operator= (Repository_ptr);
     Repository_var &operator= (const Repository_var &);
     Repository_ptr operator-> (void) const;
-
+    
     operator const Repository_ptr &() const;
     operator Repository_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Repository_ptr in (void) const;
     Repository_ptr &inout (void);
     Repository_ptr &out (void);
     Repository_ptr _retn (void);
     Repository_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Repository_ptr tao_duplicate (Repository_ptr);
@@ -620,25 +652,25 @@ TAO_NAMESPACE  CORBA
     static Repository_ptr tao_nil (void);
     static Repository_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Repository_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    Repository_var (const TAO_Base_var & rhs);
-    Repository_var & operator= (const TAO_Base_var & rhs);
+    Repository_var (const TAO_Base_var &rhs);
+    Repository_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_REPOSITORY___OUT_CH_)
 #define _CORBA_REPOSITORY___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export Repository_out
   {
   public:
@@ -651,24 +683,24 @@ TAO_NAMESPACE  CORBA
     operator Repository_ptr &();
     Repository_ptr &ptr (void);
     Repository_ptr operator-> (void);
-
+  
   private:
     Repository_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_REPOSITORY_CH_)
 #define _CORBA_REPOSITORY_CH_
-
+  
   class _TAO_Repository_Proxy_Impl;
   class _TAO_Repository_Remote_Proxy_Impl;
   class _TAO_Repository_Proxy_Broker;
   class _TAO_Repository_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export Repository
     : public virtual CORBA::Container
   {
@@ -676,30 +708,30 @@ TAO_NAMESPACE  CORBA
     typedef Repository_ptr _ptr_type;
     typedef Repository_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static Repository_ptr _duplicate (Repository_ptr obj);
-
+    
     static Repository_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Repository_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Repository_ptr _nil (void)
       {
         return (Repository_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Contained_ptr lookup_id (
         const char * search_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -707,10 +739,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr get_canonical_typecode (
         CORBA::TypeCode_ptr tc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -718,10 +750,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
         CORBA::PrimitiveKind kind
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -729,10 +761,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::StringDef_ptr create_string (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -740,10 +772,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::WstringDef_ptr create_wstring (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -751,10 +783,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::SequenceDef_ptr create_sequence (
         CORBA::ULong bound,
         CORBA::IDLType_ptr element_type
@@ -763,10 +795,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ArrayDef_ptr create_array (
         CORBA::ULong length,
         CORBA::IDLType_ptr element_type
@@ -775,10 +807,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::FixedDef_ptr create_fixed (
         CORBA::UShort digits,
         CORBA::Short scale
@@ -787,65 +819,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_Repository_Proxy_Broker *the_TAO_Repository_Proxy_Broker_;
-
+  
   protected:
     Repository (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Repository_setup_collocation (int collocated);
-
+    
     Repository (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~Repository (void);
-
+    
     friend class _TAO_Repository_Remote_Proxy_Impl;
     friend class _TAO_Repository_ThruPOA_Proxy_Impl;
     friend class _TAO_Repository_Direct_Proxy_Impl;
-
+  
   private:
     Repository (const Repository &);
     void operator= (const Repository &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_Repository_Proxy_Impl
     : public virtual CORBA::_TAO_Container_Proxy_Impl
   {
   public:
     virtual ~_TAO_Repository_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::Contained_ptr lookup_id (
         CORBA::Object *_collocated_tao_target_,
         const char * search_id
@@ -854,10 +887,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::TypeCode_ptr get_canonical_typecode (
         CORBA::Object *_collocated_tao_target_,
         CORBA::TypeCode_ptr tc
@@ -866,10 +899,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
         CORBA::Object *_collocated_tao_target_,
         CORBA::PrimitiveKind kind
@@ -878,10 +911,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::StringDef_ptr create_string (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -890,10 +923,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::WstringDef_ptr create_wstring (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -902,10 +935,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::SequenceDef_ptr create_sequence (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound,
@@ -915,10 +948,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ArrayDef_ptr create_array (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong length,
@@ -928,10 +961,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::FixedDef_ptr create_fixed (
         CORBA::Object *_collocated_tao_target_,
         CORBA::UShort digits,
@@ -941,23 +974,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_Repository_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_Repository_Remote_Proxy_Impl
     : public virtual _TAO_Repository_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -965,12 +998,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_Repository_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Repository_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::Contained_ptr lookup_id (
         CORBA::Object *_collocated_tao_target_,
         const char * search_id
@@ -979,10 +1012,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::TypeCode_ptr get_canonical_typecode (
         CORBA::Object *_collocated_tao_target_,
         CORBA::TypeCode_ptr tc
@@ -991,10 +1024,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
         CORBA::Object *_collocated_tao_target_,
         CORBA::PrimitiveKind kind
@@ -1003,10 +1036,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::StringDef_ptr create_string (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -1015,10 +1048,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::WstringDef_ptr create_wstring (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -1027,10 +1060,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::SequenceDef_ptr create_sequence (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound,
@@ -1040,10 +1073,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ArrayDef_ptr create_array (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong length,
@@ -1053,10 +1086,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::FixedDef_ptr create_fixed (
         CORBA::Object *_collocated_tao_target_,
         CORBA::UShort digits,
@@ -1067,23 +1100,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_Repository_Proxy_Broker
   {
   public:
@@ -1092,64 +1125,64 @@ TAO_NAMESPACE  CORBA
         Repository *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_Repository_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_Repository_Remote_Proxy_Broker
     : public virtual _TAO_Repository_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Repository_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Repository_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_Repository_Proxy_Impl &select_proxy (
         Repository *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_Repository_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_Repository_Remote_Proxy_Broker *the_TAO_Repository_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Repository;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_MODULEDEF___PTR_CH_)
 #define _CORBA_MODULEDEF___PTR_CH_
-
+  
   class ModuleDef;
   typedef ModuleDef *ModuleDef_ptr;
 
@@ -1157,31 +1190,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_MODULEDEF___VAR_CH_)
 #define _CORBA_MODULEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ModuleDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ModuleDef_var : public TAO_Base_var
   {
   public:
     ModuleDef_var (void); // default constructor
-    ModuleDef_var (ModuleDef_ptr p) : ptr_ (p) {}
+    ModuleDef_var (ModuleDef_ptr p) : ptr_ (p) {} 
     ModuleDef_var (const ModuleDef_var &); // copy constructor
     ~ModuleDef_var (void); // destructor
-
+    
     ModuleDef_var &operator= (ModuleDef_ptr);
     ModuleDef_var &operator= (const ModuleDef_var &);
     ModuleDef_ptr operator-> (void) const;
-
+    
     operator const ModuleDef_ptr &() const;
     operator ModuleDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ModuleDef_ptr in (void) const;
     ModuleDef_ptr &inout (void);
     ModuleDef_ptr &out (void);
     ModuleDef_ptr _retn (void);
     ModuleDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ModuleDef_ptr tao_duplicate (ModuleDef_ptr);
@@ -1189,25 +1222,25 @@ TAO_NAMESPACE  CORBA
     static ModuleDef_ptr tao_nil (void);
     static ModuleDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ModuleDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ModuleDef_var (const TAO_Base_var & rhs);
-    ModuleDef_var & operator= (const TAO_Base_var & rhs);
+    ModuleDef_var (const TAO_Base_var &rhs);
+    ModuleDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_MODULEDEF___OUT_CH_)
 #define _CORBA_MODULEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ModuleDef_out
   {
   public:
@@ -1220,24 +1253,24 @@ TAO_NAMESPACE  CORBA
     operator ModuleDef_ptr &();
     ModuleDef_ptr &ptr (void);
     ModuleDef_ptr operator-> (void);
-
+  
   private:
     ModuleDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_MODULEDEF_CH_)
 #define _CORBA_MODULEDEF_CH_
-
+  
   class _TAO_ModuleDef_Proxy_Impl;
   class _TAO_ModuleDef_Remote_Proxy_Impl;
   class _TAO_ModuleDef_Proxy_Broker;
   class _TAO_ModuleDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export ModuleDef
     : public virtual CORBA::Container,
       public virtual CORBA::Contained
@@ -1246,99 +1279,100 @@ TAO_NAMESPACE  CORBA
     typedef ModuleDef_ptr _ptr_type;
     typedef ModuleDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static ModuleDef_ptr _duplicate (ModuleDef_ptr obj);
-
+    
     static ModuleDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ModuleDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ModuleDef_ptr _nil (void)
       {
         return (ModuleDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ModuleDef_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_;
-
+  
   protected:
     ModuleDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ModuleDef_setup_collocation (int collocated);
-
+    
     ModuleDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ModuleDef (void);
-
+    
     friend class _TAO_ModuleDef_Remote_Proxy_Impl;
     friend class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ModuleDef_Direct_Proxy_Impl;
-
+  
   private:
     ModuleDef (const ModuleDef &);
     void operator= (const ModuleDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Container_Proxy_Impl,
+    : public virtual CORBA::_TAO_Container_Proxy_Impl, 
       public virtual CORBA::_TAO_Contained_Proxy_Impl
   {
   public:
     virtual ~_TAO_ModuleDef_Proxy_Impl (void) {}
-
+  
   protected:
     _TAO_ModuleDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_ModuleDef_Remote_Proxy_Impl
     : public virtual _TAO_ModuleDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -1347,26 +1381,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ModuleDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ModuleDef_Remote_Proxy_Impl (void) {}
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Broker
   {
   public:
@@ -1375,77 +1409,77 @@ TAO_NAMESPACE  CORBA
         ModuleDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_ModuleDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_ModuleDef_Remote_Proxy_Broker
     : public virtual _TAO_ModuleDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ModuleDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ModuleDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
         ModuleDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_ModuleDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ModuleDef_Remote_Proxy_Broker *the_TAO_ModuleDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ModuleDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class ModuleDescription_var;
-
+  
   struct TAO_IFR_Client_Export ModuleDescription
   {
     typedef ModuleDescription_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
     TAO_String_Manager defined_in;
     TAO_String_Manager version;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_IFR_Client_Export ModuleDescription_var
   {
   public:
@@ -1453,33 +1487,33 @@ TAO_NAMESPACE  CORBA
     ModuleDescription_var (ModuleDescription *);
     ModuleDescription_var (const ModuleDescription_var &);
     ~ModuleDescription_var (void);
-
+    
     ModuleDescription_var &operator= (ModuleDescription *);
     ModuleDescription_var &operator= (const ModuleDescription_var &);
     ModuleDescription *operator-> (void);
     const ModuleDescription *operator-> (void) const;
-
+    
     operator const ModuleDescription &() const;
     operator ModuleDescription &();
     operator ModuleDescription &() const;
-
+    
     // Variable-size types only.
     operator ModuleDescription *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ModuleDescription &in (void) const;
     ModuleDescription &inout (void);
     ModuleDescription *&out (void);
     ModuleDescription *_retn (void);
     ModuleDescription *ptr (void) const;
-
+  
   private:
     ModuleDescription *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_IFR_Client_Export ModuleDescription_out
   {
   public:
@@ -1491,24 +1525,24 @@ TAO_NAMESPACE  CORBA
     operator ModuleDescription *&();
     ModuleDescription *&ptr (void);
     ModuleDescription *operator-> (void);
-
+    
   private:
     ModuleDescription *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ModuleDescription_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ModuleDescription;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_CONSTANTDEF___PTR_CH_)
 #define _CORBA_CONSTANTDEF___PTR_CH_
-
+  
   class ConstantDef;
   typedef ConstantDef *ConstantDef_ptr;
 
@@ -1516,31 +1550,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_CONSTANTDEF___VAR_CH_)
 #define _CORBA_CONSTANTDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ConstantDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ConstantDef_var : public TAO_Base_var
   {
   public:
     ConstantDef_var (void); // default constructor
-    ConstantDef_var (ConstantDef_ptr p) : ptr_ (p) {}
+    ConstantDef_var (ConstantDef_ptr p) : ptr_ (p) {} 
     ConstantDef_var (const ConstantDef_var &); // copy constructor
     ~ConstantDef_var (void); // destructor
-
+    
     ConstantDef_var &operator= (ConstantDef_ptr);
     ConstantDef_var &operator= (const ConstantDef_var &);
     ConstantDef_ptr operator-> (void) const;
-
+    
     operator const ConstantDef_ptr &() const;
     operator ConstantDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ConstantDef_ptr in (void) const;
     ConstantDef_ptr &inout (void);
     ConstantDef_ptr &out (void);
     ConstantDef_ptr _retn (void);
     ConstantDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ConstantDef_ptr tao_duplicate (ConstantDef_ptr);
@@ -1548,25 +1582,25 @@ TAO_NAMESPACE  CORBA
     static ConstantDef_ptr tao_nil (void);
     static ConstantDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ConstantDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ConstantDef_var (const TAO_Base_var & rhs);
-    ConstantDef_var & operator= (const TAO_Base_var & rhs);
+    ConstantDef_var (const TAO_Base_var &rhs);
+    ConstantDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_CONSTANTDEF___OUT_CH_)
 #define _CORBA_CONSTANTDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ConstantDef_out
   {
   public:
@@ -1579,24 +1613,24 @@ TAO_NAMESPACE  CORBA
     operator ConstantDef_ptr &();
     ConstantDef_ptr &ptr (void);
     ConstantDef_ptr operator-> (void);
-
+  
   private:
     ConstantDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_CONSTANTDEF_CH_)
 #define _CORBA_CONSTANTDEF_CH_
-
+  
   class _TAO_ConstantDef_Proxy_Impl;
   class _TAO_ConstantDef_Remote_Proxy_Impl;
   class _TAO_ConstantDef_Proxy_Broker;
   class _TAO_ConstantDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export ConstantDef
     : public virtual CORBA::Contained
   {
@@ -1604,50 +1638,50 @@ TAO_NAMESPACE  CORBA
     typedef ConstantDef_ptr _ptr_type;
     typedef ConstantDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static ConstantDef_ptr _duplicate (ConstantDef_ptr obj);
-
+    
     static ConstantDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ConstantDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ConstantDef_ptr _nil (void)
       {
         return (ConstantDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void type_def (
         CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1655,20 +1689,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void value (
         const CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1676,65 +1710,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ConstantDef_Proxy_Broker *the_TAO_ConstantDef_Proxy_Broker_;
-
+  
   protected:
     ConstantDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ConstantDef_setup_collocation (int collocated);
-
+    
     ConstantDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ConstantDef (void);
-
+    
     friend class _TAO_ConstantDef_Remote_Proxy_Impl;
     friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ConstantDef_Direct_Proxy_Impl;
-
+  
   private:
     ConstantDef (const ConstantDef &);
     void operator= (const ConstantDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Impl
     : public virtual CORBA::_TAO_Contained_Proxy_Impl
   {
   public:
     virtual ~_TAO_ConstantDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1742,10 +1777,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::IDLType_ptr type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1753,10 +1788,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr type_def
@@ -1765,10 +1800,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::Any * value (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1776,10 +1811,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void value (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::Any & value
@@ -1788,23 +1823,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_ConstantDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_ConstantDef_Remote_Proxy_Impl
     : public virtual _TAO_ConstantDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -1812,12 +1847,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ConstantDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ConstantDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1825,10 +1860,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::IDLType_ptr type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1836,10 +1871,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr type_def
@@ -1848,10 +1883,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::Any * value (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1859,10 +1894,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void value (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::Any & value
@@ -1872,23 +1907,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Broker
   {
   public:
@@ -1897,67 +1932,67 @@ TAO_NAMESPACE  CORBA
         ConstantDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_ConstantDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_ConstantDef_Remote_Proxy_Broker
     : public virtual _TAO_ConstantDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ConstantDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ConstantDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
         ConstantDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_ConstantDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ConstantDef_Remote_Proxy_Broker *the_TAO_ConstantDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstantDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class ConstantDescription_var;
-
+  
   struct TAO_IFR_Client_Export ConstantDescription
   {
     typedef ConstantDescription_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -1966,10 +2001,10 @@ TAO_NAMESPACE  CORBA
     CORBA::TypeCode_var type;
     CORBA::Any value;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_IFR_Client_Export ConstantDescription_var
   {
   public:
@@ -1977,33 +2012,33 @@ TAO_NAMESPACE  CORBA
     ConstantDescription_var (ConstantDescription *);
     ConstantDescription_var (const ConstantDescription_var &);
     ~ConstantDescription_var (void);
-
+    
     ConstantDescription_var &operator= (ConstantDescription *);
     ConstantDescription_var &operator= (const ConstantDescription_var &);
     ConstantDescription *operator-> (void);
     const ConstantDescription *operator-> (void) const;
-
+    
     operator const ConstantDescription &() const;
     operator ConstantDescription &();
     operator ConstantDescription &() const;
-
+    
     // Variable-size types only.
     operator ConstantDescription *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ConstantDescription &in (void) const;
     ConstantDescription &inout (void);
     ConstantDescription *&out (void);
     ConstantDescription *_retn (void);
     ConstantDescription *ptr (void) const;
-
+  
   private:
     ConstantDescription *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_IFR_Client_Export ConstantDescription_out
   {
   public:
@@ -2015,24 +2050,24 @@ TAO_NAMESPACE  CORBA
     operator ConstantDescription *&();
     ConstantDescription *&ptr (void);
     ConstantDescription *operator-> (void);
-
+    
   private:
     ConstantDescription *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ConstantDescription_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstantDescription;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_STRUCTDEF___PTR_CH_)
 #define _CORBA_STRUCTDEF___PTR_CH_
-
+  
   class StructDef;
   typedef StructDef *StructDef_ptr;
 
@@ -2040,31 +2075,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_STRUCTDEF___VAR_CH_)
 #define _CORBA_STRUCTDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export StructDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export StructDef_var : public TAO_Base_var
   {
   public:
     StructDef_var (void); // default constructor
-    StructDef_var (StructDef_ptr p) : ptr_ (p) {}
+    StructDef_var (StructDef_ptr p) : ptr_ (p) {} 
     StructDef_var (const StructDef_var &); // copy constructor
     ~StructDef_var (void); // destructor
-
+    
     StructDef_var &operator= (StructDef_ptr);
     StructDef_var &operator= (const StructDef_var &);
     StructDef_ptr operator-> (void) const;
-
+    
     operator const StructDef_ptr &() const;
     operator StructDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     StructDef_ptr in (void) const;
     StructDef_ptr &inout (void);
     StructDef_ptr &out (void);
     StructDef_ptr _retn (void);
     StructDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static StructDef_ptr tao_duplicate (StructDef_ptr);
@@ -2072,25 +2107,25 @@ TAO_NAMESPACE  CORBA
     static StructDef_ptr tao_nil (void);
     static StructDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     StructDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    StructDef_var (const TAO_Base_var & rhs);
-    StructDef_var & operator= (const TAO_Base_var & rhs);
+    StructDef_var (const TAO_Base_var &rhs);
+    StructDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_STRUCTDEF___OUT_CH_)
 #define _CORBA_STRUCTDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export StructDef_out
   {
   public:
@@ -2103,24 +2138,24 @@ TAO_NAMESPACE  CORBA
     operator StructDef_ptr &();
     StructDef_ptr &ptr (void);
     StructDef_ptr operator-> (void);
-
+  
   private:
     StructDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_STRUCTDEF_CH_)
 #define _CORBA_STRUCTDEF_CH_
-
+  
   class _TAO_StructDef_Proxy_Impl;
   class _TAO_StructDef_Remote_Proxy_Impl;
   class _TAO_StructDef_Proxy_Broker;
   class _TAO_StructDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export StructDef
     : public virtual CORBA::TypedefDef,
       public virtual CORBA::Container
@@ -2129,40 +2164,40 @@ TAO_NAMESPACE  CORBA
     typedef StructDef_ptr _ptr_type;
     typedef StructDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static StructDef_ptr _duplicate (StructDef_ptr obj);
-
+    
     static StructDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static StructDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static StructDef_ptr _nil (void)
       {
         return (StructDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::StructMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void members (
         const CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2170,66 +2205,67 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_StructDef_Proxy_Broker *the_TAO_StructDef_Proxy_Broker_;
-
+  
   protected:
     StructDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_StructDef_setup_collocation (int collocated);
-
+    
     StructDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~StructDef (void);
-
+    
     friend class _TAO_StructDef_Remote_Proxy_Impl;
     friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
     friend class _TAO_StructDef_Direct_Proxy_Impl;
-
+  
   private:
     StructDef (const StructDef &);
     void operator= (const StructDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_StructDef_Proxy_Impl
-    : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl,
+    : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl, 
       public virtual CORBA::_TAO_Container_Proxy_Impl
   {
   public:
     virtual ~_TAO_StructDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::StructMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2237,10 +2273,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::StructMemberSeq & members
@@ -2249,23 +2285,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_StructDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_StructDef_Remote_Proxy_Impl
     : public virtual _TAO_StructDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -2274,12 +2310,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_StructDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_StructDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::StructMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2287,10 +2323,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::StructMemberSeq & members
@@ -2300,23 +2336,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_StructDef_Proxy_Broker
   {
   public:
@@ -2325,64 +2361,64 @@ TAO_NAMESPACE  CORBA
         StructDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_StructDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_StructDef_Remote_Proxy_Broker
     : public virtual _TAO_StructDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_StructDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_StructDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_StructDef_Proxy_Impl &select_proxy (
         StructDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_StructDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_StructDef_Remote_Proxy_Broker *the_TAO_StructDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_UNIONDEF___PTR_CH_)
 #define _CORBA_UNIONDEF___PTR_CH_
-
+  
   class UnionDef;
   typedef UnionDef *UnionDef_ptr;
 
@@ -2390,31 +2426,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_UNIONDEF___VAR_CH_)
 #define _CORBA_UNIONDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export UnionDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export UnionDef_var : public TAO_Base_var
   {
   public:
     UnionDef_var (void); // default constructor
-    UnionDef_var (UnionDef_ptr p) : ptr_ (p) {}
+    UnionDef_var (UnionDef_ptr p) : ptr_ (p) {} 
     UnionDef_var (const UnionDef_var &); // copy constructor
     ~UnionDef_var (void); // destructor
-
+    
     UnionDef_var &operator= (UnionDef_ptr);
     UnionDef_var &operator= (const UnionDef_var &);
     UnionDef_ptr operator-> (void) const;
-
+    
     operator const UnionDef_ptr &() const;
     operator UnionDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     UnionDef_ptr in (void) const;
     UnionDef_ptr &inout (void);
     UnionDef_ptr &out (void);
     UnionDef_ptr _retn (void);
     UnionDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static UnionDef_ptr tao_duplicate (UnionDef_ptr);
@@ -2422,25 +2458,25 @@ TAO_NAMESPACE  CORBA
     static UnionDef_ptr tao_nil (void);
     static UnionDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     UnionDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    UnionDef_var (const TAO_Base_var & rhs);
-    UnionDef_var & operator= (const TAO_Base_var & rhs);
+    UnionDef_var (const TAO_Base_var &rhs);
+    UnionDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_UNIONDEF___OUT_CH_)
 #define _CORBA_UNIONDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export UnionDef_out
   {
   public:
@@ -2453,24 +2489,24 @@ TAO_NAMESPACE  CORBA
     operator UnionDef_ptr &();
     UnionDef_ptr &ptr (void);
     UnionDef_ptr operator-> (void);
-
+  
   private:
     UnionDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_UNIONDEF_CH_)
 #define _CORBA_UNIONDEF_CH_
-
+  
   class _TAO_UnionDef_Proxy_Impl;
   class _TAO_UnionDef_Remote_Proxy_Impl;
   class _TAO_UnionDef_Proxy_Broker;
   class _TAO_UnionDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export UnionDef
     : public virtual CORBA::TypedefDef,
       public virtual CORBA::Container
@@ -2479,50 +2515,50 @@ TAO_NAMESPACE  CORBA
     typedef UnionDef_ptr _ptr_type;
     typedef UnionDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static UnionDef_ptr _duplicate (UnionDef_ptr obj);
-
+    
     static UnionDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static UnionDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static UnionDef_ptr _nil (void)
       {
         return (UnionDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr discriminator_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::IDLType_ptr discriminator_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void discriminator_type_def (
         CORBA::IDLType_ptr discriminator_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2530,20 +2566,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::UnionMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void members (
         const CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2551,66 +2587,67 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_UnionDef_Proxy_Broker *the_TAO_UnionDef_Proxy_Broker_;
-
+  
   protected:
     UnionDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_UnionDef_setup_collocation (int collocated);
-
+    
     UnionDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~UnionDef (void);
-
+    
     friend class _TAO_UnionDef_Remote_Proxy_Impl;
     friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
     friend class _TAO_UnionDef_Direct_Proxy_Impl;
-
+  
   private:
     UnionDef (const UnionDef &);
     void operator= (const UnionDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Impl
-    : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl,
+    : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl, 
       public virtual CORBA::_TAO_Container_Proxy_Impl
   {
   public:
     virtual ~_TAO_UnionDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::TypeCode_ptr discriminator_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2618,10 +2655,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::IDLType_ptr discriminator_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2629,10 +2666,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void discriminator_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr discriminator_type_def
@@ -2641,10 +2678,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::UnionMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2652,10 +2689,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::UnionMemberSeq & members
@@ -2664,23 +2701,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_UnionDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_UnionDef_Remote_Proxy_Impl
     : public virtual _TAO_UnionDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -2689,12 +2726,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_UnionDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_UnionDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::TypeCode_ptr discriminator_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2702,10 +2739,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::IDLType_ptr discriminator_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2713,10 +2750,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void discriminator_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr discriminator_type_def
@@ -2725,10 +2762,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::UnionMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2736,10 +2773,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::UnionMemberSeq & members
@@ -2749,23 +2786,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Broker
   {
   public:
@@ -2774,64 +2811,64 @@ TAO_NAMESPACE  CORBA
         UnionDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_UnionDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_UnionDef_Remote_Proxy_Broker
     : public virtual _TAO_UnionDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_UnionDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_UnionDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
         UnionDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_UnionDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_UnionDef_Remote_Proxy_Broker *the_TAO_UnionDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_ENUMDEF___PTR_CH_)
 #define _CORBA_ENUMDEF___PTR_CH_
-
+  
   class EnumDef;
   typedef EnumDef *EnumDef_ptr;
 
@@ -2839,31 +2876,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_ENUMDEF___VAR_CH_)
 #define _CORBA_ENUMDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export EnumDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export EnumDef_var : public TAO_Base_var
   {
   public:
     EnumDef_var (void); // default constructor
-    EnumDef_var (EnumDef_ptr p) : ptr_ (p) {}
+    EnumDef_var (EnumDef_ptr p) : ptr_ (p) {} 
     EnumDef_var (const EnumDef_var &); // copy constructor
     ~EnumDef_var (void); // destructor
-
+    
     EnumDef_var &operator= (EnumDef_ptr);
     EnumDef_var &operator= (const EnumDef_var &);
     EnumDef_ptr operator-> (void) const;
-
+    
     operator const EnumDef_ptr &() const;
     operator EnumDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     EnumDef_ptr in (void) const;
     EnumDef_ptr &inout (void);
     EnumDef_ptr &out (void);
     EnumDef_ptr _retn (void);
     EnumDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static EnumDef_ptr tao_duplicate (EnumDef_ptr);
@@ -2871,25 +2908,25 @@ TAO_NAMESPACE  CORBA
     static EnumDef_ptr tao_nil (void);
     static EnumDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     EnumDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    EnumDef_var (const TAO_Base_var & rhs);
-    EnumDef_var & operator= (const TAO_Base_var & rhs);
+    EnumDef_var (const TAO_Base_var &rhs);
+    EnumDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ENUMDEF___OUT_CH_)
 #define _CORBA_ENUMDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export EnumDef_out
   {
   public:
@@ -2902,24 +2939,24 @@ TAO_NAMESPACE  CORBA
     operator EnumDef_ptr &();
     EnumDef_ptr &ptr (void);
     EnumDef_ptr operator-> (void);
-
+  
   private:
     EnumDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_ENUMDEF_CH_)
 #define _CORBA_ENUMDEF_CH_
-
+  
   class _TAO_EnumDef_Proxy_Impl;
   class _TAO_EnumDef_Remote_Proxy_Impl;
   class _TAO_EnumDef_Proxy_Broker;
   class _TAO_EnumDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export EnumDef
     : public virtual CORBA::TypedefDef
   {
@@ -2927,40 +2964,40 @@ TAO_NAMESPACE  CORBA
     typedef EnumDef_ptr _ptr_type;
     typedef EnumDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static EnumDef_ptr _duplicate (EnumDef_ptr obj);
-
+    
     static EnumDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static EnumDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static EnumDef_ptr _nil (void)
       {
         return (EnumDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::EnumMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void members (
         const CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2968,65 +3005,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_EnumDef_Proxy_Broker *the_TAO_EnumDef_Proxy_Broker_;
-
+  
   protected:
     EnumDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_EnumDef_setup_collocation (int collocated);
-
+    
     EnumDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~EnumDef (void);
-
+    
     friend class _TAO_EnumDef_Remote_Proxy_Impl;
     friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
     friend class _TAO_EnumDef_Direct_Proxy_Impl;
-
+  
   private:
     EnumDef (const EnumDef &);
     void operator= (const EnumDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Impl
     : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl
   {
   public:
     virtual ~_TAO_EnumDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::EnumMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -3034,10 +3072,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::EnumMemberSeq & members
@@ -3046,23 +3084,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_EnumDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_EnumDef_Remote_Proxy_Impl
     : public virtual _TAO_EnumDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -3070,12 +3108,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_EnumDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_EnumDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::EnumMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -3083,10 +3121,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::EnumMemberSeq & members
@@ -3096,23 +3134,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Broker
   {
   public:
@@ -3121,64 +3159,64 @@ TAO_NAMESPACE  CORBA
         EnumDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_EnumDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_EnumDef_Remote_Proxy_Broker
     : public virtual _TAO_EnumDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_EnumDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_EnumDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
         EnumDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_EnumDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_EnumDef_Remote_Proxy_Broker *the_TAO_EnumDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnumDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_ALIASDEF___PTR_CH_)
 #define _CORBA_ALIASDEF___PTR_CH_
-
+  
   class AliasDef;
   typedef AliasDef *AliasDef_ptr;
 
@@ -3186,31 +3224,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_ALIASDEF___VAR_CH_)
 #define _CORBA_ALIASDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export AliasDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export AliasDef_var : public TAO_Base_var
   {
   public:
     AliasDef_var (void); // default constructor
-    AliasDef_var (AliasDef_ptr p) : ptr_ (p) {}
+    AliasDef_var (AliasDef_ptr p) : ptr_ (p) {} 
     AliasDef_var (const AliasDef_var &); // copy constructor
     ~AliasDef_var (void); // destructor
-
+    
     AliasDef_var &operator= (AliasDef_ptr);
     AliasDef_var &operator= (const AliasDef_var &);
     AliasDef_ptr operator-> (void) const;
-
+    
     operator const AliasDef_ptr &() const;
     operator AliasDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     AliasDef_ptr in (void) const;
     AliasDef_ptr &inout (void);
     AliasDef_ptr &out (void);
     AliasDef_ptr _retn (void);
     AliasDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static AliasDef_ptr tao_duplicate (AliasDef_ptr);
@@ -3218,25 +3256,25 @@ TAO_NAMESPACE  CORBA
     static AliasDef_ptr tao_nil (void);
     static AliasDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     AliasDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    AliasDef_var (const TAO_Base_var & rhs);
-    AliasDef_var & operator= (const TAO_Base_var & rhs);
+    AliasDef_var (const TAO_Base_var &rhs);
+    AliasDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ALIASDEF___OUT_CH_)
 #define _CORBA_ALIASDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export AliasDef_out
   {
   public:
@@ -3249,24 +3287,24 @@ TAO_NAMESPACE  CORBA
     operator AliasDef_ptr &();
     AliasDef_ptr &ptr (void);
     AliasDef_ptr operator-> (void);
-
+  
   private:
     AliasDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_ALIASDEF_CH_)
 #define _CORBA_ALIASDEF_CH_
-
+  
   class _TAO_AliasDef_Proxy_Impl;
   class _TAO_AliasDef_Remote_Proxy_Impl;
   class _TAO_AliasDef_Proxy_Broker;
   class _TAO_AliasDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export AliasDef
     : public virtual CORBA::TypedefDef
   {
@@ -3274,40 +3312,40 @@ TAO_NAMESPACE  CORBA
     typedef AliasDef_ptr _ptr_type;
     typedef AliasDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static AliasDef_ptr _duplicate (AliasDef_ptr obj);
-
+    
     static AliasDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static AliasDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static AliasDef_ptr _nil (void)
       {
         return (AliasDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::IDLType_ptr original_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void original_type_def (
         CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3315,65 +3353,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_AliasDef_Proxy_Broker *the_TAO_AliasDef_Proxy_Broker_;
-
+  
   protected:
     AliasDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_AliasDef_setup_collocation (int collocated);
-
+    
     AliasDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~AliasDef (void);
-
+    
     friend class _TAO_AliasDef_Remote_Proxy_Impl;
     friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
     friend class _TAO_AliasDef_Direct_Proxy_Impl;
-
+  
   private:
     AliasDef (const AliasDef &);
     void operator= (const AliasDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Impl
     : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl
   {
   public:
     virtual ~_TAO_AliasDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::IDLType_ptr original_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -3381,10 +3420,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void original_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr original_type_def
@@ -3393,23 +3432,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_AliasDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_AliasDef_Remote_Proxy_Impl
     : public virtual _TAO_AliasDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -3417,12 +3456,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_AliasDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_AliasDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::IDLType_ptr original_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -3430,10 +3469,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void original_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr original_type_def
@@ -3443,23 +3482,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Broker
   {
   public:
@@ -3468,64 +3507,64 @@ TAO_NAMESPACE  CORBA
         AliasDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_AliasDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_AliasDef_Remote_Proxy_Broker
     : public virtual _TAO_AliasDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_AliasDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_AliasDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
         AliasDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_AliasDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_AliasDef_Remote_Proxy_Broker *the_TAO_AliasDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AliasDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_NATIVEDEF___PTR_CH_)
 #define _CORBA_NATIVEDEF___PTR_CH_
-
+  
   class NativeDef;
   typedef NativeDef *NativeDef_ptr;
 
@@ -3533,31 +3572,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_NATIVEDEF___VAR_CH_)
 #define _CORBA_NATIVEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export NativeDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export NativeDef_var : public TAO_Base_var
   {
   public:
     NativeDef_var (void); // default constructor
-    NativeDef_var (NativeDef_ptr p) : ptr_ (p) {}
+    NativeDef_var (NativeDef_ptr p) : ptr_ (p) {} 
     NativeDef_var (const NativeDef_var &); // copy constructor
     ~NativeDef_var (void); // destructor
-
+    
     NativeDef_var &operator= (NativeDef_ptr);
     NativeDef_var &operator= (const NativeDef_var &);
     NativeDef_ptr operator-> (void) const;
-
+    
     operator const NativeDef_ptr &() const;
     operator NativeDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     NativeDef_ptr in (void) const;
     NativeDef_ptr &inout (void);
     NativeDef_ptr &out (void);
     NativeDef_ptr _retn (void);
     NativeDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static NativeDef_ptr tao_duplicate (NativeDef_ptr);
@@ -3565,25 +3604,25 @@ TAO_NAMESPACE  CORBA
     static NativeDef_ptr tao_nil (void);
     static NativeDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     NativeDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    NativeDef_var (const TAO_Base_var & rhs);
-    NativeDef_var & operator= (const TAO_Base_var & rhs);
+    NativeDef_var (const TAO_Base_var &rhs);
+    NativeDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_NATIVEDEF___OUT_CH_)
 #define _CORBA_NATIVEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export NativeDef_out
   {
   public:
@@ -3596,24 +3635,24 @@ TAO_NAMESPACE  CORBA
     operator NativeDef_ptr &();
     NativeDef_ptr &ptr (void);
     NativeDef_ptr operator-> (void);
-
+  
   private:
     NativeDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_NATIVEDEF_CH_)
 #define _CORBA_NATIVEDEF_CH_
-
+  
   class _TAO_NativeDef_Proxy_Impl;
   class _TAO_NativeDef_Remote_Proxy_Impl;
   class _TAO_NativeDef_Proxy_Broker;
   class _TAO_NativeDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export NativeDef
     : public virtual CORBA::TypedefDef
   {
@@ -3621,98 +3660,99 @@ TAO_NAMESPACE  CORBA
     typedef NativeDef_ptr _ptr_type;
     typedef NativeDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static NativeDef_ptr _duplicate (NativeDef_ptr obj);
-
+    
     static NativeDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static NativeDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static NativeDef_ptr _nil (void)
       {
         return (NativeDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_NativeDef_Proxy_Broker *the_TAO_NativeDef_Proxy_Broker_;
-
+  
   protected:
     NativeDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_NativeDef_setup_collocation (int collocated);
-
+    
     NativeDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~NativeDef (void);
-
+    
     friend class _TAO_NativeDef_Remote_Proxy_Impl;
     friend class _TAO_NativeDef_ThruPOA_Proxy_Impl;
     friend class _TAO_NativeDef_Direct_Proxy_Impl;
-
+  
   private:
     NativeDef (const NativeDef &);
     void operator= (const NativeDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Impl
     : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl
   {
   public:
     virtual ~_TAO_NativeDef_Proxy_Impl (void) {}
-
+  
   protected:
     _TAO_NativeDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_NativeDef_Remote_Proxy_Impl
     : public virtual _TAO_NativeDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -3720,26 +3760,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_NativeDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_NativeDef_Remote_Proxy_Impl (void) {}
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Broker
   {
   public:
@@ -3748,64 +3788,64 @@ TAO_NAMESPACE  CORBA
         NativeDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_NativeDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_NativeDef_Remote_Proxy_Broker
     : public virtual _TAO_NativeDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_NativeDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_NativeDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
         NativeDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_NativeDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativeDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_PRIMITIVEDEF___PTR_CH_)
 #define _CORBA_PRIMITIVEDEF___PTR_CH_
-
+  
   class PrimitiveDef;
   typedef PrimitiveDef *PrimitiveDef_ptr;
 
@@ -3813,31 +3853,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_PRIMITIVEDEF___VAR_CH_)
 #define _CORBA_PRIMITIVEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export PrimitiveDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export PrimitiveDef_var : public TAO_Base_var
   {
   public:
     PrimitiveDef_var (void); // default constructor
-    PrimitiveDef_var (PrimitiveDef_ptr p) : ptr_ (p) {}
+    PrimitiveDef_var (PrimitiveDef_ptr p) : ptr_ (p) {} 
     PrimitiveDef_var (const PrimitiveDef_var &); // copy constructor
     ~PrimitiveDef_var (void); // destructor
-
+    
     PrimitiveDef_var &operator= (PrimitiveDef_ptr);
     PrimitiveDef_var &operator= (const PrimitiveDef_var &);
     PrimitiveDef_ptr operator-> (void) const;
-
+    
     operator const PrimitiveDef_ptr &() const;
     operator PrimitiveDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     PrimitiveDef_ptr in (void) const;
     PrimitiveDef_ptr &inout (void);
     PrimitiveDef_ptr &out (void);
     PrimitiveDef_ptr _retn (void);
     PrimitiveDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static PrimitiveDef_ptr tao_duplicate (PrimitiveDef_ptr);
@@ -3845,25 +3885,25 @@ TAO_NAMESPACE  CORBA
     static PrimitiveDef_ptr tao_nil (void);
     static PrimitiveDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     PrimitiveDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    PrimitiveDef_var (const TAO_Base_var & rhs);
-    PrimitiveDef_var & operator= (const TAO_Base_var & rhs);
+    PrimitiveDef_var (const TAO_Base_var &rhs);
+    PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_PRIMITIVEDEF___OUT_CH_)
 #define _CORBA_PRIMITIVEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export PrimitiveDef_out
   {
   public:
@@ -3876,24 +3916,24 @@ TAO_NAMESPACE  CORBA
     operator PrimitiveDef_ptr &();
     PrimitiveDef_ptr &ptr (void);
     PrimitiveDef_ptr operator-> (void);
-
+  
   private:
     PrimitiveDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_PRIMITIVEDEF_CH_)
 #define _CORBA_PRIMITIVEDEF_CH_
-
+  
   class _TAO_PrimitiveDef_Proxy_Impl;
   class _TAO_PrimitiveDef_Remote_Proxy_Impl;
   class _TAO_PrimitiveDef_Proxy_Broker;
   class _TAO_PrimitiveDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export PrimitiveDef
     : public virtual CORBA::IDLType
   {
@@ -3901,95 +3941,96 @@ TAO_NAMESPACE  CORBA
     typedef PrimitiveDef_ptr _ptr_type;
     typedef PrimitiveDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static PrimitiveDef_ptr _duplicate (PrimitiveDef_ptr obj);
-
+    
     static PrimitiveDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PrimitiveDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PrimitiveDef_ptr _nil (void)
       {
         return (PrimitiveDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::PrimitiveKind kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_PrimitiveDef_Proxy_Broker *the_TAO_PrimitiveDef_Proxy_Broker_;
-
+  
   protected:
     PrimitiveDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_PrimitiveDef_setup_collocation (int collocated);
-
+    
     PrimitiveDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~PrimitiveDef (void);
-
+    
     friend class _TAO_PrimitiveDef_Remote_Proxy_Impl;
     friend class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
     friend class _TAO_PrimitiveDef_Direct_Proxy_Impl;
-
+  
   private:
     PrimitiveDef (const PrimitiveDef &);
     void operator= (const PrimitiveDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Impl
     : public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_PrimitiveDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::PrimitiveKind kind (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -3997,23 +4038,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_PrimitiveDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_PrimitiveDef_Remote_Proxy_Impl
     : public virtual _TAO_PrimitiveDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -4021,12 +4062,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_PrimitiveDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_PrimitiveDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::PrimitiveKind kind (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -4035,23 +4076,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Broker
   {
   public:
@@ -4060,64 +4101,64 @@ TAO_NAMESPACE  CORBA
         PrimitiveDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_PrimitiveDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_PrimitiveDef_Remote_Proxy_Broker
     : public virtual _TAO_PrimitiveDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_PrimitiveDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
         PrimitiveDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_PrimitiveDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_PrimitiveDef_Remote_Proxy_Broker *the_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrimitiveDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_STRINGDEF___PTR_CH_)
 #define _CORBA_STRINGDEF___PTR_CH_
-
+  
   class StringDef;
   typedef StringDef *StringDef_ptr;
 
@@ -4125,31 +4166,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_STRINGDEF___VAR_CH_)
 #define _CORBA_STRINGDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export StringDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export StringDef_var : public TAO_Base_var
   {
   public:
     StringDef_var (void); // default constructor
-    StringDef_var (StringDef_ptr p) : ptr_ (p) {}
+    StringDef_var (StringDef_ptr p) : ptr_ (p) {} 
     StringDef_var (const StringDef_var &); // copy constructor
     ~StringDef_var (void); // destructor
-
+    
     StringDef_var &operator= (StringDef_ptr);
     StringDef_var &operator= (const StringDef_var &);
     StringDef_ptr operator-> (void) const;
-
+    
     operator const StringDef_ptr &() const;
     operator StringDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     StringDef_ptr in (void) const;
     StringDef_ptr &inout (void);
     StringDef_ptr &out (void);
     StringDef_ptr _retn (void);
     StringDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static StringDef_ptr tao_duplicate (StringDef_ptr);
@@ -4157,25 +4198,25 @@ TAO_NAMESPACE  CORBA
     static StringDef_ptr tao_nil (void);
     static StringDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     StringDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    StringDef_var (const TAO_Base_var & rhs);
-    StringDef_var & operator= (const TAO_Base_var & rhs);
+    StringDef_var (const TAO_Base_var &rhs);
+    StringDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_STRINGDEF___OUT_CH_)
 #define _CORBA_STRINGDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export StringDef_out
   {
   public:
@@ -4188,24 +4229,24 @@ TAO_NAMESPACE  CORBA
     operator StringDef_ptr &();
     StringDef_ptr &ptr (void);
     StringDef_ptr operator-> (void);
-
+  
   private:
     StringDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_STRINGDEF_CH_)
 #define _CORBA_STRINGDEF_CH_
-
+  
   class _TAO_StringDef_Proxy_Impl;
   class _TAO_StringDef_Remote_Proxy_Impl;
   class _TAO_StringDef_Proxy_Broker;
   class _TAO_StringDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export StringDef
     : public virtual CORBA::IDLType
   {
@@ -4213,40 +4254,40 @@ TAO_NAMESPACE  CORBA
     typedef StringDef_ptr _ptr_type;
     typedef StringDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static StringDef_ptr _duplicate (StringDef_ptr obj);
-
+    
     static StringDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static StringDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static StringDef_ptr _nil (void)
       {
         return (StringDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void bound (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4254,65 +4295,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_StringDef_Proxy_Broker *the_TAO_StringDef_Proxy_Broker_;
-
+  
   protected:
     StringDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_StringDef_setup_collocation (int collocated);
-
+    
     StringDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~StringDef (void);
-
+    
     friend class _TAO_StringDef_Remote_Proxy_Impl;
     friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
     friend class _TAO_StringDef_Direct_Proxy_Impl;
-
+  
   private:
     StringDef (const StringDef &);
     void operator= (const StringDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_StringDef_Proxy_Impl
     : public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_StringDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::ULong bound (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -4320,10 +4362,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void bound (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -4332,23 +4374,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_StringDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_StringDef_Remote_Proxy_Impl
     : public virtual _TAO_StringDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -4356,12 +4398,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_StringDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_StringDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::ULong bound (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -4369,10 +4411,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void bound (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -4382,23 +4424,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_StringDef_Proxy_Broker
   {
   public:
@@ -4407,64 +4449,64 @@ TAO_NAMESPACE  CORBA
         StringDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_StringDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_StringDef_Remote_Proxy_Broker
     : public virtual _TAO_StringDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_StringDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_StringDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_StringDef_Proxy_Impl &select_proxy (
         StringDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_StringDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_StringDef_Remote_Proxy_Broker *the_TAO_StringDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_WSTRINGDEF___PTR_CH_)
 #define _CORBA_WSTRINGDEF___PTR_CH_
-
+  
   class WstringDef;
   typedef WstringDef *WstringDef_ptr;
 
@@ -4472,31 +4514,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_WSTRINGDEF___VAR_CH_)
 #define _CORBA_WSTRINGDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export WstringDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export WstringDef_var : public TAO_Base_var
   {
   public:
     WstringDef_var (void); // default constructor
-    WstringDef_var (WstringDef_ptr p) : ptr_ (p) {}
+    WstringDef_var (WstringDef_ptr p) : ptr_ (p) {} 
     WstringDef_var (const WstringDef_var &); // copy constructor
     ~WstringDef_var (void); // destructor
-
+    
     WstringDef_var &operator= (WstringDef_ptr);
     WstringDef_var &operator= (const WstringDef_var &);
     WstringDef_ptr operator-> (void) const;
-
+    
     operator const WstringDef_ptr &() const;
     operator WstringDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     WstringDef_ptr in (void) const;
     WstringDef_ptr &inout (void);
     WstringDef_ptr &out (void);
     WstringDef_ptr _retn (void);
     WstringDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static WstringDef_ptr tao_duplicate (WstringDef_ptr);
@@ -4504,25 +4546,25 @@ TAO_NAMESPACE  CORBA
     static WstringDef_ptr tao_nil (void);
     static WstringDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     WstringDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    WstringDef_var (const TAO_Base_var & rhs);
-    WstringDef_var & operator= (const TAO_Base_var & rhs);
+    WstringDef_var (const TAO_Base_var &rhs);
+    WstringDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_WSTRINGDEF___OUT_CH_)
 #define _CORBA_WSTRINGDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export WstringDef_out
   {
   public:
@@ -4535,24 +4577,24 @@ TAO_NAMESPACE  CORBA
     operator WstringDef_ptr &();
     WstringDef_ptr &ptr (void);
     WstringDef_ptr operator-> (void);
-
+  
   private:
     WstringDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_WSTRINGDEF_CH_)
 #define _CORBA_WSTRINGDEF_CH_
-
+  
   class _TAO_WstringDef_Proxy_Impl;
   class _TAO_WstringDef_Remote_Proxy_Impl;
   class _TAO_WstringDef_Proxy_Broker;
   class _TAO_WstringDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export WstringDef
     : public virtual CORBA::IDLType
   {
@@ -4560,40 +4602,40 @@ TAO_NAMESPACE  CORBA
     typedef WstringDef_ptr _ptr_type;
     typedef WstringDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static WstringDef_ptr _duplicate (WstringDef_ptr obj);
-
+    
     static WstringDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static WstringDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static WstringDef_ptr _nil (void)
       {
         return (WstringDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void bound (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4601,65 +4643,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_WstringDef_Proxy_Broker *the_TAO_WstringDef_Proxy_Broker_;
-
+  
   protected:
     WstringDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_WstringDef_setup_collocation (int collocated);
-
+    
     WstringDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~WstringDef (void);
-
+    
     friend class _TAO_WstringDef_Remote_Proxy_Impl;
     friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
     friend class _TAO_WstringDef_Direct_Proxy_Impl;
-
+  
   private:
     WstringDef (const WstringDef &);
     void operator= (const WstringDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Impl
     : public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_WstringDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::ULong bound (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -4667,10 +4710,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void bound (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -4679,23 +4722,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_WstringDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_WstringDef_Remote_Proxy_Impl
     : public virtual _TAO_WstringDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -4703,12 +4746,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_WstringDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_WstringDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::ULong bound (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -4716,10 +4759,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void bound (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -4729,23 +4772,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Broker
   {
   public:
@@ -4754,64 +4797,64 @@ TAO_NAMESPACE  CORBA
         WstringDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_WstringDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_WstringDef_Remote_Proxy_Broker
     : public virtual _TAO_WstringDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_WstringDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_WstringDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
         WstringDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_WstringDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_WstringDef_Remote_Proxy_Broker *the_TAO_WstringDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WstringDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_SEQUENCEDEF___PTR_CH_)
 #define _CORBA_SEQUENCEDEF___PTR_CH_
-
+  
   class SequenceDef;
   typedef SequenceDef *SequenceDef_ptr;
 
@@ -4819,31 +4862,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_SEQUENCEDEF___VAR_CH_)
 #define _CORBA_SEQUENCEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export SequenceDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export SequenceDef_var : public TAO_Base_var
   {
   public:
     SequenceDef_var (void); // default constructor
-    SequenceDef_var (SequenceDef_ptr p) : ptr_ (p) {}
+    SequenceDef_var (SequenceDef_ptr p) : ptr_ (p) {} 
     SequenceDef_var (const SequenceDef_var &); // copy constructor
     ~SequenceDef_var (void); // destructor
-
+    
     SequenceDef_var &operator= (SequenceDef_ptr);
     SequenceDef_var &operator= (const SequenceDef_var &);
     SequenceDef_ptr operator-> (void) const;
-
+    
     operator const SequenceDef_ptr &() const;
     operator SequenceDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     SequenceDef_ptr in (void) const;
     SequenceDef_ptr &inout (void);
     SequenceDef_ptr &out (void);
     SequenceDef_ptr _retn (void);
     SequenceDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static SequenceDef_ptr tao_duplicate (SequenceDef_ptr);
@@ -4851,25 +4894,25 @@ TAO_NAMESPACE  CORBA
     static SequenceDef_ptr tao_nil (void);
     static SequenceDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     SequenceDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    SequenceDef_var (const TAO_Base_var & rhs);
-    SequenceDef_var & operator= (const TAO_Base_var & rhs);
+    SequenceDef_var (const TAO_Base_var &rhs);
+    SequenceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_SEQUENCEDEF___OUT_CH_)
 #define _CORBA_SEQUENCEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export SequenceDef_out
   {
   public:
@@ -4882,24 +4925,24 @@ TAO_NAMESPACE  CORBA
     operator SequenceDef_ptr &();
     SequenceDef_ptr &ptr (void);
     SequenceDef_ptr operator-> (void);
-
+  
   private:
     SequenceDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_SEQUENCEDEF_CH_)
 #define _CORBA_SEQUENCEDEF_CH_
-
+  
   class _TAO_SequenceDef_Proxy_Impl;
   class _TAO_SequenceDef_Remote_Proxy_Impl;
   class _TAO_SequenceDef_Proxy_Broker;
   class _TAO_SequenceDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export SequenceDef
     : public virtual CORBA::IDLType
   {
@@ -4907,40 +4950,40 @@ TAO_NAMESPACE  CORBA
     typedef SequenceDef_ptr _ptr_type;
     typedef SequenceDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static SequenceDef_ptr _duplicate (SequenceDef_ptr obj);
-
+    
     static SequenceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static SequenceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static SequenceDef_ptr _nil (void)
       {
         return (SequenceDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void bound (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4948,30 +4991,30 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr element_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::IDLType_ptr element_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void element_type_def (
         CORBA::IDLType_ptr element_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4979,65 +5022,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_SequenceDef_Proxy_Broker *the_TAO_SequenceDef_Proxy_Broker_;
-
+  
   protected:
     SequenceDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_SequenceDef_setup_collocation (int collocated);
-
+    
     SequenceDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~SequenceDef (void);
-
+    
     friend class _TAO_SequenceDef_Remote_Proxy_Impl;
     friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
     friend class _TAO_SequenceDef_Direct_Proxy_Impl;
-
+  
   private:
     SequenceDef (const SequenceDef &);
     void operator= (const SequenceDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Impl
     : public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_SequenceDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::ULong bound (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5045,10 +5089,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void bound (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -5057,10 +5101,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::TypeCode_ptr element_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5068,10 +5112,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::IDLType_ptr element_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5079,10 +5123,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void element_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr element_type_def
@@ -5091,23 +5135,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_SequenceDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_SequenceDef_Remote_Proxy_Impl
     : public virtual _TAO_SequenceDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -5115,12 +5159,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_SequenceDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_SequenceDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::ULong bound (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5128,10 +5172,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void bound (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -5140,10 +5184,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::TypeCode_ptr element_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5151,10 +5195,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::IDLType_ptr element_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5162,10 +5206,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void element_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr element_type_def
@@ -5175,23 +5219,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Broker
   {
   public:
@@ -5200,64 +5244,64 @@ TAO_NAMESPACE  CORBA
         SequenceDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_SequenceDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_SequenceDef_Remote_Proxy_Broker
     : public virtual _TAO_SequenceDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_SequenceDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_SequenceDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
         SequenceDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_SequenceDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_SequenceDef_Remote_Proxy_Broker *the_TAO_SequenceDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SequenceDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_ARRAYDEF___PTR_CH_)
 #define _CORBA_ARRAYDEF___PTR_CH_
-
+  
   class ArrayDef;
   typedef ArrayDef *ArrayDef_ptr;
 
@@ -5265,31 +5309,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_ARRAYDEF___VAR_CH_)
 #define _CORBA_ARRAYDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ArrayDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ArrayDef_var : public TAO_Base_var
   {
   public:
     ArrayDef_var (void); // default constructor
-    ArrayDef_var (ArrayDef_ptr p) : ptr_ (p) {}
+    ArrayDef_var (ArrayDef_ptr p) : ptr_ (p) {} 
     ArrayDef_var (const ArrayDef_var &); // copy constructor
     ~ArrayDef_var (void); // destructor
-
+    
     ArrayDef_var &operator= (ArrayDef_ptr);
     ArrayDef_var &operator= (const ArrayDef_var &);
     ArrayDef_ptr operator-> (void) const;
-
+    
     operator const ArrayDef_ptr &() const;
     operator ArrayDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ArrayDef_ptr in (void) const;
     ArrayDef_ptr &inout (void);
     ArrayDef_ptr &out (void);
     ArrayDef_ptr _retn (void);
     ArrayDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ArrayDef_ptr tao_duplicate (ArrayDef_ptr);
@@ -5297,25 +5341,25 @@ TAO_NAMESPACE  CORBA
     static ArrayDef_ptr tao_nil (void);
     static ArrayDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ArrayDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ArrayDef_var (const TAO_Base_var & rhs);
-    ArrayDef_var & operator= (const TAO_Base_var & rhs);
+    ArrayDef_var (const TAO_Base_var &rhs);
+    ArrayDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ARRAYDEF___OUT_CH_)
 #define _CORBA_ARRAYDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ArrayDef_out
   {
   public:
@@ -5328,24 +5372,24 @@ TAO_NAMESPACE  CORBA
     operator ArrayDef_ptr &();
     ArrayDef_ptr &ptr (void);
     ArrayDef_ptr operator-> (void);
-
+  
   private:
     ArrayDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_ARRAYDEF_CH_)
 #define _CORBA_ARRAYDEF_CH_
-
+  
   class _TAO_ArrayDef_Proxy_Impl;
   class _TAO_ArrayDef_Remote_Proxy_Impl;
   class _TAO_ArrayDef_Proxy_Broker;
   class _TAO_ArrayDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export ArrayDef
     : public virtual CORBA::IDLType
   {
@@ -5353,40 +5397,40 @@ TAO_NAMESPACE  CORBA
     typedef ArrayDef_ptr _ptr_type;
     typedef ArrayDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static ArrayDef_ptr _duplicate (ArrayDef_ptr obj);
-
+    
     static ArrayDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ArrayDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ArrayDef_ptr _nil (void)
       {
         return (ArrayDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong length (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void length (
         CORBA::ULong length
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5394,30 +5438,30 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr element_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::IDLType_ptr element_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void element_type_def (
         CORBA::IDLType_ptr element_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5425,65 +5469,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ArrayDef_Proxy_Broker *the_TAO_ArrayDef_Proxy_Broker_;
-
+  
   protected:
     ArrayDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ArrayDef_setup_collocation (int collocated);
-
+    
     ArrayDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ArrayDef (void);
-
+    
     friend class _TAO_ArrayDef_Remote_Proxy_Impl;
     friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ArrayDef_Direct_Proxy_Impl;
-
+  
   private:
     ArrayDef (const ArrayDef &);
     void operator= (const ArrayDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Impl
     : public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_ArrayDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::ULong length (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5491,10 +5536,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void length (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong length
@@ -5503,10 +5548,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::TypeCode_ptr element_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5514,10 +5559,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::IDLType_ptr element_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5525,10 +5570,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void element_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr element_type_def
@@ -5537,23 +5582,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_ArrayDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_ArrayDef_Remote_Proxy_Impl
     : public virtual _TAO_ArrayDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -5561,12 +5606,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ArrayDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ArrayDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::ULong length (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5574,10 +5619,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void length (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong length
@@ -5586,10 +5631,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::TypeCode_ptr element_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5597,10 +5642,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::IDLType_ptr element_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5608,10 +5653,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void element_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr element_type_def
@@ -5621,23 +5666,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Broker
   {
   public:
@@ -5646,64 +5691,64 @@ TAO_NAMESPACE  CORBA
         ArrayDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_ArrayDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_ArrayDef_Remote_Proxy_Broker
     : public virtual _TAO_ArrayDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ArrayDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ArrayDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
         ArrayDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_ArrayDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ArrayDef_Remote_Proxy_Broker *the_TAO_ArrayDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ArrayDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_EXCEPTIONDEF___PTR_CH_)
 #define _CORBA_EXCEPTIONDEF___PTR_CH_
-
+  
   class ExceptionDef;
   typedef ExceptionDef *ExceptionDef_ptr;
 
@@ -5711,31 +5756,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_EXCEPTIONDEF___VAR_CH_)
 #define _CORBA_EXCEPTIONDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ExceptionDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ExceptionDef_var : public TAO_Base_var
   {
   public:
     ExceptionDef_var (void); // default constructor
-    ExceptionDef_var (ExceptionDef_ptr p) : ptr_ (p) {}
+    ExceptionDef_var (ExceptionDef_ptr p) : ptr_ (p) {} 
     ExceptionDef_var (const ExceptionDef_var &); // copy constructor
     ~ExceptionDef_var (void); // destructor
-
+    
     ExceptionDef_var &operator= (ExceptionDef_ptr);
     ExceptionDef_var &operator= (const ExceptionDef_var &);
     ExceptionDef_ptr operator-> (void) const;
-
+    
     operator const ExceptionDef_ptr &() const;
     operator ExceptionDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ExceptionDef_ptr in (void) const;
     ExceptionDef_ptr &inout (void);
     ExceptionDef_ptr &out (void);
     ExceptionDef_ptr _retn (void);
     ExceptionDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ExceptionDef_ptr tao_duplicate (ExceptionDef_ptr);
@@ -5743,25 +5788,25 @@ TAO_NAMESPACE  CORBA
     static ExceptionDef_ptr tao_nil (void);
     static ExceptionDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ExceptionDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ExceptionDef_var (const TAO_Base_var & rhs);
-    ExceptionDef_var & operator= (const TAO_Base_var & rhs);
+    ExceptionDef_var (const TAO_Base_var &rhs);
+    ExceptionDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_EXCEPTIONDEF___OUT_CH_)
 #define _CORBA_EXCEPTIONDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ExceptionDef_out
   {
   public:
@@ -5774,24 +5819,24 @@ TAO_NAMESPACE  CORBA
     operator ExceptionDef_ptr &();
     ExceptionDef_ptr &ptr (void);
     ExceptionDef_ptr operator-> (void);
-
+  
   private:
     ExceptionDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_EXCEPTIONDEF_CH_)
 #define _CORBA_EXCEPTIONDEF_CH_
-
+  
   class _TAO_ExceptionDef_Proxy_Impl;
   class _TAO_ExceptionDef_Remote_Proxy_Impl;
   class _TAO_ExceptionDef_Proxy_Broker;
   class _TAO_ExceptionDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export ExceptionDef
     : public virtual CORBA::Contained,
       public virtual CORBA::Container
@@ -5800,50 +5845,50 @@ TAO_NAMESPACE  CORBA
     typedef ExceptionDef_ptr _ptr_type;
     typedef ExceptionDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static ExceptionDef_ptr _duplicate (ExceptionDef_ptr obj);
-
+    
     static ExceptionDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ExceptionDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ExceptionDef_ptr _nil (void)
       {
         return (ExceptionDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::StructMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void members (
         const CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5851,66 +5896,67 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ExceptionDef_Proxy_Broker *the_TAO_ExceptionDef_Proxy_Broker_;
-
+  
   protected:
     ExceptionDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ExceptionDef_setup_collocation (int collocated);
-
+    
     ExceptionDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ExceptionDef (void);
-
+    
     friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
     friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
-
+  
   private:
     ExceptionDef (const ExceptionDef &);
     void operator= (const ExceptionDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Contained_Proxy_Impl,
+    : public virtual CORBA::_TAO_Contained_Proxy_Impl, 
       public virtual CORBA::_TAO_Container_Proxy_Impl
   {
   public:
     virtual ~_TAO_ExceptionDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5918,10 +5964,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::StructMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5929,10 +5975,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::StructMemberSeq & members
@@ -5941,23 +5987,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_ExceptionDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_ExceptionDef_Remote_Proxy_Impl
     : public virtual _TAO_ExceptionDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -5966,12 +6012,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ExceptionDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ExceptionDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5979,10 +6025,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::StructMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5990,10 +6036,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::StructMemberSeq & members
@@ -6003,23 +6049,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Broker
   {
   public:
@@ -6028,143 +6074,66 @@ TAO_NAMESPACE  CORBA
         ExceptionDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_ExceptionDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_ExceptionDef_Remote_Proxy_Broker
     : public virtual _TAO_ExceptionDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ExceptionDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ExceptionDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
         ExceptionDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_ExceptionDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ExceptionDef_Remote_Proxy_Broker *the_TAO_ExceptionDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionDef;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
-  class ExceptionDescription_var;
-
-  struct TAO_IFR_Client_Export ExceptionDescription
-  {
-    typedef ExceptionDescription_var _var_type;
-
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var type;
-  };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
-  class TAO_IFR_Client_Export ExceptionDescription_var
-  {
-  public:
-    ExceptionDescription_var (void);
-    ExceptionDescription_var (ExceptionDescription *);
-    ExceptionDescription_var (const ExceptionDescription_var &);
-    ~ExceptionDescription_var (void);
-
-    ExceptionDescription_var &operator= (ExceptionDescription *);
-    ExceptionDescription_var &operator= (const ExceptionDescription_var &);
-    ExceptionDescription *operator-> (void);
-    const ExceptionDescription *operator-> (void) const;
-
-    operator const ExceptionDescription &() const;
-    operator ExceptionDescription &();
-    operator ExceptionDescription &() const;
-
-    // Variable-size types only.
-    operator ExceptionDescription *&();
-
-    // in, inout, out, _retn
-    const ExceptionDescription &in (void) const;
-    ExceptionDescription &inout (void);
-    ExceptionDescription *&out (void);
-    ExceptionDescription *_retn (void);
-    ExceptionDescription *ptr (void) const;
-
-  private:
-    ExceptionDescription *ptr_;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
-  class TAO_IFR_Client_Export ExceptionDescription_out
-  {
-  public:
-    ExceptionDescription_out (ExceptionDescription *&);
-    ExceptionDescription_out (ExceptionDescription_var &);
-    ExceptionDescription_out (const ExceptionDescription_out &);
-    ExceptionDescription_out &operator= (const ExceptionDescription_out &);
-    ExceptionDescription_out &operator= (ExceptionDescription *);
-    operator ExceptionDescription *&();
-    ExceptionDescription *&ptr (void);
-    ExceptionDescription *operator-> (void);
-
-  private:
-    ExceptionDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExceptionDescription_var &);
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionDescription;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
+  // 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_CORBA_EXCEPTIONDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CH_
-
+  
   class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -6184,14 +6153,14 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void);
-
+    
     // = Accessors.
     TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var> operator[] (CORBA::ULong index) const;
-
+    
     // = Static operations.
     static ExceptionDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (ExceptionDef **buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -6201,7 +6170,7 @@ TAO_NAMESPACE  CORBA
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-
+    
     virtual void _downcast (
         void* target,
         CORBA::Object *src
@@ -6212,47 +6181,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ_CH_)
 #define _CORBA_EXCEPTIONDEFSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ExceptionDefSeq;
   class ExceptionDefSeq_var;
-
+  
   // *************************************************************
   // CORBA::ExceptionDefSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export ExceptionDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export ExceptionDefSeq : 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_ExceptionDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<ExceptionDef,ExceptionDef_var>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ExceptionDefSeq (void);
     ExceptionDefSeq (CORBA::ULong max);
     ExceptionDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExceptionDef_ptr *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ExceptionDef_ptr *buffer, 
         CORBA::Boolean release = 0
       );
     ExceptionDefSeq (const ExceptionDefSeq &);
     ~ExceptionDefSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef ExceptionDefSeq_var _var_type;
   };
 
@@ -6260,14 +6229,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ___VAR_CH_)
 #define _CORBA_EXCEPTIONDEFSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::ExceptionDefSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export ExceptionDefSeq_var
   {
   public:
@@ -6275,28 +6244,28 @@ TAO_NAMESPACE  CORBA
     ExceptionDefSeq_var (ExceptionDefSeq *);
     ExceptionDefSeq_var (const ExceptionDefSeq_var &);
     ~ExceptionDefSeq_var (void);
-
+    
     ExceptionDefSeq_var &operator= (ExceptionDefSeq *);
     ExceptionDefSeq_var &operator= (const ExceptionDefSeq_var &);
     ExceptionDefSeq *operator-> (void);
     const ExceptionDefSeq *operator-> (void) const;
-
+    
     operator const ExceptionDefSeq &() const;
     operator ExceptionDefSeq &();
     operator ExceptionDefSeq &() const;
-
+    
     // Variable-size base types only.
     operator ExceptionDefSeq *&();
-
+    
     TAO_Object_Manager<ExceptionDef, ExceptionDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ExceptionDefSeq &in (void) const;
     ExceptionDefSeq &inout (void);
     ExceptionDefSeq *&out (void);
     ExceptionDefSeq *_retn (void);
     ExceptionDefSeq *ptr (void) const;
-
+  
   private:
     ExceptionDefSeq *ptr_;
   };
@@ -6305,10 +6274,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ___OUT_CH_)
 #define _CORBA_EXCEPTIONDEFSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export ExceptionDefSeq_out
   {
   public:
@@ -6321,7 +6290,7 @@ TAO_NAMESPACE  CORBA
     ExceptionDefSeq *&ptr (void);
     ExceptionDefSeq *operator-> (void);
     TAO_Object_Manager<ExceptionDef, ExceptionDef_var> operator[] (CORBA::ULong index);
-
+  
   private:
     ExceptionDefSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -6329,201 +6298,34 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionDefSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ExceptionDescription *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
-        const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &operator= (
-        const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void);
-
-    // = Accessors.
-    ExceptionDescription &operator[] (CORBA::ULong i);
-    const ExceptionDescription &operator[] (CORBA::ULong i) const;
-
-    // = Static operations.
-    static ExceptionDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (ExceptionDescription *buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ExceptionDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const ExceptionDescription *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExceptionDescription *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CH_)
-#define _CORBA_EXCDESCRIPTIONSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class ExcDescriptionSeq;
-  class ExcDescriptionSeq_var;
-
-  // *************************************************************
-  // CORBA::ExcDescriptionSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export ExcDescriptionSeq : public
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ExceptionDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    ExcDescriptionSeq (void);
-    ExcDescriptionSeq (CORBA::ULong max);
-    ExcDescriptionSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExceptionDescription *buffer,
-        CORBA::Boolean release = 0
-      );
-    ExcDescriptionSeq (const ExcDescriptionSeq &);
-    ~ExcDescriptionSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef ExcDescriptionSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_EXCDESCRIPTIONSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class CORBA::ExcDescriptionSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export ExcDescriptionSeq_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
+  enum AttributeMode
   {
-  public:
-    ExcDescriptionSeq_var (void);
-    ExcDescriptionSeq_var (ExcDescriptionSeq *);
-    ExcDescriptionSeq_var (const ExcDescriptionSeq_var &);
-    ~ExcDescriptionSeq_var (void);
-
-    ExcDescriptionSeq_var &operator= (ExcDescriptionSeq *);
-    ExcDescriptionSeq_var &operator= (const ExcDescriptionSeq_var &);
-    ExcDescriptionSeq *operator-> (void);
-    const ExcDescriptionSeq *operator-> (void) const;
-
-    operator const ExcDescriptionSeq &() const;
-    operator ExcDescriptionSeq &();
-    operator ExcDescriptionSeq &() const;
-
-    // Variable-size base types only.
-    operator ExcDescriptionSeq *&();
-
-    ExceptionDescription & operator[] (CORBA::ULong index);
-    const ExceptionDescription & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
-    const ExcDescriptionSeq &in (void) const;
-    ExcDescriptionSeq &inout (void);
-    ExcDescriptionSeq *&out (void);
-    ExcDescriptionSeq *_retn (void);
-    ExcDescriptionSeq *ptr (void) const;
-
-  private:
-    ExcDescriptionSeq *ptr_;
+    ATTR_NORMAL,
+    ATTR_READONLY
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_EXCDESCRIPTIONSEQ___OUT_CH_
-
+  
+  typedef AttributeMode &AttributeMode_out;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export ExcDescriptionSeq_out
-  {
-  public:
-    ExcDescriptionSeq_out (ExcDescriptionSeq *&);
-    ExcDescriptionSeq_out (ExcDescriptionSeq_var &);
-    ExcDescriptionSeq_out (const ExcDescriptionSeq_out &);
-    ExcDescriptionSeq_out &operator= (const ExcDescriptionSeq_out &);
-    ExcDescriptionSeq_out &operator= (ExcDescriptionSeq *);
-    operator ExcDescriptionSeq *&();
-    ExcDescriptionSeq *&ptr (void);
-    ExcDescriptionSeq *operator-> (void);
-    ExceptionDescription & operator[] (CORBA::ULong index);
-
-  private:
-    ExcDescriptionSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExcDescriptionSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_enum/enum_ch.cpp:57
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AttributeMode;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_ATTRIBUTEDEF___PTR_CH_)
 #define _CORBA_ATTRIBUTEDEF___PTR_CH_
-
+  
   class AttributeDef;
   typedef AttributeDef *AttributeDef_ptr;
 
@@ -6531,31 +6333,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_ATTRIBUTEDEF___VAR_CH_)
 #define _CORBA_ATTRIBUTEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export AttributeDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export AttributeDef_var : public TAO_Base_var
   {
   public:
     AttributeDef_var (void); // default constructor
-    AttributeDef_var (AttributeDef_ptr p) : ptr_ (p) {}
+    AttributeDef_var (AttributeDef_ptr p) : ptr_ (p) {} 
     AttributeDef_var (const AttributeDef_var &); // copy constructor
     ~AttributeDef_var (void); // destructor
-
+    
     AttributeDef_var &operator= (AttributeDef_ptr);
     AttributeDef_var &operator= (const AttributeDef_var &);
     AttributeDef_ptr operator-> (void) const;
-
+    
     operator const AttributeDef_ptr &() const;
     operator AttributeDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     AttributeDef_ptr in (void) const;
     AttributeDef_ptr &inout (void);
     AttributeDef_ptr &out (void);
     AttributeDef_ptr _retn (void);
     AttributeDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static AttributeDef_ptr tao_duplicate (AttributeDef_ptr);
@@ -6563,25 +6365,25 @@ TAO_NAMESPACE  CORBA
     static AttributeDef_ptr tao_nil (void);
     static AttributeDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     AttributeDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    AttributeDef_var (const TAO_Base_var & rhs);
-    AttributeDef_var & operator= (const TAO_Base_var & rhs);
+    AttributeDef_var (const TAO_Base_var &rhs);
+    AttributeDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ATTRIBUTEDEF___OUT_CH_)
 #define _CORBA_ATTRIBUTEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export AttributeDef_out
   {
   public:
@@ -6594,24 +6396,24 @@ TAO_NAMESPACE  CORBA
     operator AttributeDef_ptr &();
     AttributeDef_ptr &ptr (void);
     AttributeDef_ptr operator-> (void);
-
+  
   private:
     AttributeDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_ATTRIBUTEDEF_CH_)
 #define _CORBA_ATTRIBUTEDEF_CH_
-
+  
   class _TAO_AttributeDef_Proxy_Impl;
   class _TAO_AttributeDef_Remote_Proxy_Impl;
   class _TAO_AttributeDef_Proxy_Broker;
   class _TAO_AttributeDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export AttributeDef
     : public virtual CORBA::Contained
   {
@@ -6619,50 +6421,50 @@ TAO_NAMESPACE  CORBA
     typedef AttributeDef_ptr _ptr_type;
     typedef AttributeDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static AttributeDef_ptr _duplicate (AttributeDef_ptr obj);
-
+    
     static AttributeDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static AttributeDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static AttributeDef_ptr _nil (void)
       {
         return (AttributeDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void type_def (
         CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -6670,20 +6472,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::AttributeMode mode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void mode (
         CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -6691,65 +6493,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_AttributeDef_Proxy_Broker *the_TAO_AttributeDef_Proxy_Broker_;
-
+  
   protected:
     AttributeDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_AttributeDef_setup_collocation (int collocated);
-
+    
     AttributeDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~AttributeDef (void);
-
+    
     friend class _TAO_AttributeDef_Remote_Proxy_Impl;
     friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
     friend class _TAO_AttributeDef_Direct_Proxy_Impl;
-
+  
   private:
     AttributeDef (const AttributeDef &);
     void operator= (const AttributeDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Impl
     : public virtual CORBA::_TAO_Contained_Proxy_Impl
   {
   public:
     virtual ~_TAO_AttributeDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6757,10 +6560,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::IDLType_ptr type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6768,10 +6571,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr type_def
@@ -6780,10 +6583,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::AttributeMode mode (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6791,10 +6594,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void mode (
         CORBA::Object *_collocated_tao_target_,
         CORBA::AttributeMode mode
@@ -6803,23 +6606,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_AttributeDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_AttributeDef_Remote_Proxy_Impl
     : public virtual _TAO_AttributeDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -6827,12 +6630,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_AttributeDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_AttributeDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6840,10 +6643,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::IDLType_ptr type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6851,10 +6654,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr type_def
@@ -6863,10 +6666,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::AttributeMode mode (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6874,10 +6677,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void mode (
         CORBA::Object *_collocated_tao_target_,
         CORBA::AttributeMode mode
@@ -6887,23 +6690,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Broker
   {
   public:
@@ -6912,67 +6715,67 @@ TAO_NAMESPACE  CORBA
         AttributeDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_AttributeDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_AttributeDef_Remote_Proxy_Broker
     : public virtual _TAO_AttributeDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_AttributeDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_AttributeDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
         AttributeDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_AttributeDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_AttributeDef_Remote_Proxy_Broker *the_TAO_AttributeDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AttributeDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class AttributeDescription_var;
-
+  
   struct TAO_IFR_Client_Export AttributeDescription
   {
     typedef AttributeDescription_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -6981,10 +6784,10 @@ TAO_NAMESPACE  CORBA
     CORBA::TypeCode_var type;
     CORBA::AttributeMode mode;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_IFR_Client_Export AttributeDescription_var
   {
   public:
@@ -6992,33 +6795,33 @@ TAO_NAMESPACE  CORBA
     AttributeDescription_var (AttributeDescription *);
     AttributeDescription_var (const AttributeDescription_var &);
     ~AttributeDescription_var (void);
-
+    
     AttributeDescription_var &operator= (AttributeDescription *);
     AttributeDescription_var &operator= (const AttributeDescription_var &);
     AttributeDescription *operator-> (void);
     const AttributeDescription *operator-> (void) const;
-
+    
     operator const AttributeDescription &() const;
     operator AttributeDescription &();
     operator AttributeDescription &() const;
-
+    
     // Variable-size types only.
     operator AttributeDescription *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const AttributeDescription &in (void) const;
     AttributeDescription &inout (void);
     AttributeDescription *&out (void);
     AttributeDescription *_retn (void);
     AttributeDescription *ptr (void) const;
-
+  
   private:
     AttributeDescription *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_IFR_Client_Export AttributeDescription_out
   {
   public:
@@ -7030,53 +6833,580 @@ TAO_NAMESPACE  CORBA
     operator AttributeDescription *&();
     AttributeDescription *&ptr (void);
     AttributeDescription *operator-> (void);
-
+    
   private:
     AttributeDescription *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const AttributeDescription_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AttributeDescription;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_enum/enum_ch.cpp:57
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class ExtAttributeDescription_var;
+  
+  struct TAO_IFR_Client_Export ExtAttributeDescription
+  {
+    typedef ExtAttributeDescription_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    TAO_String_Manager name;
+    TAO_String_Manager id;
+    TAO_String_Manager defined_in;
+    TAO_String_Manager version;
+    CORBA::TypeCode_var type;
+    CORBA::AttributeMode mode;
+    CORBA::ExcDescriptionSeq get_exceptions;
+    CORBA::ExcDescriptionSeq put_exceptions;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
+  class TAO_IFR_Client_Export ExtAttributeDescription_var
+  {
+  public:
+    ExtAttributeDescription_var (void);
+    ExtAttributeDescription_var (ExtAttributeDescription *);
+    ExtAttributeDescription_var (const ExtAttributeDescription_var &);
+    ~ExtAttributeDescription_var (void);
+    
+    ExtAttributeDescription_var &operator= (ExtAttributeDescription *);
+    ExtAttributeDescription_var &operator= (const ExtAttributeDescription_var &);
+    ExtAttributeDescription *operator-> (void);
+    const ExtAttributeDescription *operator-> (void) const;
+    
+    operator const ExtAttributeDescription &() const;
+    operator ExtAttributeDescription &();
+    operator ExtAttributeDescription &() const;
+    
+    // Variable-size types only.
+    operator ExtAttributeDescription *&();
+    
+    // in, inout, out, _retn 
+    const ExtAttributeDescription &in (void) const;
+    ExtAttributeDescription &inout (void);
+    ExtAttributeDescription *&out (void);
+    ExtAttributeDescription *_retn (void);
+    ExtAttributeDescription *ptr (void) const;
+  
+  private:
+    ExtAttributeDescription *ptr_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
+  class TAO_IFR_Client_Export ExtAttributeDescription_out
+  {
+  public:
+    ExtAttributeDescription_out (ExtAttributeDescription *&);
+    ExtAttributeDescription_out (ExtAttributeDescription_var &);
+    ExtAttributeDescription_out (const ExtAttributeDescription_out &);
+    ExtAttributeDescription_out &operator= (const ExtAttributeDescription_out &);
+    ExtAttributeDescription_out &operator= (ExtAttributeDescription *);
+    operator ExtAttributeDescription *&();
+    ExtAttributeDescription *&ptr (void);
+    ExtAttributeDescription *operator-> (void);
+    
+  private:
+    ExtAttributeDescription *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ExtAttributeDescription_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_ExtAttributeDescription;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OperationMode;
+#if !defined (_CORBA_EXTATTRIBUTEDEF___PTR_CH_)
+#define _CORBA_EXTATTRIBUTEDEF___PTR_CH_
+  
+  class ExtAttributeDef;
+  typedef ExtAttributeDef *ExtAttributeDef_ptr;
 
-  // TAO_IDL - Generated from
-  // be/be_visitor_enum/enum_ch.cpp:57
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTATTRIBUTEDEF___VAR_CH_)
+#define _CORBA_EXTATTRIBUTEDEF___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ExtAttributeDef_var : public TAO_Base_var
+  {
+  public:
+    ExtAttributeDef_var (void); // default constructor
+    ExtAttributeDef_var (ExtAttributeDef_ptr p) : ptr_ (p) {} 
+    ExtAttributeDef_var (const ExtAttributeDef_var &); // copy constructor
+    ~ExtAttributeDef_var (void); // destructor
+    
+    ExtAttributeDef_var &operator= (ExtAttributeDef_ptr);
+    ExtAttributeDef_var &operator= (const ExtAttributeDef_var &);
+    ExtAttributeDef_ptr operator-> (void) const;
+    
+    operator const ExtAttributeDef_ptr &() const;
+    operator ExtAttributeDef_ptr &();
+    // in, inout, out, _retn 
+    ExtAttributeDef_ptr in (void) const;
+    ExtAttributeDef_ptr &inout (void);
+    ExtAttributeDef_ptr &out (void);
+    ExtAttributeDef_ptr _retn (void);
+    ExtAttributeDef_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ExtAttributeDef_ptr tao_duplicate (ExtAttributeDef_ptr);
+    static void tao_release (ExtAttributeDef_ptr);
+    static ExtAttributeDef_ptr tao_nil (void);
+    static ExtAttributeDef_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+  
+  private:
+    ExtAttributeDef_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ExtAttributeDef_var (const TAO_Base_var &rhs);
+    ExtAttributeDef_var &operator= (const TAO_Base_var &rhs);
+  };
 
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTATTRIBUTEDEF___OUT_CH_)
+#define _CORBA_EXTATTRIBUTEDEF___OUT_CH_
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
+  class TAO_IFR_Client_Export ExtAttributeDef_out
+  {
+  public:
+    ExtAttributeDef_out (ExtAttributeDef_ptr &);
+    ExtAttributeDef_out (ExtAttributeDef_var &);
+    ExtAttributeDef_out (const ExtAttributeDef_out &);
+    ExtAttributeDef_out &operator= (const ExtAttributeDef_out &);
+    ExtAttributeDef_out &operator= (const ExtAttributeDef_var &);
+    ExtAttributeDef_out &operator= (ExtAttributeDef_ptr);
+    operator ExtAttributeDef_ptr &();
+    ExtAttributeDef_ptr &ptr (void);
+    ExtAttributeDef_ptr operator-> (void);
+  
+  private:
+    ExtAttributeDef_ptr &ptr_;
+  };
 
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParameterMode;
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
+#if !defined (_CORBA_EXTATTRIBUTEDEF_CH_)
+#define _CORBA_EXTATTRIBUTEDEF_CH_
+  
+  class _TAO_ExtAttributeDef_Proxy_Impl;
+  class _TAO_ExtAttributeDef_Remote_Proxy_Impl;
+  class _TAO_ExtAttributeDef_Proxy_Broker;
+  class _TAO_ExtAttributeDef_Remote_Proxy_Broker;
+  
+  class TAO_IFR_Client_Export ExtAttributeDef
+    : public virtual CORBA::AttributeDef
+  {
+  public:
+    typedef ExtAttributeDef_ptr _ptr_type;
+    typedef ExtAttributeDef_var _var_type;
+    static int _tao_class_id;
+    
+    // The static operations.
+    static ExtAttributeDef_ptr _duplicate (ExtAttributeDef_ptr obj);
+    
+    static ExtAttributeDef_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ExtAttributeDef_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ExtAttributeDef_ptr _nil (void)
+      {
+        return (ExtAttributeDef_ptr)0;
+      }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::ExcDescriptionSeq * get_exceptions (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void get_exceptions (
+        const CORBA::ExcDescriptionSeq & get_exceptions
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::ExcDescriptionSeq * set_exceptions (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void set_exceptions (
+        const CORBA::ExcDescriptionSeq & set_exceptions
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::ExtAttributeDescription * describe_attribute (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  private:
+    _TAO_ExtAttributeDef_Proxy_Broker *the_TAO_ExtAttributeDef_Proxy_Broker_;
+  
+  protected:
+    ExtAttributeDef (int collocated = 0);
+    
+    // These methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode.
+    virtual void CORBA_ExtAttributeDef_setup_collocation (int collocated);
+    
+    ExtAttributeDef (
+        TAO_Stub *objref, 
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0
+      );
+    virtual ~ExtAttributeDef (void);
+    
+    friend class _TAO_ExtAttributeDef_Remote_Proxy_Impl;
+    friend class _TAO_ExtAttributeDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_ExtAttributeDef_Direct_Proxy_Impl;
+  
+  private:
+    ExtAttributeDef (const ExtAttributeDef &);
+    void operator= (const ExtAttributeDef &);
+  };
+  
+  // The Proxy Implementations are used by each interface to
+  // perform a call. Each different implementation encapsulates
+  // an invocation logic.
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base Proxy Impl. Declaration
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
+  class TAO_IFR_Client_Export _TAO_ExtAttributeDef_Proxy_Impl
+    : public virtual CORBA::_TAO_AttributeDef_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_ExtAttributeDef_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
+    virtual ::CORBA::ExcDescriptionSeq * get_exceptions (
+        CORBA::Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
+    virtual void get_exceptions (
+        CORBA::Object *_collocated_tao_target_,
+        const CORBA::ExcDescriptionSeq & get_exceptions
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
+    virtual ::CORBA::ExcDescriptionSeq * set_exceptions (
+        CORBA::Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
+    virtual void set_exceptions (
+        CORBA::Object *_collocated_tao_target_,
+        const CORBA::ExcDescriptionSeq & set_exceptions
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
+    virtual ::CORBA::ExtAttributeDescription * describe_attribute (
+        CORBA::Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+  
+  protected:
+    _TAO_ExtAttributeDef_Proxy_Impl (void);
+  };
+  
+  //
+  //               End Base Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                Remote Proxy Impl. Declaration
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
+  class TAO_IFR_Client_Export _TAO_ExtAttributeDef_Remote_Proxy_Impl
+    : public virtual _TAO_ExtAttributeDef_Proxy_Impl,
+      public virtual TAO_Remote_Object_Proxy_Impl,
+      public virtual CORBA::_TAO_AttributeDef_Remote_Proxy_Impl
+  {
+  public:
+    _TAO_ExtAttributeDef_Remote_Proxy_Impl (void);
+    
+    virtual ~_TAO_ExtAttributeDef_Remote_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    virtual ::CORBA::ExcDescriptionSeq * get_exceptions (
+        CORBA::Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    virtual void get_exceptions (
+        CORBA::Object *_collocated_tao_target_,
+        const CORBA::ExcDescriptionSeq & get_exceptions
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    virtual ::CORBA::ExcDescriptionSeq * set_exceptions (
+        CORBA::Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    virtual void set_exceptions (
+        CORBA::Object *_collocated_tao_target_,
+        const CORBA::ExcDescriptionSeq & set_exceptions
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    virtual ::CORBA::ExtAttributeDescription * describe_attribute (
+        CORBA::Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
+  
+  //
+  //             End Remote Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  // The Proxy Brokers are used by each interface to get
+  // the right proxy for performing a call. In the new 
+  // collocation scheme, the proxy to be used can vary on
+  // a call by call basis.
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                 Base Proxy Broker Declaration 
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
+  class TAO_IFR_Client_Export _TAO_ExtAttributeDef_Proxy_Broker
+  {
+  public:
+    virtual ~_TAO_ExtAttributeDef_Proxy_Broker (void);
+    virtual _TAO_ExtAttributeDef_Proxy_Impl &select_proxy (
+        ExtAttributeDef *object
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+  protected:
+    _TAO_ExtAttributeDef_Proxy_Broker (void);
+    
+  };
+  
+  //
+  //              End Base Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
+  
+    
+  ///////////////////////////////////////////////////////////////////////
+  //                 Remote Proxy Broker Declaration 
+  //
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
+  class TAO_IFR_Client_Export _TAO_ExtAttributeDef_Remote_Proxy_Broker
+    : public virtual _TAO_ExtAttributeDef_Proxy_Broker
+  {
+  public: 
+    _TAO_ExtAttributeDef_Remote_Proxy_Broker (void);
+    
+    virtual ~_TAO_ExtAttributeDef_Remote_Proxy_Broker (void);
+    
+    virtual _TAO_ExtAttributeDef_Proxy_Impl &select_proxy (
+        ExtAttributeDef *object
+        ACE_ENV_ARG_DECL
+      );
+    
+  private:
+    _TAO_ExtAttributeDef_Remote_Proxy_Impl remote_proxy_impl_;
+  
+  public:
+    // This member function is used to get an handle to the unique instance
+    // of the Remote Proxy Broker that is available for a given
+    // interface.
+    static _TAO_ExtAttributeDef_Remote_Proxy_Broker *the_TAO_ExtAttributeDef_Remote_Proxy_Broker (void);
+  };
+  
+  //
+  //              End Remote Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
 
+#endif /* end #if !defined */
+  
+  // 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_ExtAttributeDef;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
+  enum OperationMode
+  {
+    OP_NORMAL,
+    OP_ONEWAY
+  };
+  
+  typedef OperationMode &OperationMode_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_OperationMode;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class ParameterDescription_var;
-
+  
   struct TAO_IFR_Client_Export ParameterDescription
   {
     typedef ParameterDescription_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
     CORBA::ParameterMode mode;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_IFR_Client_Export ParameterDescription_var
   {
   public:
@@ -7084,33 +7414,33 @@ TAO_NAMESPACE  CORBA
     ParameterDescription_var (ParameterDescription *);
     ParameterDescription_var (const ParameterDescription_var &);
     ~ParameterDescription_var (void);
-
+    
     ParameterDescription_var &operator= (ParameterDescription *);
     ParameterDescription_var &operator= (const ParameterDescription_var &);
     ParameterDescription *operator-> (void);
     const ParameterDescription *operator-> (void) const;
-
+    
     operator const ParameterDescription &() const;
     operator ParameterDescription &();
     operator ParameterDescription &() const;
-
+    
     // Variable-size types only.
     operator ParameterDescription *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ParameterDescription &in (void) const;
     ParameterDescription &inout (void);
     ParameterDescription *&out (void);
     ParameterDescription *_retn (void);
     ParameterDescription *ptr (void) const;
-
+  
   private:
     ParameterDescription *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_IFR_Client_Export ParameterDescription_out
   {
   public:
@@ -7122,32 +7452,32 @@ TAO_NAMESPACE  CORBA
     operator ParameterDescription *&();
     ParameterDescription *&ptr (void);
     ParameterDescription *operator-> (void);
-
+    
   private:
     ParameterDescription *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ParameterDescription_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParameterDescription;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+  
+  // 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_CORBA_PARDESCRIPTIONSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CH_
-
+  
   class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -7161,15 +7491,15 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void);
-
+    
     // = Accessors.
     ParameterDescription &operator[] (CORBA::ULong i);
     const ParameterDescription &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static ParameterDescription *allocbuf (CORBA::ULong size);
     static void freebuf (ParameterDescription *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -7185,47 +7515,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ_CH_)
 #define _CORBA_PARDESCRIPTIONSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ParDescriptionSeq;
   class ParDescriptionSeq_var;
-
+  
   // *************************************************************
   // CORBA::ParDescriptionSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export ParDescriptionSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export ParDescriptionSeq : 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_CORBA_ParDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ParameterDescription>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ParDescriptionSeq (void);
     ParDescriptionSeq (CORBA::ULong max);
     ParDescriptionSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ParameterDescription *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ParameterDescription *buffer, 
         CORBA::Boolean release = 0
       );
     ParDescriptionSeq (const ParDescriptionSeq &);
     ~ParDescriptionSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef ParDescriptionSeq_var _var_type;
   };
 
@@ -7233,14 +7563,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ___VAR_CH_)
 #define _CORBA_PARDESCRIPTIONSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::ParDescriptionSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export ParDescriptionSeq_var
   {
   public:
@@ -7248,29 +7578,29 @@ TAO_NAMESPACE  CORBA
     ParDescriptionSeq_var (ParDescriptionSeq *);
     ParDescriptionSeq_var (const ParDescriptionSeq_var &);
     ~ParDescriptionSeq_var (void);
-
+    
     ParDescriptionSeq_var &operator= (ParDescriptionSeq *);
     ParDescriptionSeq_var &operator= (const ParDescriptionSeq_var &);
     ParDescriptionSeq *operator-> (void);
     const ParDescriptionSeq *operator-> (void) const;
-
+    
     operator const ParDescriptionSeq &() const;
     operator ParDescriptionSeq &();
     operator ParDescriptionSeq &() const;
-
+    
     // Variable-size base types only.
     operator ParDescriptionSeq *&();
-
+    
     ParameterDescription & operator[] (CORBA::ULong index);
     const ParameterDescription & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ParDescriptionSeq &in (void) const;
     ParDescriptionSeq &inout (void);
     ParDescriptionSeq *&out (void);
     ParDescriptionSeq *_retn (void);
     ParDescriptionSeq *ptr (void) const;
-
+  
   private:
     ParDescriptionSeq *ptr_;
   };
@@ -7279,10 +7609,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ___OUT_CH_)
 #define _CORBA_PARDESCRIPTIONSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export ParDescriptionSeq_out
   {
   public:
@@ -7295,7 +7625,7 @@ TAO_NAMESPACE  CORBA
     ParDescriptionSeq *&ptr (void);
     ParDescriptionSeq *operator-> (void);
     ParameterDescription & operator[] (CORBA::ULong index);
-
+  
   private:
     ParDescriptionSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -7303,63 +7633,63 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParDescriptionSeq;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:368
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+  
   typedef char * ContextIdentifier;
   typedef CORBA::String_var ContextIdentifier_var;
   typedef CORBA::String_out ContextIdentifier_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContextIdentifier;
 
 #if !defined (_CORBA_CONTEXTIDSEQ_CH_)
 #define _CORBA_CONTEXTIDSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ContextIdSeq;
   class ContextIdSeq_var;
-
+  
   // *************************************************************
   // CORBA::ContextIdSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export ContextIdSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export ContextIdSeq : 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_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_String_Sequence
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ContextIdSeq (void);
     ContextIdSeq (CORBA::ULong max);
     ContextIdSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        char * *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        char * *buffer, 
         CORBA::Boolean release = 0
       );
     ContextIdSeq (const ContextIdSeq &);
     ~ContextIdSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef ContextIdSeq_var _var_type;
   };
 
@@ -7367,14 +7697,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_CONTEXTIDSEQ___VAR_CH_)
 #define _CORBA_CONTEXTIDSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::ContextIdSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export ContextIdSeq_var
   {
   public:
@@ -7382,28 +7712,28 @@ TAO_NAMESPACE  CORBA
     ContextIdSeq_var (ContextIdSeq *);
     ContextIdSeq_var (const ContextIdSeq_var &);
     ~ContextIdSeq_var (void);
-
+    
     ContextIdSeq_var &operator= (ContextIdSeq *);
     ContextIdSeq_var &operator= (const ContextIdSeq_var &);
     ContextIdSeq *operator-> (void);
     const ContextIdSeq *operator-> (void) const;
-
+    
     operator const ContextIdSeq &() const;
     operator ContextIdSeq &();
     operator ContextIdSeq &() const;
-
+    
     // Variable-size base types only.
     operator ContextIdSeq *&();
-
+    
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ContextIdSeq &in (void) const;
     ContextIdSeq &inout (void);
     ContextIdSeq *&out (void);
     ContextIdSeq *_retn (void);
     ContextIdSeq *ptr (void) const;
-
+  
   private:
     ContextIdSeq *ptr_;
   };
@@ -7412,10 +7742,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_CONTEXTIDSEQ___OUT_CH_)
 #define _CORBA_CONTEXTIDSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export ContextIdSeq_out
   {
   public:
@@ -7428,7 +7758,7 @@ TAO_NAMESPACE  CORBA
     ContextIdSeq *&ptr (void);
     ContextIdSeq *operator-> (void);
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
+  
   private:
     ContextIdSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -7436,18 +7766,18 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContextIdSeq;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_OPERATIONDEF___PTR_CH_)
 #define _CORBA_OPERATIONDEF___PTR_CH_
-
+  
   class OperationDef;
   typedef OperationDef *OperationDef_ptr;
 
@@ -7455,31 +7785,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_OPERATIONDEF___VAR_CH_)
 #define _CORBA_OPERATIONDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export OperationDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export OperationDef_var : public TAO_Base_var
   {
   public:
     OperationDef_var (void); // default constructor
-    OperationDef_var (OperationDef_ptr p) : ptr_ (p) {}
+    OperationDef_var (OperationDef_ptr p) : ptr_ (p) {} 
     OperationDef_var (const OperationDef_var &); // copy constructor
     ~OperationDef_var (void); // destructor
-
+    
     OperationDef_var &operator= (OperationDef_ptr);
     OperationDef_var &operator= (const OperationDef_var &);
     OperationDef_ptr operator-> (void) const;
-
+    
     operator const OperationDef_ptr &() const;
     operator OperationDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     OperationDef_ptr in (void) const;
     OperationDef_ptr &inout (void);
     OperationDef_ptr &out (void);
     OperationDef_ptr _retn (void);
     OperationDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static OperationDef_ptr tao_duplicate (OperationDef_ptr);
@@ -7487,25 +7817,25 @@ TAO_NAMESPACE  CORBA
     static OperationDef_ptr tao_nil (void);
     static OperationDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     OperationDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    OperationDef_var (const TAO_Base_var & rhs);
-    OperationDef_var & operator= (const TAO_Base_var & rhs);
+    OperationDef_var (const TAO_Base_var &rhs);
+    OperationDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_OPERATIONDEF___OUT_CH_)
 #define _CORBA_OPERATIONDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export OperationDef_out
   {
   public:
@@ -7518,24 +7848,24 @@ TAO_NAMESPACE  CORBA
     operator OperationDef_ptr &();
     OperationDef_ptr &ptr (void);
     OperationDef_ptr operator-> (void);
-
+  
   private:
     OperationDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_OPERATIONDEF_CH_)
 #define _CORBA_OPERATIONDEF_CH_
-
+  
   class _TAO_OperationDef_Proxy_Impl;
   class _TAO_OperationDef_Remote_Proxy_Impl;
   class _TAO_OperationDef_Proxy_Broker;
   class _TAO_OperationDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export OperationDef
     : public virtual CORBA::Contained
   {
@@ -7543,50 +7873,50 @@ TAO_NAMESPACE  CORBA
     typedef OperationDef_ptr _ptr_type;
     typedef OperationDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static OperationDef_ptr _duplicate (OperationDef_ptr obj);
-
+    
     static OperationDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static OperationDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static OperationDef_ptr _nil (void)
       {
         return (OperationDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr result (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::IDLType_ptr result_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void result_def (
         CORBA::IDLType_ptr result_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7594,20 +7924,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ParDescriptionSeq * params (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void params (
         const CORBA::ParDescriptionSeq & params
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7615,20 +7945,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::OperationMode mode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void mode (
         CORBA::OperationMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7636,20 +7966,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ContextIdSeq * contexts (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void contexts (
         const CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7657,20 +7987,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ExceptionDefSeq * exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void exceptions (
         const CORBA::ExceptionDefSeq & exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7678,65 +8008,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_OperationDef_Proxy_Broker *the_TAO_OperationDef_Proxy_Broker_;
-
+  
   protected:
     OperationDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_OperationDef_setup_collocation (int collocated);
-
+    
     OperationDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~OperationDef (void);
-
+    
     friend class _TAO_OperationDef_Remote_Proxy_Impl;
     friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
     friend class _TAO_OperationDef_Direct_Proxy_Impl;
-
+  
   private:
     OperationDef (const OperationDef &);
     void operator= (const OperationDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Impl
     : public virtual CORBA::_TAO_Contained_Proxy_Impl
   {
   public:
     virtual ~_TAO_OperationDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::TypeCode_ptr result (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7744,10 +8075,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::IDLType_ptr result_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7755,10 +8086,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void result_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr result_def
@@ -7767,10 +8098,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ParDescriptionSeq * params (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7778,10 +8109,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void params (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ParDescriptionSeq & params
@@ -7790,10 +8121,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::OperationMode mode (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7801,10 +8132,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void mode (
         CORBA::Object *_collocated_tao_target_,
         CORBA::OperationMode mode
@@ -7813,10 +8144,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ContextIdSeq * contexts (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7824,10 +8155,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void contexts (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ContextIdSeq & contexts
@@ -7836,10 +8167,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ExceptionDefSeq * exceptions (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7847,10 +8178,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void exceptions (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ExceptionDefSeq & exceptions
@@ -7859,23 +8190,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_OperationDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_OperationDef_Remote_Proxy_Impl
     : public virtual _TAO_OperationDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -7883,12 +8214,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_OperationDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_OperationDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::TypeCode_ptr result (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7896,10 +8227,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::IDLType_ptr result_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7907,10 +8238,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void result_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr result_def
@@ -7919,10 +8250,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ParDescriptionSeq * params (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7930,10 +8261,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void params (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ParDescriptionSeq & params
@@ -7942,10 +8273,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::OperationMode mode (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7953,10 +8284,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void mode (
         CORBA::Object *_collocated_tao_target_,
         CORBA::OperationMode mode
@@ -7965,10 +8296,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ContextIdSeq * contexts (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7976,10 +8307,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void contexts (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ContextIdSeq & contexts
@@ -7988,10 +8319,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ExceptionDefSeq * exceptions (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7999,10 +8330,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void exceptions (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ExceptionDefSeq & exceptions
@@ -8012,23 +8343,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Broker
   {
   public:
@@ -8037,67 +8368,67 @@ TAO_NAMESPACE  CORBA
         OperationDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_OperationDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_OperationDef_Remote_Proxy_Broker
     : public virtual _TAO_OperationDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_OperationDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_OperationDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
         OperationDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_OperationDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_OperationDef_Remote_Proxy_Broker *the_TAO_OperationDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OperationDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class OperationDescription_var;
-
+  
   struct TAO_IFR_Client_Export OperationDescription
   {
     typedef OperationDescription_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -8109,10 +8440,10 @@ TAO_NAMESPACE  CORBA
     CORBA::ParDescriptionSeq parameters;
     CORBA::ExcDescriptionSeq exceptions;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_IFR_Client_Export OperationDescription_var
   {
   public:
@@ -8120,33 +8451,33 @@ TAO_NAMESPACE  CORBA
     OperationDescription_var (OperationDescription *);
     OperationDescription_var (const OperationDescription_var &);
     ~OperationDescription_var (void);
-
+    
     OperationDescription_var &operator= (OperationDescription *);
     OperationDescription_var &operator= (const OperationDescription_var &);
     OperationDescription *operator-> (void);
     const OperationDescription *operator-> (void) const;
-
+    
     operator const OperationDescription &() const;
     operator OperationDescription &();
     operator OperationDescription &() const;
-
+    
     // Variable-size types only.
     operator OperationDescription *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const OperationDescription &in (void) const;
     OperationDescription &inout (void);
     OperationDescription *&out (void);
     OperationDescription *_retn (void);
     OperationDescription *ptr (void) const;
-
+  
   private:
     OperationDescription *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_IFR_Client_Export OperationDescription_out
   {
   public:
@@ -8158,57 +8489,57 @@ TAO_NAMESPACE  CORBA
     operator OperationDescription *&();
     OperationDescription *&ptr (void);
     OperationDescription *operator-> (void);
-
+    
   private:
     OperationDescription *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const OperationDescription_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OperationDescription;
 
 #if !defined (_CORBA_REPOSITORYIDSEQ_CH_)
 #define _CORBA_REPOSITORYIDSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class RepositoryIdSeq;
   class RepositoryIdSeq_var;
-
+  
   // *************************************************************
   // CORBA::RepositoryIdSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export RepositoryIdSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export RepositoryIdSeq : 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_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_String_Sequence
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     RepositoryIdSeq (void);
     RepositoryIdSeq (CORBA::ULong max);
     RepositoryIdSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        char * *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        char * *buffer, 
         CORBA::Boolean release = 0
       );
     RepositoryIdSeq (const RepositoryIdSeq &);
     ~RepositoryIdSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef RepositoryIdSeq_var _var_type;
   };
 
@@ -8216,14 +8547,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_REPOSITORYIDSEQ___VAR_CH_)
 #define _CORBA_REPOSITORYIDSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::RepositoryIdSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export RepositoryIdSeq_var
   {
   public:
@@ -8231,28 +8562,28 @@ TAO_NAMESPACE  CORBA
     RepositoryIdSeq_var (RepositoryIdSeq *);
     RepositoryIdSeq_var (const RepositoryIdSeq_var &);
     ~RepositoryIdSeq_var (void);
-
+    
     RepositoryIdSeq_var &operator= (RepositoryIdSeq *);
     RepositoryIdSeq_var &operator= (const RepositoryIdSeq_var &);
     RepositoryIdSeq *operator-> (void);
     const RepositoryIdSeq *operator-> (void) const;
-
+    
     operator const RepositoryIdSeq &() const;
     operator RepositoryIdSeq &();
     operator RepositoryIdSeq &() const;
-
+    
     // Variable-size base types only.
     operator RepositoryIdSeq *&();
-
+    
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const RepositoryIdSeq &in (void) const;
     RepositoryIdSeq &inout (void);
     RepositoryIdSeq *&out (void);
     RepositoryIdSeq *_retn (void);
     RepositoryIdSeq *ptr (void) const;
-
+  
   private:
     RepositoryIdSeq *ptr_;
   };
@@ -8261,10 +8592,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_REPOSITORYIDSEQ___OUT_CH_)
 #define _CORBA_REPOSITORYIDSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export RepositoryIdSeq_out
   {
   public:
@@ -8277,7 +8608,7 @@ TAO_NAMESPACE  CORBA
     RepositoryIdSeq *&ptr (void);
     RepositoryIdSeq *operator-> (void);
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
+  
   private:
     RepositoryIdSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -8285,26 +8616,26 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+  
+  // 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_CORBA_OPDESCRIPTIONSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CH_
-
+  
   class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -8318,15 +8649,15 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void);
-
+    
     // = Accessors.
     OperationDescription &operator[] (CORBA::ULong i);
     const OperationDescription &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static OperationDescription *allocbuf (CORBA::ULong size);
     static void freebuf (OperationDescription *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -8342,47 +8673,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_OPDESCRIPTIONSEQ_CH_)
 #define _CORBA_OPDESCRIPTIONSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class OpDescriptionSeq;
   class OpDescriptionSeq_var;
-
+  
   // *************************************************************
   // CORBA::OpDescriptionSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export OpDescriptionSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export OpDescriptionSeq : 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_CORBA_OpDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<OperationDescription>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     OpDescriptionSeq (void);
     OpDescriptionSeq (CORBA::ULong max);
     OpDescriptionSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        OperationDescription *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        OperationDescription *buffer, 
         CORBA::Boolean release = 0
       );
     OpDescriptionSeq (const OpDescriptionSeq &);
     ~OpDescriptionSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef OpDescriptionSeq_var _var_type;
   };
 
@@ -8390,14 +8721,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_OPDESCRIPTIONSEQ___VAR_CH_)
 #define _CORBA_OPDESCRIPTIONSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::OpDescriptionSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export OpDescriptionSeq_var
   {
   public:
@@ -8405,29 +8736,29 @@ TAO_NAMESPACE  CORBA
     OpDescriptionSeq_var (OpDescriptionSeq *);
     OpDescriptionSeq_var (const OpDescriptionSeq_var &);
     ~OpDescriptionSeq_var (void);
-
+    
     OpDescriptionSeq_var &operator= (OpDescriptionSeq *);
     OpDescriptionSeq_var &operator= (const OpDescriptionSeq_var &);
     OpDescriptionSeq *operator-> (void);
     const OpDescriptionSeq *operator-> (void) const;
-
+    
     operator const OpDescriptionSeq &() const;
     operator OpDescriptionSeq &();
     operator OpDescriptionSeq &() const;
-
+    
     // Variable-size base types only.
     operator OpDescriptionSeq *&();
-
+    
     OperationDescription & operator[] (CORBA::ULong index);
     const OperationDescription & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const OpDescriptionSeq &in (void) const;
     OpDescriptionSeq &inout (void);
     OpDescriptionSeq *&out (void);
     OpDescriptionSeq *_retn (void);
     OpDescriptionSeq *ptr (void) const;
-
+  
   private:
     OpDescriptionSeq *ptr_;
   };
@@ -8436,10 +8767,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_OPDESCRIPTIONSEQ___OUT_CH_)
 #define _CORBA_OPDESCRIPTIONSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export OpDescriptionSeq_out
   {
   public:
@@ -8452,7 +8783,7 @@ TAO_NAMESPACE  CORBA
     OpDescriptionSeq *&ptr (void);
     OpDescriptionSeq *operator-> (void);
     OperationDescription & operator[] (CORBA::ULong index);
-
+  
   private:
     OpDescriptionSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -8460,26 +8791,26 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OpDescriptionSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+  
+  // 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_CORBA_ATTRDESCRIPTIONSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CH_
-
+  
   class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -8493,15 +8824,15 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void);
-
+    
     // = Accessors.
     AttributeDescription &operator[] (CORBA::ULong i);
     const AttributeDescription &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static AttributeDescription *allocbuf (CORBA::ULong size);
     static void freebuf (AttributeDescription *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -8517,47 +8848,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CH_)
 #define _CORBA_ATTRDESCRIPTIONSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class AttrDescriptionSeq;
   class AttrDescriptionSeq_var;
-
+  
   // *************************************************************
   // CORBA::AttrDescriptionSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export AttrDescriptionSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export AttrDescriptionSeq : 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_CORBA_AttrDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<AttributeDescription>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     AttrDescriptionSeq (void);
     AttrDescriptionSeq (CORBA::ULong max);
     AttrDescriptionSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        AttributeDescription *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        AttributeDescription *buffer, 
         CORBA::Boolean release = 0
       );
     AttrDescriptionSeq (const AttrDescriptionSeq &);
     ~AttrDescriptionSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef AttrDescriptionSeq_var _var_type;
   };
 
@@ -8565,14 +8896,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_ATTRDESCRIPTIONSEQ___VAR_CH_)
 #define _CORBA_ATTRDESCRIPTIONSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::AttrDescriptionSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export AttrDescriptionSeq_var
   {
   public:
@@ -8580,29 +8911,29 @@ TAO_NAMESPACE  CORBA
     AttrDescriptionSeq_var (AttrDescriptionSeq *);
     AttrDescriptionSeq_var (const AttrDescriptionSeq_var &);
     ~AttrDescriptionSeq_var (void);
-
+    
     AttrDescriptionSeq_var &operator= (AttrDescriptionSeq *);
     AttrDescriptionSeq_var &operator= (const AttrDescriptionSeq_var &);
     AttrDescriptionSeq *operator-> (void);
     const AttrDescriptionSeq *operator-> (void) const;
-
+    
     operator const AttrDescriptionSeq &() const;
     operator AttrDescriptionSeq &();
     operator AttrDescriptionSeq &() const;
-
+    
     // Variable-size base types only.
     operator AttrDescriptionSeq *&();
-
+    
     AttributeDescription & operator[] (CORBA::ULong index);
     const AttributeDescription & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const AttrDescriptionSeq &in (void) const;
     AttrDescriptionSeq &inout (void);
     AttrDescriptionSeq *&out (void);
     AttrDescriptionSeq *_retn (void);
     AttrDescriptionSeq *ptr (void) const;
-
+  
   private:
     AttrDescriptionSeq *ptr_;
   };
@@ -8611,10 +8942,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_ATTRDESCRIPTIONSEQ___OUT_CH_)
 #define _CORBA_ATTRDESCRIPTIONSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export AttrDescriptionSeq_out
   {
   public:
@@ -8627,7 +8958,7 @@ TAO_NAMESPACE  CORBA
     AttrDescriptionSeq *&ptr (void);
     AttrDescriptionSeq *operator-> (void);
     AttributeDescription & operator[] (CORBA::ULong index);
-
+  
   private:
     AttrDescriptionSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -8635,18 +8966,193 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
+  
+  // 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_AttrDescriptionSeq;
+  
+  // 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_CORBA_EXTATTRDESCRIPTIONSEQ_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXTATTRDESCRIPTIONSEQ_CH_
+  
+  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (void);
+    _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (CORBA::ULong maximum); 
+    _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (
+        CORBA::ULong maximum,
+        CORBA::ULong length,
+        ExtAttributeDescription *data,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (
+        const _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq &rhs
+      );
+    _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq &operator= (
+        const _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (void);
+    
+    // = Accessors.
+    ExtAttributeDescription &operator[] (CORBA::ULong i);
+    const ExtAttributeDescription &operator[] (CORBA::ULong i) const;
+    
+    // = Static operations.
+    static ExtAttributeDescription *allocbuf (CORBA::ULong size);
+    static void freebuf (ExtAttributeDescription *buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ExtAttributeDescription *get_buffer (CORBA::Boolean orphan = 0);
+    const ExtAttributeDescription *get_buffer (void) const;
+    void replace (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ExtAttributeDescription *data,
+        CORBA::Boolean release
+      );
+  };
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ_CH_)
+#define _CORBA_EXTATTRDESCRIPTIONSEQ_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ExtAttrDescriptionSeq;
+  class ExtAttrDescriptionSeq_var;
+  
+  // *************************************************************
+  // CORBA::ExtAttrDescriptionSeq
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExtAttrDescriptionSeq : 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_CORBA_ExtAttrDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<ExtAttributeDescription>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  {
+  public:
+    ExtAttrDescriptionSeq (void);
+    ExtAttrDescriptionSeq (CORBA::ULong max);
+    ExtAttrDescriptionSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ExtAttributeDescription *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ExtAttrDescriptionSeq (const ExtAttrDescriptionSeq &);
+    ~ExtAttrDescriptionSeq (void);
+    
+    static void _tao_any_destructor (void*);
+    
+    typedef ExtAttrDescriptionSeq_var _var_type;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ___VAR_CH_)
+#define _CORBA_EXTATTRDESCRIPTIONSEQ___VAR_CH_
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
+  // *************************************************************
+  // class CORBA::ExtAttrDescriptionSeq_var
+  // *************************************************************
+  
+  class TAO_IFR_Client_Export ExtAttrDescriptionSeq_var
+  {
+  public:
+    ExtAttrDescriptionSeq_var (void);
+    ExtAttrDescriptionSeq_var (ExtAttrDescriptionSeq *);
+    ExtAttrDescriptionSeq_var (const ExtAttrDescriptionSeq_var &);
+    ~ExtAttrDescriptionSeq_var (void);
+    
+    ExtAttrDescriptionSeq_var &operator= (ExtAttrDescriptionSeq *);
+    ExtAttrDescriptionSeq_var &operator= (const ExtAttrDescriptionSeq_var &);
+    ExtAttrDescriptionSeq *operator-> (void);
+    const ExtAttrDescriptionSeq *operator-> (void) const;
+    
+    operator const ExtAttrDescriptionSeq &() const;
+    operator ExtAttrDescriptionSeq &();
+    operator ExtAttrDescriptionSeq &() const;
+    
+    // Variable-size base types only.
+    operator ExtAttrDescriptionSeq *&();
+    
+    ExtAttributeDescription & operator[] (CORBA::ULong index);
+    const ExtAttributeDescription & operator[] (CORBA::ULong index) const;
+    
+    // in, inout, out, _retn 
+    const ExtAttrDescriptionSeq &in (void) const;
+    ExtAttrDescriptionSeq &inout (void);
+    ExtAttrDescriptionSeq *&out (void);
+    ExtAttrDescriptionSeq *_retn (void);
+    ExtAttrDescriptionSeq *ptr (void) const;
+  
+  private:
+    ExtAttrDescriptionSeq *ptr_;
+  };
 
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AttrDescriptionSeq;
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ___OUT_CH_)
+#define _CORBA_EXTATTRDESCRIPTIONSEQ___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_IFR_Client_Export ExtAttrDescriptionSeq_out
+  {
+  public:
+    ExtAttrDescriptionSeq_out (ExtAttrDescriptionSeq *&);
+    ExtAttrDescriptionSeq_out (ExtAttrDescriptionSeq_var &);
+    ExtAttrDescriptionSeq_out (const ExtAttrDescriptionSeq_out &);
+    ExtAttrDescriptionSeq_out &operator= (const ExtAttrDescriptionSeq_out &);
+    ExtAttrDescriptionSeq_out &operator= (ExtAttrDescriptionSeq *);
+    operator ExtAttrDescriptionSeq *&();
+    ExtAttrDescriptionSeq *&ptr (void);
+    ExtAttrDescriptionSeq *operator-> (void);
+    ExtAttributeDescription & operator[] (CORBA::ULong index);
+  
+  private:
+    ExtAttrDescriptionSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ExtAttrDescriptionSeq_var &);
+  };
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtAttrDescriptionSeq;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_INTERFACEDEF___PTR_CH_)
 #define _CORBA_INTERFACEDEF___PTR_CH_
-
+  
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
 
@@ -8654,31 +9160,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
 #define _CORBA_INTERFACEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export InterfaceDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export InterfaceDef_var : public TAO_Base_var
   {
   public:
     InterfaceDef_var (void); // default constructor
-    InterfaceDef_var (InterfaceDef_ptr p) : ptr_ (p) {}
+    InterfaceDef_var (InterfaceDef_ptr p) : ptr_ (p) {} 
     InterfaceDef_var (const InterfaceDef_var &); // copy constructor
     ~InterfaceDef_var (void); // destructor
-
+    
     InterfaceDef_var &operator= (InterfaceDef_ptr);
     InterfaceDef_var &operator= (const InterfaceDef_var &);
     InterfaceDef_ptr operator-> (void) const;
-
+    
     operator const InterfaceDef_ptr &() const;
     operator InterfaceDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     InterfaceDef_ptr in (void) const;
     InterfaceDef_ptr &inout (void);
     InterfaceDef_ptr &out (void);
     InterfaceDef_ptr _retn (void);
     InterfaceDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static InterfaceDef_ptr tao_duplicate (InterfaceDef_ptr);
@@ -8686,25 +9192,25 @@ TAO_NAMESPACE  CORBA
     static InterfaceDef_ptr tao_nil (void);
     static InterfaceDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     InterfaceDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    InterfaceDef_var (const TAO_Base_var & rhs);
-    InterfaceDef_var & operator= (const TAO_Base_var & rhs);
+    InterfaceDef_var (const TAO_Base_var &rhs);
+    InterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_INTERFACEDEF___OUT_CH_)
 #define _CORBA_INTERFACEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export InterfaceDef_out
   {
   public:
@@ -8717,24 +9223,24 @@ TAO_NAMESPACE  CORBA
     operator InterfaceDef_ptr &();
     InterfaceDef_ptr &ptr (void);
     InterfaceDef_ptr operator-> (void);
-
+  
   private:
     InterfaceDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_INTERFACEDEF_CH_)
 #define _CORBA_INTERFACEDEF_CH_
-
+  
   class _TAO_InterfaceDef_Proxy_Impl;
   class _TAO_InterfaceDef_Remote_Proxy_Impl;
   class _TAO_InterfaceDef_Proxy_Broker;
   class _TAO_InterfaceDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export InterfaceDef
     : public virtual CORBA::Container,
       public virtual CORBA::Contained,
@@ -8744,40 +9250,40 @@ TAO_NAMESPACE  CORBA
     typedef InterfaceDef_ptr _ptr_type;
     typedef InterfaceDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static InterfaceDef_ptr _duplicate (InterfaceDef_ptr obj);
-
+    
     static InterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static InterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static InterfaceDef_ptr _nil (void)
       {
         return (InterfaceDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::InterfaceDefSeq * base_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void base_interfaces (
         const CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -8785,10 +9291,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean is_a (
         const char * interface_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -8796,16 +9302,16 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_structure/structure_ch.cpp:49
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    
     class FullInterfaceDescription_var;
-
+    
     struct TAO_IFR_Client_Export FullInterfaceDescription
     {
       typedef FullInterfaceDescription_var _var_type;
-
+      
       static void _tao_any_destructor (void *);
       TAO_String_Manager name;
       TAO_String_Manager id;
@@ -8816,10 +9322,10 @@ TAO_NAMESPACE  CORBA
       ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) base_interfaces;
       CORBA::TypeCode_var type;
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_structure.cpp:71
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+    
     class TAO_IFR_Client_Export FullInterfaceDescription_var
     {
     public:
@@ -8827,33 +9333,33 @@ TAO_NAMESPACE  CORBA
       FullInterfaceDescription_var (FullInterfaceDescription *);
       FullInterfaceDescription_var (const FullInterfaceDescription_var &);
       ~FullInterfaceDescription_var (void);
-
+      
       FullInterfaceDescription_var &operator= (FullInterfaceDescription *);
       FullInterfaceDescription_var &operator= (const FullInterfaceDescription_var &);
       FullInterfaceDescription *operator-> (void);
       const FullInterfaceDescription *operator-> (void) const;
-
+      
       operator const FullInterfaceDescription &() const;
       operator FullInterfaceDescription &();
       operator FullInterfaceDescription &() const;
-
+      
       // Variable-size types only.
       operator FullInterfaceDescription *&();
-
-      // in, inout, out, _retn
+      
+      // in, inout, out, _retn 
       const FullInterfaceDescription &in (void) const;
       FullInterfaceDescription &inout (void);
       FullInterfaceDescription *&out (void);
       FullInterfaceDescription *_retn (void);
       FullInterfaceDescription *ptr (void) const;
-
+    
     private:
       FullInterfaceDescription *ptr_;
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_structure.cpp:445
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+    
     class TAO_IFR_Client_Export FullInterfaceDescription_out
     {
     public:
@@ -8865,31 +9371,31 @@ TAO_NAMESPACE  CORBA
       operator FullInterfaceDescription *&();
       FullInterfaceDescription *&ptr (void);
       FullInterfaceDescription *operator-> (void);
-
+      
     private:
       FullInterfaceDescription *&ptr_;
       // Assignment from T_var not allowed.
       void operator= (const FullInterfaceDescription_var &);
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_typecode/typecode_decl.cpp:44
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
     static ::CORBA::TypeCode_ptr _tc_FullInterfaceDescription;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
@@ -8901,10 +9407,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
@@ -8919,67 +9425,68 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_InterfaceDef_Proxy_Broker *the_TAO_InterfaceDef_Proxy_Broker_;
-
+  
   protected:
     InterfaceDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_InterfaceDef_setup_collocation (int collocated);
-
+    
     InterfaceDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~InterfaceDef (void);
-
+    
     friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
     friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
     friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
-
+  
   private:
     InterfaceDef (const InterfaceDef &);
     void operator= (const InterfaceDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Container_Proxy_Impl,
-      public virtual CORBA::_TAO_Contained_Proxy_Impl,
+    : public virtual CORBA::_TAO_Container_Proxy_Impl, 
+      public virtual CORBA::_TAO_Contained_Proxy_Impl, 
       public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_InterfaceDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::InterfaceDefSeq * base_interfaces (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8987,10 +9494,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void base_interfaces (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::InterfaceDefSeq & base_interfaces
@@ -8999,10 +9506,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::Boolean is_a (
         CORBA::Object *_collocated_tao_target_,
         const char * interface_id
@@ -9011,10 +9518,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -9022,10 +9529,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -9038,10 +9545,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::OperationDef_ptr create_operation (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -9057,23 +9564,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_InterfaceDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_InterfaceDef_Remote_Proxy_Impl
     : public virtual _TAO_InterfaceDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -9083,12 +9590,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_InterfaceDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_InterfaceDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::InterfaceDefSeq * base_interfaces (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -9096,10 +9603,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void base_interfaces (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::InterfaceDefSeq & base_interfaces
@@ -9108,10 +9615,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::Boolean is_a (
         CORBA::Object *_collocated_tao_target_,
         const char * interface_id
@@ -9120,10 +9627,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -9131,10 +9638,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -9147,10 +9654,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::OperationDef_ptr create_operation (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -9167,23 +9674,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Broker
   {
   public:
@@ -9192,67 +9699,67 @@ TAO_NAMESPACE  CORBA
         InterfaceDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_InterfaceDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_InterfaceDef_Remote_Proxy_Broker
     : public virtual _TAO_InterfaceDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_InterfaceDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_InterfaceDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
         InterfaceDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_InterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_InterfaceDef_Remote_Proxy_Broker *the_TAO_InterfaceDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class InterfaceDescription_var;
-
+  
   struct TAO_IFR_Client_Export InterfaceDescription
   {
     typedef InterfaceDescription_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -9260,10 +9767,10 @@ TAO_NAMESPACE  CORBA
     TAO_String_Manager version;
     CORBA::RepositoryIdSeq base_interfaces;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_IFR_Client_Export InterfaceDescription_var
   {
   public:
@@ -9271,33 +9778,33 @@ TAO_NAMESPACE  CORBA
     InterfaceDescription_var (InterfaceDescription *);
     InterfaceDescription_var (const InterfaceDescription_var &);
     ~InterfaceDescription_var (void);
-
+    
     InterfaceDescription_var &operator= (InterfaceDescription *);
     InterfaceDescription_var &operator= (const InterfaceDescription_var &);
     InterfaceDescription *operator-> (void);
     const InterfaceDescription *operator-> (void) const;
-
+    
     operator const InterfaceDescription &() const;
     operator InterfaceDescription &();
     operator InterfaceDescription &() const;
-
+    
     // Variable-size types only.
     operator InterfaceDescription *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const InterfaceDescription &in (void) const;
     InterfaceDescription &inout (void);
     InterfaceDescription *&out (void);
     InterfaceDescription *_retn (void);
     InterfaceDescription *ptr (void) const;
-
+  
   private:
     InterfaceDescription *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_IFR_Client_Export InterfaceDescription_out
   {
   public:
@@ -9309,24 +9816,753 @@ TAO_NAMESPACE  CORBA
     operator InterfaceDescription *&();
     InterfaceDescription *&ptr (void);
     InterfaceDescription *operator-> (void);
-
+    
   private:
     InterfaceDescription *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const InterfaceDescription_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_InterfaceDescription;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
+#if !defined (_CORBA_INTERFACEATTREXTENSION___PTR_CH_)
+#define _CORBA_INTERFACEATTREXTENSION___PTR_CH_
+  
+  class InterfaceAttrExtension;
+  typedef InterfaceAttrExtension *InterfaceAttrExtension_ptr;
 
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_INTERFACEATTREXTENSION___VAR_CH_)
+#define _CORBA_INTERFACEATTREXTENSION___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export InterfaceAttrExtension_var : public TAO_Base_var
+  {
+  public:
+    InterfaceAttrExtension_var (void); // default constructor
+    InterfaceAttrExtension_var (InterfaceAttrExtension_ptr p) : ptr_ (p) {} 
+    InterfaceAttrExtension_var (const InterfaceAttrExtension_var &); // copy constructor
+    ~InterfaceAttrExtension_var (void); // destructor
+    
+    InterfaceAttrExtension_var &operator= (InterfaceAttrExtension_ptr);
+    InterfaceAttrExtension_var &operator= (const InterfaceAttrExtension_var &);
+    InterfaceAttrExtension_ptr operator-> (void) const;
+    
+    operator const InterfaceAttrExtension_ptr &() const;
+    operator InterfaceAttrExtension_ptr &();
+    // in, inout, out, _retn 
+    InterfaceAttrExtension_ptr in (void) const;
+    InterfaceAttrExtension_ptr &inout (void);
+    InterfaceAttrExtension_ptr &out (void);
+    InterfaceAttrExtension_ptr _retn (void);
+    InterfaceAttrExtension_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static InterfaceAttrExtension_ptr tao_duplicate (InterfaceAttrExtension_ptr);
+    static void tao_release (InterfaceAttrExtension_ptr);
+    static InterfaceAttrExtension_ptr tao_nil (void);
+    static InterfaceAttrExtension_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+  
+  private:
+    InterfaceAttrExtension_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    InterfaceAttrExtension_var (const TAO_Base_var &rhs);
+    InterfaceAttrExtension_var &operator= (const TAO_Base_var &rhs);
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_INTERFACEATTREXTENSION___OUT_CH_)
+#define _CORBA_INTERFACEATTREXTENSION___OUT_CH_
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
+  class TAO_IFR_Client_Export InterfaceAttrExtension_out
+  {
+  public:
+    InterfaceAttrExtension_out (InterfaceAttrExtension_ptr &);
+    InterfaceAttrExtension_out (InterfaceAttrExtension_var &);
+    InterfaceAttrExtension_out (const InterfaceAttrExtension_out &);
+    InterfaceAttrExtension_out &operator= (const InterfaceAttrExtension_out &);
+    InterfaceAttrExtension_out &operator= (const InterfaceAttrExtension_var &);
+    InterfaceAttrExtension_out &operator= (InterfaceAttrExtension_ptr);
+    operator InterfaceAttrExtension_ptr &();
+    InterfaceAttrExtension_ptr &ptr (void);
+    InterfaceAttrExtension_ptr operator-> (void);
+  
+  private:
+    InterfaceAttrExtension_ptr &ptr_;
+  };
 
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceDescription;
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_INTERFACEATTREXTENSION_CH_)
+#define _CORBA_INTERFACEATTREXTENSION_CH_
+  
+  class _TAO_InterfaceAttrExtension_Proxy_Impl;
+  class _TAO_InterfaceAttrExtension_Remote_Proxy_Impl;
+  class _TAO_InterfaceAttrExtension_Proxy_Broker;
+  class _TAO_InterfaceAttrExtension_Remote_Proxy_Broker;
+  
+  class TAO_IFR_Client_Export InterfaceAttrExtension
+    : public virtual CORBA::Object
+  {
+  public:
+    typedef InterfaceAttrExtension_ptr _ptr_type;
+    typedef InterfaceAttrExtension_var _var_type;
+    static int _tao_class_id;
+    
+    // The static operations.
+    static InterfaceAttrExtension_ptr _duplicate (InterfaceAttrExtension_ptr obj);
+    
+    static InterfaceAttrExtension_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static InterfaceAttrExtension_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static InterfaceAttrExtension_ptr _nil (void)
+      {
+        return (InterfaceAttrExtension_ptr)0;
+      }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    
+    class ExtFullInterfaceDescription_var;
+    
+    struct TAO_IFR_Client_Export ExtFullInterfaceDescription
+    {
+      typedef ExtFullInterfaceDescription_var _var_type;
+      
+      static void _tao_any_destructor (void *);
+      TAO_String_Manager name;
+      TAO_String_Manager id;
+      TAO_String_Manager defined_in;
+      TAO_String_Manager version;
+      ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations;
+      ACE_NESTED_CLASS (CORBA, ExtAttrDescriptionSeq) attributes;
+      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) base_interfaces;
+      CORBA::TypeCode_var type;
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+    
+    class TAO_IFR_Client_Export ExtFullInterfaceDescription_var
+    {
+    public:
+      ExtFullInterfaceDescription_var (void);
+      ExtFullInterfaceDescription_var (ExtFullInterfaceDescription *);
+      ExtFullInterfaceDescription_var (const ExtFullInterfaceDescription_var &);
+      ~ExtFullInterfaceDescription_var (void);
+      
+      ExtFullInterfaceDescription_var &operator= (ExtFullInterfaceDescription *);
+      ExtFullInterfaceDescription_var &operator= (const ExtFullInterfaceDescription_var &);
+      ExtFullInterfaceDescription *operator-> (void);
+      const ExtFullInterfaceDescription *operator-> (void) const;
+      
+      operator const ExtFullInterfaceDescription &() const;
+      operator ExtFullInterfaceDescription &();
+      operator ExtFullInterfaceDescription &() const;
+      
+      // Variable-size types only.
+      operator ExtFullInterfaceDescription *&();
+      
+      // in, inout, out, _retn 
+      const ExtFullInterfaceDescription &in (void) const;
+      ExtFullInterfaceDescription &inout (void);
+      ExtFullInterfaceDescription *&out (void);
+      ExtFullInterfaceDescription *_retn (void);
+      ExtFullInterfaceDescription *ptr (void) const;
+    
+    private:
+      ExtFullInterfaceDescription *ptr_;
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+    
+    class TAO_IFR_Client_Export ExtFullInterfaceDescription_out
+    {
+    public:
+      ExtFullInterfaceDescription_out (ExtFullInterfaceDescription *&);
+      ExtFullInterfaceDescription_out (ExtFullInterfaceDescription_var &);
+      ExtFullInterfaceDescription_out (const ExtFullInterfaceDescription_out &);
+      ExtFullInterfaceDescription_out &operator= (const ExtFullInterfaceDescription_out &);
+      ExtFullInterfaceDescription_out &operator= (ExtFullInterfaceDescription *);
+      operator ExtFullInterfaceDescription *&();
+      ExtFullInterfaceDescription *&ptr (void);
+      ExtFullInterfaceDescription *operator-> (void);
+      
+    private:
+      ExtFullInterfaceDescription *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const ExtFullInterfaceDescription_var &);
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_ExtFullInterfaceDescription;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::IDLType_ptr type,
+        CORBA::AttributeMode mode,
+        const CORBA::ExceptionDefSeq & get_exceptions,
+        const CORBA::ExceptionDefSeq & set_exceptions
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  private:
+    _TAO_InterfaceAttrExtension_Proxy_Broker *the_TAO_InterfaceAttrExtension_Proxy_Broker_;
+  
+  protected:
+    InterfaceAttrExtension (int collocated = 0);
+    
+    // These methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode.
+    virtual void CORBA_InterfaceAttrExtension_setup_collocation (int collocated);
+    
+    InterfaceAttrExtension (
+        TAO_Stub *objref, 
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0
+      );
+    virtual ~InterfaceAttrExtension (void);
+    
+    friend class _TAO_InterfaceAttrExtension_Remote_Proxy_Impl;
+    friend class _TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl;
+    friend class _TAO_InterfaceAttrExtension_Direct_Proxy_Impl;
+  
+  private:
+    InterfaceAttrExtension (const InterfaceAttrExtension &);
+    void operator= (const InterfaceAttrExtension &);
+  };
+  
+  // The Proxy Implementations are used by each interface to
+  // perform a call. Each different implementation encapsulates
+  // an invocation logic.
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base Proxy Impl. Declaration
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
+  class TAO_IFR_Client_Export _TAO_InterfaceAttrExtension_Proxy_Impl
+    : public virtual TAO_Object_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_InterfaceAttrExtension_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
+    virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
+        CORBA::Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
+    virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
+        CORBA::Object *_collocated_tao_target_,
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::IDLType_ptr type,
+        CORBA::AttributeMode mode,
+        const CORBA::ExceptionDefSeq & get_exceptions,
+        const CORBA::ExceptionDefSeq & set_exceptions
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+  
+  protected:
+    _TAO_InterfaceAttrExtension_Proxy_Impl (void);
+  };
+  
+  //
+  //               End Base Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                Remote Proxy Impl. Declaration
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
+  class TAO_IFR_Client_Export _TAO_InterfaceAttrExtension_Remote_Proxy_Impl
+    : public virtual _TAO_InterfaceAttrExtension_Proxy_Impl,
+      public virtual TAO_Remote_Object_Proxy_Impl
+  {
+  public:
+    _TAO_InterfaceAttrExtension_Remote_Proxy_Impl (void);
+    
+    virtual ~_TAO_InterfaceAttrExtension_Remote_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
+        CORBA::Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
+        CORBA::Object *_collocated_tao_target_,
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::IDLType_ptr type,
+        CORBA::AttributeMode mode,
+        const CORBA::ExceptionDefSeq & get_exceptions,
+        const CORBA::ExceptionDefSeq & set_exceptions
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
+  
+  //
+  //             End Remote Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  // The Proxy Brokers are used by each interface to get
+  // the right proxy for performing a call. In the new 
+  // collocation scheme, the proxy to be used can vary on
+  // a call by call basis.
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                 Base Proxy Broker Declaration 
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
+  class TAO_IFR_Client_Export _TAO_InterfaceAttrExtension_Proxy_Broker
+  {
+  public:
+    virtual ~_TAO_InterfaceAttrExtension_Proxy_Broker (void);
+    virtual _TAO_InterfaceAttrExtension_Proxy_Impl &select_proxy (
+        InterfaceAttrExtension *object
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+  protected:
+    _TAO_InterfaceAttrExtension_Proxy_Broker (void);
+    
+  };
+  
+  //
+  //              End Base Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
+  
+    
+  ///////////////////////////////////////////////////////////////////////
+  //                 Remote Proxy Broker Declaration 
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
+  class TAO_IFR_Client_Export _TAO_InterfaceAttrExtension_Remote_Proxy_Broker
+    : public virtual _TAO_InterfaceAttrExtension_Proxy_Broker
+  {
+  public: 
+    _TAO_InterfaceAttrExtension_Remote_Proxy_Broker (void);
+    
+    virtual ~_TAO_InterfaceAttrExtension_Remote_Proxy_Broker (void);
+    
+    virtual _TAO_InterfaceAttrExtension_Proxy_Impl &select_proxy (
+        InterfaceAttrExtension *object
+        ACE_ENV_ARG_DECL
+      );
+    
+  private:
+    _TAO_InterfaceAttrExtension_Remote_Proxy_Impl remote_proxy_impl_;
+  
+  public:
+    // This member function is used to get an handle to the unique instance
+    // of the Remote Proxy Broker that is available for a given
+    // interface.
+    static _TAO_InterfaceAttrExtension_Remote_Proxy_Broker *the_TAO_InterfaceAttrExtension_Remote_Proxy_Broker (void);
+  };
+  
+  //
+  //              End Remote Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceAttrExtension;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
+#if !defined (_CORBA_EXTINTERFACEDEF___PTR_CH_)
+#define _CORBA_EXTINTERFACEDEF___PTR_CH_
+  
+  class ExtInterfaceDef;
+  typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTINTERFACEDEF___VAR_CH_)
+#define _CORBA_EXTINTERFACEDEF___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ExtInterfaceDef_var : public TAO_Base_var
+  {
+  public:
+    ExtInterfaceDef_var (void); // default constructor
+    ExtInterfaceDef_var (ExtInterfaceDef_ptr p) : ptr_ (p) {} 
+    ExtInterfaceDef_var (const ExtInterfaceDef_var &); // copy constructor
+    ~ExtInterfaceDef_var (void); // destructor
+    
+    ExtInterfaceDef_var &operator= (ExtInterfaceDef_ptr);
+    ExtInterfaceDef_var &operator= (const ExtInterfaceDef_var &);
+    ExtInterfaceDef_ptr operator-> (void) const;
+    
+    operator const ExtInterfaceDef_ptr &() const;
+    operator ExtInterfaceDef_ptr &();
+    // in, inout, out, _retn 
+    ExtInterfaceDef_ptr in (void) const;
+    ExtInterfaceDef_ptr &inout (void);
+    ExtInterfaceDef_ptr &out (void);
+    ExtInterfaceDef_ptr _retn (void);
+    ExtInterfaceDef_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ExtInterfaceDef_ptr tao_duplicate (ExtInterfaceDef_ptr);
+    static void tao_release (ExtInterfaceDef_ptr);
+    static ExtInterfaceDef_ptr tao_nil (void);
+    static ExtInterfaceDef_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+  
+  private:
+    ExtInterfaceDef_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ExtInterfaceDef_var (const TAO_Base_var &rhs);
+    ExtInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTINTERFACEDEF___OUT_CH_)
+#define _CORBA_EXTINTERFACEDEF___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
+  class TAO_IFR_Client_Export ExtInterfaceDef_out
+  {
+  public:
+    ExtInterfaceDef_out (ExtInterfaceDef_ptr &);
+    ExtInterfaceDef_out (ExtInterfaceDef_var &);
+    ExtInterfaceDef_out (const ExtInterfaceDef_out &);
+    ExtInterfaceDef_out &operator= (const ExtInterfaceDef_out &);
+    ExtInterfaceDef_out &operator= (const ExtInterfaceDef_var &);
+    ExtInterfaceDef_out &operator= (ExtInterfaceDef_ptr);
+    operator ExtInterfaceDef_ptr &();
+    ExtInterfaceDef_ptr &ptr (void);
+    ExtInterfaceDef_ptr operator-> (void);
+  
+  private:
+    ExtInterfaceDef_ptr &ptr_;
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_EXTINTERFACEDEF_CH_)
+#define _CORBA_EXTINTERFACEDEF_CH_
+  
+  class _TAO_ExtInterfaceDef_Proxy_Impl;
+  class _TAO_ExtInterfaceDef_Remote_Proxy_Impl;
+  class _TAO_ExtInterfaceDef_Proxy_Broker;
+  class _TAO_ExtInterfaceDef_Remote_Proxy_Broker;
+  
+  class TAO_IFR_Client_Export ExtInterfaceDef
+    : public virtual CORBA::InterfaceDef,
+      public virtual CORBA::InterfaceAttrExtension
+  {
+  public:
+    typedef ExtInterfaceDef_ptr _ptr_type;
+    typedef ExtInterfaceDef_var _var_type;
+    static int _tao_class_id;
+    
+    // The static operations.
+    static ExtInterfaceDef_ptr _duplicate (ExtInterfaceDef_ptr obj);
+    
+    static ExtInterfaceDef_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ExtInterfaceDef_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ExtInterfaceDef_ptr _nil (void)
+      {
+        return (ExtInterfaceDef_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
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  private:
+    _TAO_ExtInterfaceDef_Proxy_Broker *the_TAO_ExtInterfaceDef_Proxy_Broker_;
+  
+  protected:
+    ExtInterfaceDef (int collocated = 0);
+    
+    // These methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode.
+    virtual void CORBA_ExtInterfaceDef_setup_collocation (int collocated);
+    
+    ExtInterfaceDef (
+        TAO_Stub *objref, 
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0
+      );
+    virtual ~ExtInterfaceDef (void);
+    
+    friend class _TAO_ExtInterfaceDef_Remote_Proxy_Impl;
+    friend class _TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_ExtInterfaceDef_Direct_Proxy_Impl;
+  
+  private:
+    ExtInterfaceDef (const ExtInterfaceDef &);
+    void operator= (const ExtInterfaceDef &);
+  };
+  
+  // The Proxy Implementations are used by each interface to
+  // perform a call. Each different implementation encapsulates
+  // an invocation logic.
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base Proxy Impl. Declaration
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
+  class TAO_IFR_Client_Export _TAO_ExtInterfaceDef_Proxy_Impl
+    : public virtual CORBA::_TAO_InterfaceDef_Proxy_Impl, 
+      public virtual CORBA::_TAO_InterfaceAttrExtension_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_ExtInterfaceDef_Proxy_Impl (void) {}
+  
+  protected:
+    _TAO_ExtInterfaceDef_Proxy_Impl (void);
+  };
+  
+  //
+  //               End Base Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                Remote Proxy Impl. Declaration
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
+  class TAO_IFR_Client_Export _TAO_ExtInterfaceDef_Remote_Proxy_Impl
+    : public virtual _TAO_ExtInterfaceDef_Proxy_Impl,
+      public virtual TAO_Remote_Object_Proxy_Impl,
+      public virtual CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl,
+      public virtual CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl
+  {
+  public:
+    _TAO_ExtInterfaceDef_Remote_Proxy_Impl (void);
+    
+    virtual ~_TAO_ExtInterfaceDef_Remote_Proxy_Impl (void) {}
+  };
+  
+  //
+  //             End Remote Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  // The Proxy Brokers are used by each interface to get
+  // the right proxy for performing a call. In the new 
+  // collocation scheme, the proxy to be used can vary on
+  // a call by call basis.
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                 Base Proxy Broker Declaration 
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
+  class TAO_IFR_Client_Export _TAO_ExtInterfaceDef_Proxy_Broker
+  {
+  public:
+    virtual ~_TAO_ExtInterfaceDef_Proxy_Broker (void);
+    virtual _TAO_ExtInterfaceDef_Proxy_Impl &select_proxy (
+        ExtInterfaceDef *object
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+  protected:
+    _TAO_ExtInterfaceDef_Proxy_Broker (void);
+    
+  };
+  
+  //
+  //              End Base Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
+  
+    
+  ///////////////////////////////////////////////////////////////////////
+  //                 Remote Proxy Broker Declaration 
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
+  class TAO_IFR_Client_Export _TAO_ExtInterfaceDef_Remote_Proxy_Broker
+    : public virtual _TAO_ExtInterfaceDef_Proxy_Broker
+  {
+  public: 
+    _TAO_ExtInterfaceDef_Remote_Proxy_Broker (void);
+    
+    virtual ~_TAO_ExtInterfaceDef_Remote_Proxy_Broker (void);
+    
+    virtual _TAO_ExtInterfaceDef_Proxy_Impl &select_proxy (
+        ExtInterfaceDef *object
+        ACE_ENV_ARG_DECL
+      );
+    
+  private:
+    _TAO_ExtInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
+  
+  public:
+    // This member function is used to get an handle to the unique instance
+    // of the Remote Proxy Broker that is available for a given
+    // interface.
+    static _TAO_ExtInterfaceDef_Remote_Proxy_Broker *the_TAO_ExtInterfaceDef_Remote_Proxy_Broker (void);
+  };
+  
+  //
+  //              End Remote Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+  
+  // 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_ExtInterfaceDef;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___PTR_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF___PTR_CH_
-
+  
   class AbstractInterfaceDef;
   typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
 
@@ -9334,31 +10570,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___VAR_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export AbstractInterfaceDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export AbstractInterfaceDef_var : public TAO_Base_var
   {
   public:
     AbstractInterfaceDef_var (void); // default constructor
-    AbstractInterfaceDef_var (AbstractInterfaceDef_ptr p) : ptr_ (p) {}
+    AbstractInterfaceDef_var (AbstractInterfaceDef_ptr p) : ptr_ (p) {} 
     AbstractInterfaceDef_var (const AbstractInterfaceDef_var &); // copy constructor
     ~AbstractInterfaceDef_var (void); // destructor
-
+    
     AbstractInterfaceDef_var &operator= (AbstractInterfaceDef_ptr);
     AbstractInterfaceDef_var &operator= (const AbstractInterfaceDef_var &);
     AbstractInterfaceDef_ptr operator-> (void) const;
-
+    
     operator const AbstractInterfaceDef_ptr &() const;
     operator AbstractInterfaceDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     AbstractInterfaceDef_ptr in (void) const;
     AbstractInterfaceDef_ptr &inout (void);
     AbstractInterfaceDef_ptr &out (void);
     AbstractInterfaceDef_ptr _retn (void);
     AbstractInterfaceDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static AbstractInterfaceDef_ptr tao_duplicate (AbstractInterfaceDef_ptr);
@@ -9366,25 +10602,25 @@ TAO_NAMESPACE  CORBA
     static AbstractInterfaceDef_ptr tao_nil (void);
     static AbstractInterfaceDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     AbstractInterfaceDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    AbstractInterfaceDef_var (const TAO_Base_var & rhs);
-    AbstractInterfaceDef_var & operator= (const TAO_Base_var & rhs);
+    AbstractInterfaceDef_var (const TAO_Base_var &rhs);
+    AbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___OUT_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export AbstractInterfaceDef_out
   {
   public:
@@ -9397,24 +10633,24 @@ TAO_NAMESPACE  CORBA
     operator AbstractInterfaceDef_ptr &();
     AbstractInterfaceDef_ptr &ptr (void);
     AbstractInterfaceDef_ptr operator-> (void);
-
+  
   private:
     AbstractInterfaceDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF_CH_
-
+  
   class _TAO_AbstractInterfaceDef_Proxy_Impl;
   class _TAO_AbstractInterfaceDef_Remote_Proxy_Impl;
   class _TAO_AbstractInterfaceDef_Proxy_Broker;
   class _TAO_AbstractInterfaceDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export AbstractInterfaceDef
     : public virtual CORBA::InterfaceDef
   {
@@ -9422,98 +10658,99 @@ TAO_NAMESPACE  CORBA
     typedef AbstractInterfaceDef_ptr _ptr_type;
     typedef AbstractInterfaceDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static AbstractInterfaceDef_ptr _duplicate (AbstractInterfaceDef_ptr obj);
-
+    
     static AbstractInterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static AbstractInterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static AbstractInterfaceDef_ptr _nil (void)
       {
         return (AbstractInterfaceDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_AbstractInterfaceDef_Proxy_Broker *the_TAO_AbstractInterfaceDef_Proxy_Broker_;
-
+  
   protected:
     AbstractInterfaceDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_AbstractInterfaceDef_setup_collocation (int collocated);
-
+    
     AbstractInterfaceDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~AbstractInterfaceDef (void);
-
+    
     friend class _TAO_AbstractInterfaceDef_Remote_Proxy_Impl;
     friend class _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl;
     friend class _TAO_AbstractInterfaceDef_Direct_Proxy_Impl;
-
+  
   private:
     AbstractInterfaceDef (const AbstractInterfaceDef &);
     void operator= (const AbstractInterfaceDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Proxy_Impl
     : public virtual CORBA::_TAO_InterfaceDef_Proxy_Impl
   {
   public:
     virtual ~_TAO_AbstractInterfaceDef_Proxy_Impl (void) {}
-
+  
   protected:
     _TAO_AbstractInterfaceDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Remote_Proxy_Impl
     : public virtual _TAO_AbstractInterfaceDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -9521,26 +10758,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_AbstractInterfaceDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_AbstractInterfaceDef_Remote_Proxy_Impl (void) {}
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Proxy_Broker
   {
   public:
@@ -9549,64 +10786,348 @@ TAO_NAMESPACE  CORBA
         AbstractInterfaceDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_AbstractInterfaceDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Remote_Proxy_Broker
     : public virtual _TAO_AbstractInterfaceDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_AbstractInterfaceDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_AbstractInterfaceDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_AbstractInterfaceDef_Proxy_Impl &select_proxy (
         AbstractInterfaceDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_AbstractInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_AbstractInterfaceDef_Remote_Proxy_Broker *the_TAO_AbstractInterfaceDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
+  
+  // 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_AbstractInterfaceDef;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___PTR_CH_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF___PTR_CH_
+  
+  class ExtAbstractInterfaceDef;
+  typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___VAR_CH_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ExtAbstractInterfaceDef_var : public TAO_Base_var
+  {
+  public:
+    ExtAbstractInterfaceDef_var (void); // default constructor
+    ExtAbstractInterfaceDef_var (ExtAbstractInterfaceDef_ptr p) : ptr_ (p) {} 
+    ExtAbstractInterfaceDef_var (const ExtAbstractInterfaceDef_var &); // copy constructor
+    ~ExtAbstractInterfaceDef_var (void); // destructor
+    
+    ExtAbstractInterfaceDef_var &operator= (ExtAbstractInterfaceDef_ptr);
+    ExtAbstractInterfaceDef_var &operator= (const ExtAbstractInterfaceDef_var &);
+    ExtAbstractInterfaceDef_ptr operator-> (void) const;
+    
+    operator const ExtAbstractInterfaceDef_ptr &() const;
+    operator ExtAbstractInterfaceDef_ptr &();
+    // in, inout, out, _retn 
+    ExtAbstractInterfaceDef_ptr in (void) const;
+    ExtAbstractInterfaceDef_ptr &inout (void);
+    ExtAbstractInterfaceDef_ptr &out (void);
+    ExtAbstractInterfaceDef_ptr _retn (void);
+    ExtAbstractInterfaceDef_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ExtAbstractInterfaceDef_ptr tao_duplicate (ExtAbstractInterfaceDef_ptr);
+    static void tao_release (ExtAbstractInterfaceDef_ptr);
+    static ExtAbstractInterfaceDef_ptr tao_nil (void);
+    static ExtAbstractInterfaceDef_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+  
+  private:
+    ExtAbstractInterfaceDef_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ExtAbstractInterfaceDef_var (const TAO_Base_var &rhs);
+    ExtAbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___OUT_CH_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
+  class TAO_IFR_Client_Export ExtAbstractInterfaceDef_out
+  {
+  public:
+    ExtAbstractInterfaceDef_out (ExtAbstractInterfaceDef_ptr &);
+    ExtAbstractInterfaceDef_out (ExtAbstractInterfaceDef_var &);
+    ExtAbstractInterfaceDef_out (const ExtAbstractInterfaceDef_out &);
+    ExtAbstractInterfaceDef_out &operator= (const ExtAbstractInterfaceDef_out &);
+    ExtAbstractInterfaceDef_out &operator= (const ExtAbstractInterfaceDef_var &);
+    ExtAbstractInterfaceDef_out &operator= (ExtAbstractInterfaceDef_ptr);
+    operator ExtAbstractInterfaceDef_ptr &();
+    ExtAbstractInterfaceDef_ptr &ptr (void);
+    ExtAbstractInterfaceDef_ptr operator-> (void);
+  
+  private:
+    ExtAbstractInterfaceDef_ptr &ptr_;
+  };
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AbstractInterfaceDef;
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF_CH_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF_CH_
+  
+  class _TAO_ExtAbstractInterfaceDef_Proxy_Impl;
+  class _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl;
+  class _TAO_ExtAbstractInterfaceDef_Proxy_Broker;
+  class _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker;
+  
+  class TAO_IFR_Client_Export ExtAbstractInterfaceDef
+    : public virtual CORBA::AbstractInterfaceDef,
+      public virtual CORBA::InterfaceAttrExtension
+  {
+  public:
+    typedef ExtAbstractInterfaceDef_ptr _ptr_type;
+    typedef ExtAbstractInterfaceDef_var _var_type;
+    static int _tao_class_id;
+    
+    // The static operations.
+    static ExtAbstractInterfaceDef_ptr _duplicate (ExtAbstractInterfaceDef_ptr obj);
+    
+    static ExtAbstractInterfaceDef_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ExtAbstractInterfaceDef_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ExtAbstractInterfaceDef_ptr _nil (void)
+      {
+        return (ExtAbstractInterfaceDef_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
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  private:
+    _TAO_ExtAbstractInterfaceDef_Proxy_Broker *the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_;
+  
+  protected:
+    ExtAbstractInterfaceDef (int collocated = 0);
+    
+    // These methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode.
+    virtual void CORBA_ExtAbstractInterfaceDef_setup_collocation (int collocated);
+    
+    ExtAbstractInterfaceDef (
+        TAO_Stub *objref, 
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0
+      );
+    virtual ~ExtAbstractInterfaceDef (void);
+    
+    friend class _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl;
+    friend class _TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_ExtAbstractInterfaceDef_Direct_Proxy_Impl;
+  
+  private:
+    ExtAbstractInterfaceDef (const ExtAbstractInterfaceDef &);
+    void operator= (const ExtAbstractInterfaceDef &);
+  };
+  
+  // The Proxy Implementations are used by each interface to
+  // perform a call. Each different implementation encapsulates
+  // an invocation logic.
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base Proxy Impl. Declaration
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
+  class TAO_IFR_Client_Export _TAO_ExtAbstractInterfaceDef_Proxy_Impl
+    : public virtual CORBA::_TAO_AbstractInterfaceDef_Proxy_Impl, 
+      public virtual CORBA::_TAO_InterfaceAttrExtension_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_ExtAbstractInterfaceDef_Proxy_Impl (void) {}
+  
+  protected:
+    _TAO_ExtAbstractInterfaceDef_Proxy_Impl (void);
+  };
+  
+  //
+  //               End Base Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                Remote Proxy Impl. Declaration
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
+  class TAO_IFR_Client_Export _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl
+    : public virtual _TAO_ExtAbstractInterfaceDef_Proxy_Impl,
+      public virtual TAO_Remote_Object_Proxy_Impl,
+      public virtual CORBA::_TAO_AbstractInterfaceDef_Remote_Proxy_Impl,
+      public virtual CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl
+  {
+  public:
+    _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl (void);
+    
+    virtual ~_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl (void) {}
+  };
+  
+  //
+  //             End Remote Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  // The Proxy Brokers are used by each interface to get
+  // the right proxy for performing a call. In the new 
+  // collocation scheme, the proxy to be used can vary on
+  // a call by call basis.
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                 Base Proxy Broker Declaration 
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
+  class TAO_IFR_Client_Export _TAO_ExtAbstractInterfaceDef_Proxy_Broker
+  {
+  public:
+    virtual ~_TAO_ExtAbstractInterfaceDef_Proxy_Broker (void);
+    virtual _TAO_ExtAbstractInterfaceDef_Proxy_Impl &select_proxy (
+        ExtAbstractInterfaceDef *object
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+  protected:
+    _TAO_ExtAbstractInterfaceDef_Proxy_Broker (void);
+    
+  };
+  
+  //
+  //              End Base Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
+  
+    
+  ///////////////////////////////////////////////////////////////////////
+  //                 Remote Proxy Broker Declaration 
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
+  class TAO_IFR_Client_Export _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker
+    : public virtual _TAO_ExtAbstractInterfaceDef_Proxy_Broker
+  {
+  public: 
+    _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker (void);
+    
+    virtual ~_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker (void);
+    
+    virtual _TAO_ExtAbstractInterfaceDef_Proxy_Impl &select_proxy (
+        ExtAbstractInterfaceDef *object
+        ACE_ENV_ARG_DECL
+      );
+    
+  private:
+    _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
+  
+  public:
+    // This member function is used to get an handle to the unique instance
+    // of the Remote Proxy Broker that is available for a given
+    // interface.
+    static _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker *the_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker (void);
+  };
+  
+  //
+  //              End Remote Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
 
+#endif /* end #if !defined */
+  
+  // 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_ExtAbstractInterfaceDef;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
 #define _CORBA_LOCALINTERFACEDEF___PTR_CH_
-
+  
   class LocalInterfaceDef;
   typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
 
@@ -9614,31 +11135,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_LOCALINTERFACEDEF___VAR_CH_)
 #define _CORBA_LOCALINTERFACEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export LocalInterfaceDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export LocalInterfaceDef_var : public TAO_Base_var
   {
   public:
     LocalInterfaceDef_var (void); // default constructor
-    LocalInterfaceDef_var (LocalInterfaceDef_ptr p) : ptr_ (p) {}
+    LocalInterfaceDef_var (LocalInterfaceDef_ptr p) : ptr_ (p) {} 
     LocalInterfaceDef_var (const LocalInterfaceDef_var &); // copy constructor
     ~LocalInterfaceDef_var (void); // destructor
-
+    
     LocalInterfaceDef_var &operator= (LocalInterfaceDef_ptr);
     LocalInterfaceDef_var &operator= (const LocalInterfaceDef_var &);
     LocalInterfaceDef_ptr operator-> (void) const;
-
+    
     operator const LocalInterfaceDef_ptr &() const;
     operator LocalInterfaceDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     LocalInterfaceDef_ptr in (void) const;
     LocalInterfaceDef_ptr &inout (void);
     LocalInterfaceDef_ptr &out (void);
     LocalInterfaceDef_ptr _retn (void);
     LocalInterfaceDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static LocalInterfaceDef_ptr tao_duplicate (LocalInterfaceDef_ptr);
@@ -9646,25 +11167,25 @@ TAO_NAMESPACE  CORBA
     static LocalInterfaceDef_ptr tao_nil (void);
     static LocalInterfaceDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     LocalInterfaceDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    LocalInterfaceDef_var (const TAO_Base_var & rhs);
-    LocalInterfaceDef_var & operator= (const TAO_Base_var & rhs);
+    LocalInterfaceDef_var (const TAO_Base_var &rhs);
+    LocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_LOCALINTERFACEDEF___OUT_CH_)
 #define _CORBA_LOCALINTERFACEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export LocalInterfaceDef_out
   {
   public:
@@ -9677,24 +11198,24 @@ TAO_NAMESPACE  CORBA
     operator LocalInterfaceDef_ptr &();
     LocalInterfaceDef_ptr &ptr (void);
     LocalInterfaceDef_ptr operator-> (void);
-
+  
   private:
     LocalInterfaceDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_LOCALINTERFACEDEF_CH_)
 #define _CORBA_LOCALINTERFACEDEF_CH_
-
+  
   class _TAO_LocalInterfaceDef_Proxy_Impl;
   class _TAO_LocalInterfaceDef_Remote_Proxy_Impl;
   class _TAO_LocalInterfaceDef_Proxy_Broker;
   class _TAO_LocalInterfaceDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export LocalInterfaceDef
     : public virtual CORBA::InterfaceDef
   {
@@ -9702,98 +11223,99 @@ TAO_NAMESPACE  CORBA
     typedef LocalInterfaceDef_ptr _ptr_type;
     typedef LocalInterfaceDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static LocalInterfaceDef_ptr _duplicate (LocalInterfaceDef_ptr obj);
-
+    
     static LocalInterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static LocalInterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static LocalInterfaceDef_ptr _nil (void)
       {
         return (LocalInterfaceDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_LocalInterfaceDef_Proxy_Broker *the_TAO_LocalInterfaceDef_Proxy_Broker_;
-
+  
   protected:
     LocalInterfaceDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_LocalInterfaceDef_setup_collocation (int collocated);
-
+    
     LocalInterfaceDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~LocalInterfaceDef (void);
-
+    
     friend class _TAO_LocalInterfaceDef_Remote_Proxy_Impl;
     friend class _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl;
     friend class _TAO_LocalInterfaceDef_Direct_Proxy_Impl;
-
+  
   private:
     LocalInterfaceDef (const LocalInterfaceDef &);
     void operator= (const LocalInterfaceDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Proxy_Impl
     : public virtual CORBA::_TAO_InterfaceDef_Proxy_Impl
   {
   public:
     virtual ~_TAO_LocalInterfaceDef_Proxy_Impl (void) {}
-
+  
   protected:
     _TAO_LocalInterfaceDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Remote_Proxy_Impl
     : public virtual _TAO_LocalInterfaceDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -9801,26 +11323,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_LocalInterfaceDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_LocalInterfaceDef_Remote_Proxy_Impl (void) {}
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Proxy_Broker
   {
   public:
@@ -9829,60 +11351,344 @@ TAO_NAMESPACE  CORBA
         LocalInterfaceDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_LocalInterfaceDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Remote_Proxy_Broker
     : public virtual _TAO_LocalInterfaceDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_LocalInterfaceDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_LocalInterfaceDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_LocalInterfaceDef_Proxy_Impl &select_proxy (
         LocalInterfaceDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_LocalInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_LocalInterfaceDef_Remote_Proxy_Broker *the_TAO_LocalInterfaceDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
+  
+  // 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_LocalInterfaceDef;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF___PTR_CH_)
+#define _CORBA_EXTLOCALINTERFACEDEF___PTR_CH_
+  
+  class ExtLocalInterfaceDef;
+  typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF___VAR_CH_)
+#define _CORBA_EXTLOCALINTERFACEDEF___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ExtLocalInterfaceDef_var : public TAO_Base_var
+  {
+  public:
+    ExtLocalInterfaceDef_var (void); // default constructor
+    ExtLocalInterfaceDef_var (ExtLocalInterfaceDef_ptr p) : ptr_ (p) {} 
+    ExtLocalInterfaceDef_var (const ExtLocalInterfaceDef_var &); // copy constructor
+    ~ExtLocalInterfaceDef_var (void); // destructor
+    
+    ExtLocalInterfaceDef_var &operator= (ExtLocalInterfaceDef_ptr);
+    ExtLocalInterfaceDef_var &operator= (const ExtLocalInterfaceDef_var &);
+    ExtLocalInterfaceDef_ptr operator-> (void) const;
+    
+    operator const ExtLocalInterfaceDef_ptr &() const;
+    operator ExtLocalInterfaceDef_ptr &();
+    // in, inout, out, _retn 
+    ExtLocalInterfaceDef_ptr in (void) const;
+    ExtLocalInterfaceDef_ptr &inout (void);
+    ExtLocalInterfaceDef_ptr &out (void);
+    ExtLocalInterfaceDef_ptr _retn (void);
+    ExtLocalInterfaceDef_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ExtLocalInterfaceDef_ptr tao_duplicate (ExtLocalInterfaceDef_ptr);
+    static void tao_release (ExtLocalInterfaceDef_ptr);
+    static ExtLocalInterfaceDef_ptr tao_nil (void);
+    static ExtLocalInterfaceDef_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+  
+  private:
+    ExtLocalInterfaceDef_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ExtLocalInterfaceDef_var (const TAO_Base_var &rhs);
+    ExtLocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+  };
+
+#endif /* end #if !defined */
 
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF___OUT_CH_)
+#define _CORBA_EXTLOCALINTERFACEDEF___OUT_CH_
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
+  class TAO_IFR_Client_Export ExtLocalInterfaceDef_out
+  {
+  public:
+    ExtLocalInterfaceDef_out (ExtLocalInterfaceDef_ptr &);
+    ExtLocalInterfaceDef_out (ExtLocalInterfaceDef_var &);
+    ExtLocalInterfaceDef_out (const ExtLocalInterfaceDef_out &);
+    ExtLocalInterfaceDef_out &operator= (const ExtLocalInterfaceDef_out &);
+    ExtLocalInterfaceDef_out &operator= (const ExtLocalInterfaceDef_var &);
+    ExtLocalInterfaceDef_out &operator= (ExtLocalInterfaceDef_ptr);
+    operator ExtLocalInterfaceDef_ptr &();
+    ExtLocalInterfaceDef_ptr &ptr (void);
+    ExtLocalInterfaceDef_ptr operator-> (void);
+  
+  private:
+    ExtLocalInterfaceDef_ptr &ptr_;
+  };
 
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LocalInterfaceDef;
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF_CH_)
+#define _CORBA_EXTLOCALINTERFACEDEF_CH_
+  
+  class _TAO_ExtLocalInterfaceDef_Proxy_Impl;
+  class _TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl;
+  class _TAO_ExtLocalInterfaceDef_Proxy_Broker;
+  class _TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker;
+  
+  class TAO_IFR_Client_Export ExtLocalInterfaceDef
+    : public virtual CORBA::LocalInterfaceDef,
+      public virtual CORBA::InterfaceAttrExtension
+  {
+  public:
+    typedef ExtLocalInterfaceDef_ptr _ptr_type;
+    typedef ExtLocalInterfaceDef_var _var_type;
+    static int _tao_class_id;
+    
+    // The static operations.
+    static ExtLocalInterfaceDef_ptr _duplicate (ExtLocalInterfaceDef_ptr obj);
+    
+    static ExtLocalInterfaceDef_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ExtLocalInterfaceDef_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ExtLocalInterfaceDef_ptr _nil (void)
+      {
+        return (ExtLocalInterfaceDef_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
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  private:
+    _TAO_ExtLocalInterfaceDef_Proxy_Broker *the_TAO_ExtLocalInterfaceDef_Proxy_Broker_;
+  
+  protected:
+    ExtLocalInterfaceDef (int collocated = 0);
+    
+    // These methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode.
+    virtual void CORBA_ExtLocalInterfaceDef_setup_collocation (int collocated);
+    
+    ExtLocalInterfaceDef (
+        TAO_Stub *objref, 
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0
+      );
+    virtual ~ExtLocalInterfaceDef (void);
+    
+    friend class _TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl;
+    friend class _TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_ExtLocalInterfaceDef_Direct_Proxy_Impl;
+  
+  private:
+    ExtLocalInterfaceDef (const ExtLocalInterfaceDef &);
+    void operator= (const ExtLocalInterfaceDef &);
+  };
+  
+  // The Proxy Implementations are used by each interface to
+  // perform a call. Each different implementation encapsulates
+  // an invocation logic.
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base Proxy Impl. Declaration
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
+  class TAO_IFR_Client_Export _TAO_ExtLocalInterfaceDef_Proxy_Impl
+    : public virtual CORBA::_TAO_LocalInterfaceDef_Proxy_Impl, 
+      public virtual CORBA::_TAO_InterfaceAttrExtension_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_ExtLocalInterfaceDef_Proxy_Impl (void) {}
+  
+  protected:
+    _TAO_ExtLocalInterfaceDef_Proxy_Impl (void);
+  };
+  
+  //
+  //               End Base Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                Remote Proxy Impl. Declaration
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
+  class TAO_IFR_Client_Export _TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl
+    : public virtual _TAO_ExtLocalInterfaceDef_Proxy_Impl,
+      public virtual TAO_Remote_Object_Proxy_Impl,
+      public virtual CORBA::_TAO_LocalInterfaceDef_Remote_Proxy_Impl,
+      public virtual CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl
+  {
+  public:
+    _TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl (void);
+    
+    virtual ~_TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl (void) {}
+  };
+  
+  //
+  //             End Remote Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  // The Proxy Brokers are used by each interface to get
+  // the right proxy for performing a call. In the new 
+  // collocation scheme, the proxy to be used can vary on
+  // a call by call basis.
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                 Base Proxy Broker Declaration 
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
+  class TAO_IFR_Client_Export _TAO_ExtLocalInterfaceDef_Proxy_Broker
+  {
+  public:
+    virtual ~_TAO_ExtLocalInterfaceDef_Proxy_Broker (void);
+    virtual _TAO_ExtLocalInterfaceDef_Proxy_Impl &select_proxy (
+        ExtLocalInterfaceDef *object
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+  protected:
+    _TAO_ExtLocalInterfaceDef_Proxy_Broker (void);
+    
+  };
+  
+  //
+  //              End Base Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
+  
+    
+  ///////////////////////////////////////////////////////////////////////
+  //                 Remote Proxy Broker Declaration 
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
+  class TAO_IFR_Client_Export _TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker
+    : public virtual _TAO_ExtLocalInterfaceDef_Proxy_Broker
+  {
+  public: 
+    _TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker (void);
+    
+    virtual ~_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker (void);
+    
+    virtual _TAO_ExtLocalInterfaceDef_Proxy_Impl &select_proxy (
+        ExtLocalInterfaceDef *object
+        ACE_ENV_ARG_DECL
+      );
+    
+  private:
+    _TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
+  
+  public:
+    // This member function is used to get an handle to the unique instance
+    // of the Remote Proxy Broker that is available for a given
+    // interface.
+    static _TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker *the_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker (void);
+  };
+  
+  //
+  //              End Remote Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+  
+  // 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_ExtLocalInterfaceDef;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module CORBA
@@ -9890,7 +11696,7 @@ TAO_NAMESPACE_CLOSE // module CORBA
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80
 
 extern TAO_IFR_Client_Export
 CORBA::_TAO_Repository_Proxy_Broker *
@@ -9983,6 +11789,12 @@ CORBA::_TAO_AttributeDef_Proxy_Broker *
   );
 
 extern TAO_IFR_Client_Export
+CORBA::_TAO_ExtAttributeDef_Proxy_Broker *
+(*CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
+
+extern TAO_IFR_Client_Export
 CORBA::_TAO_OperationDef_Proxy_Broker *
 (*CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
@@ -9995,78 +11807,114 @@ CORBA::_TAO_InterfaceDef_Proxy_Broker *
   );
 
 extern TAO_IFR_Client_Export
+CORBA::_TAO_InterfaceAttrExtension_Proxy_Broker *
+(*CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
+
+extern TAO_IFR_Client_Export
+CORBA::_TAO_ExtInterfaceDef_Proxy_Broker *
+(*CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
+
+extern TAO_IFR_Client_Export
 CORBA::_TAO_AbstractInterfaceDef_Proxy_Broker *
 (*CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_IFR_Client_Export
+CORBA::_TAO_ExtAbstractInterfaceDef_Proxy_Broker *
+(*CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
+
+extern TAO_IFR_Client_Export
 CORBA::_TAO_LocalInterfaceDef_Proxy_Broker *
 (*CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
+extern TAO_IFR_Client_Export
+CORBA::_TAO_ExtLocalInterfaceDef_Proxy_Broker *
+(*CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
+
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:103
 
 // External declarations for undefined interface
+
 // CORBA::FixedDef
 TAO_IFR_Client_Export
 CORBA::FixedDef_ptr
 tao_CORBA_FixedDef_duplicate (
     CORBA::FixedDef_ptr
   );
+
 TAO_IFR_Client_Export
 void
 tao_CORBA_FixedDef_release (
     CORBA::FixedDef_ptr
   );
+
 TAO_IFR_Client_Export
 CORBA::FixedDef_ptr
 tao_CORBA_FixedDef_nil (
     void
   );
+
 TAO_IFR_Client_Export
 CORBA::FixedDef_ptr
 tao_CORBA_FixedDef_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_FixedDef_upcast (
     void *
   );
 
+TAO_IFR_Client_Export
+CORBA::Boolean
+tao_CORBA_FixedDef_marshal (
+    CORBA::FixedDef_ptr,
+    TAO_OutputCDR &
+  );
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::FixedDef *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_ch.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveKind);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PrimitiveKind &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Repository_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ModuleDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ModuleDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDescription*); // noncopying version
@@ -10074,14 +11922,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Mod
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ModuleDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstantDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ConstantDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDescription*); // noncopying version
@@ -10089,92 +11937,84 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Con
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ConstantDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StructDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UnionDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::EnumDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AliasDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::NativeDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PrimitiveDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StringDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StringDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::WstringDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::WstringDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WstringDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::SequenceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::SequenceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SequenceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ArrayDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ArrayDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ArrayDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExceptionDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExceptionDescription *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExceptionDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDefSeq*); // noncopying version
@@ -10182,28 +12022,20 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Exc
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExceptionDefSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExcDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExcDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExcDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExcDescriptionSeq *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_ch.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeMode);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeMode &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::AttributeDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeDescription*); // noncopying version
@@ -10211,16 +12043,28 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Att
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AttributeDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_ch.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationMode);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationMode &);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtAttributeDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAttributeDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAttributeDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtAttributeDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_ch.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAttributeDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAttributeDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAttributeDef_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationMode);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationMode &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ParameterDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ParameterDescription*); // noncopying version
@@ -10228,7 +12072,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Par
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ParameterDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ParDescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ParDescriptionSeq*); // noncopying version
@@ -10236,7 +12080,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Par
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ParDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ContextIdSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ContextIdSeq*); // noncopying version
@@ -10244,14 +12088,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Con
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ContextIdSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::OperationDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationDescription*); // noncopying version
@@ -10259,7 +12103,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ope
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OperationDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::RepositoryIdSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::RepositoryIdSeq*); // noncopying version
@@ -10267,7 +12111,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Rep
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::RepositoryIdSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::OpDescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OpDescriptionSeq*); // noncopying version
@@ -10275,7 +12119,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OpD
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OpDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::AttrDescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttrDescriptionSeq*); // noncopying version
@@ -10283,14 +12127,22 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Att
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AttrDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtAttrDescriptionSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAttrDescriptionSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAttrDescriptionSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtAttrDescriptionSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceDef::FullInterfaceDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef::FullInterfaceDescription*); // noncopying version
@@ -10298,7 +12150,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Int
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceDef::FullInterfaceDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDescription*); // noncopying version
@@ -10306,141 +12158,171 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Int
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceAttrExtension_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceAttrExtension_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceAttrExtension_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInterfaceDef_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AbstractInterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LocalInterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::FixedDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::FixedDef_ptr &);
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ch.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PrimitiveKind &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PrimitiveKind &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Repository_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Repository_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ModuleDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ModuleDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ModuleDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ModuleDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ConstantDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstantDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ConstantDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstantDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::StructDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::StructDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::UnionDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::UnionDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::EnumDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::EnumDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AliasDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AliasDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::NativeDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::NativeDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PrimitiveDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PrimitiveDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::StringDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::StringDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WstringDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WstringDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SequenceDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SequenceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ArrayDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ArrayDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExceptionDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExceptionDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExceptionDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExceptionDescription &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_
 #define _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_
@@ -10457,60 +12339,49 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
-
-#if !defined _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExcDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ExcDescriptionSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ch.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AttributeMode &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeMode &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AttributeDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AttributeDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ch.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationMode &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationMode &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtAttributeDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtAttributeDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ch.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ParameterMode &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtAttributeDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtAttributeDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationMode &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationMode &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ParameterDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_
 #define _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_
@@ -10527,7 +12398,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_ContextIdSeq_H_
 #define _TAO_CDR_OP_CORBA_ContextIdSeq_H_
@@ -10544,19 +12415,19 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ContextIdSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_
 #define _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_
@@ -10573,7 +12444,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_OpDescriptionSeq_H_
 #define _TAO_CDR_OP_CORBA_OpDescriptionSeq_H_
@@ -10590,7 +12461,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_OpDescriptionSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_AttrDescriptionSeq_H_
 #define _TAO_CDR_OP_CORBA_AttrDescriptionSeq_H_
@@ -10607,42 +12478,89 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_AttrDescriptionSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_H_
+#define _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_H_
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtAttrDescriptionSeq &
+  );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtAttrDescriptionSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceDef::FullInterfaceDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceDef::FullInterfaceDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceAttrExtension_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceAttrExtension_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtInterfaceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtInterfaceDef_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AbstractInterfaceDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AbstractInterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtAbstractInterfaceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtAbstractInterfaceDef_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::LocalInterfaceDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::LocalInterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtLocalInterfaceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocalInterfaceDef_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1016
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "IFR_BasicC.i"
@@ -10658,3 +12576,5 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::LocalInt
 
 #include "ace/post.h"
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.i b/TAO/tao/IFR_Client/IFR_BasicC.i
index 0e6b990ab91..9c8cc41e5a9 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.i
+++ b/TAO/tao/IFR_Client/IFR_BasicC.i
@@ -21,7 +21,7 @@
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_REPOSITORY___CI_)
 #define _CORBA_REPOSITORY___CI_
@@ -37,10 +37,17 @@ CORBA::Repository::Repository (
   this->CORBA_Repository_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::Repository::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_MODULEDEF___CI_)
 #define _CORBA_MODULEDEF___CI_
@@ -56,10 +63,17 @@ CORBA::ModuleDef::ModuleDef (
   this->CORBA_ModuleDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::ModuleDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::ModuleDescription_var
@@ -122,7 +136,7 @@ CORBA::ModuleDescription_var::operator= (const ::CORBA::ModuleDescription_var &_
               ModuleDescription (*_tao_struct_var.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               ModuleDescription *tmp = deep_copy;
@@ -132,7 +146,7 @@ CORBA::ModuleDescription_var::operator= (const ::CORBA::ModuleDescription_var &_
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -155,20 +169,20 @@ CORBA::ModuleDescription_var::operator const ::CORBA::ModuleDescription &() cons
 }
 
 ACE_INLINE
-CORBA::ModuleDescription_var::operator ::CORBA::ModuleDescription &() // cast
+CORBA::ModuleDescription_var::operator ::CORBA::ModuleDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ModuleDescription_var::operator ::CORBA::ModuleDescription &() const // cast
+CORBA::ModuleDescription_var::operator ::CORBA::ModuleDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::ModuleDescription_var::operator ::CORBA::ModuleDescription *&() // cast
+CORBA::ModuleDescription_var::operator ::CORBA::ModuleDescription *&() // cast 
 {
   return this->ptr_;
 }
@@ -209,7 +223,7 @@ CORBA::ModuleDescription_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::ModuleDescription_out
@@ -251,7 +265,7 @@ CORBA::ModuleDescription_out::operator= (ModuleDescription *_tao_struct_out)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 CORBA::ModuleDescription_out::operator ::CORBA::ModuleDescription *&() // cast
 {
   return this->ptr_;
@@ -270,7 +284,7 @@ CORBA::ModuleDescription_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_CONSTANTDEF___CI_)
 #define _CORBA_CONSTANTDEF___CI_
@@ -286,10 +300,17 @@ CORBA::ConstantDef::ConstantDef (
   this->CORBA_ConstantDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::ConstantDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::ConstantDescription_var
@@ -352,7 +373,7 @@ CORBA::ConstantDescription_var::operator= (const ::CORBA::ConstantDescription_va
               ConstantDescription (*_tao_struct_var.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               ConstantDescription *tmp = deep_copy;
@@ -362,7 +383,7 @@ CORBA::ConstantDescription_var::operator= (const ::CORBA::ConstantDescription_va
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -385,20 +406,20 @@ CORBA::ConstantDescription_var::operator const ::CORBA::ConstantDescription &()
 }
 
 ACE_INLINE
-CORBA::ConstantDescription_var::operator ::CORBA::ConstantDescription &() // cast
+CORBA::ConstantDescription_var::operator ::CORBA::ConstantDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ConstantDescription_var::operator ::CORBA::ConstantDescription &() const // cast
+CORBA::ConstantDescription_var::operator ::CORBA::ConstantDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::ConstantDescription_var::operator ::CORBA::ConstantDescription *&() // cast
+CORBA::ConstantDescription_var::operator ::CORBA::ConstantDescription *&() // cast 
 {
   return this->ptr_;
 }
@@ -439,7 +460,7 @@ CORBA::ConstantDescription_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::ConstantDescription_out
@@ -481,7 +502,7 @@ CORBA::ConstantDescription_out::operator= (ConstantDescription *_tao_struct_out)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 CORBA::ConstantDescription_out::operator ::CORBA::ConstantDescription *&() // cast
 {
   return this->ptr_;
@@ -500,7 +521,7 @@ CORBA::ConstantDescription_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_STRUCTDEF___CI_)
 #define _CORBA_STRUCTDEF___CI_
@@ -516,10 +537,17 @@ CORBA::StructDef::StructDef (
   this->CORBA_StructDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::StructDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_UNIONDEF___CI_)
 #define _CORBA_UNIONDEF___CI_
@@ -535,10 +563,17 @@ CORBA::UnionDef::UnionDef (
   this->CORBA_UnionDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::UnionDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_ENUMDEF___CI_)
 #define _CORBA_ENUMDEF___CI_
@@ -554,10 +589,17 @@ CORBA::EnumDef::EnumDef (
   this->CORBA_EnumDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::EnumDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_ALIASDEF___CI_)
 #define _CORBA_ALIASDEF___CI_
@@ -573,10 +615,17 @@ CORBA::AliasDef::AliasDef (
   this->CORBA_AliasDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::AliasDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_NATIVEDEF___CI_)
 #define _CORBA_NATIVEDEF___CI_
@@ -592,10 +641,17 @@ CORBA::NativeDef::NativeDef (
   this->CORBA_NativeDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::NativeDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_PRIMITIVEDEF___CI_)
 #define _CORBA_PRIMITIVEDEF___CI_
@@ -611,10 +667,17 @@ CORBA::PrimitiveDef::PrimitiveDef (
   this->CORBA_PrimitiveDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::PrimitiveDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_STRINGDEF___CI_)
 #define _CORBA_STRINGDEF___CI_
@@ -630,10 +693,17 @@ CORBA::StringDef::StringDef (
   this->CORBA_StringDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::StringDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_WSTRINGDEF___CI_)
 #define _CORBA_WSTRINGDEF___CI_
@@ -649,10 +719,17 @@ CORBA::WstringDef::WstringDef (
   this->CORBA_WstringDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::WstringDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_SEQUENCEDEF___CI_)
 #define _CORBA_SEQUENCEDEF___CI_
@@ -668,10 +745,17 @@ CORBA::SequenceDef::SequenceDef (
   this->CORBA_SequenceDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::SequenceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_ARRAYDEF___CI_)
 #define _CORBA_ARRAYDEF___CI_
@@ -687,10 +771,17 @@ CORBA::ArrayDef::ArrayDef (
   this->CORBA_ArrayDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::ArrayDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_EXCEPTIONDEF___CI_)
 #define _CORBA_EXCEPTIONDEF___CI_
@@ -706,221 +797,17 @@ CORBA::ExceptionDef::ExceptionDef (
   this->CORBA_ExceptionDef_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ExceptionDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::ExceptionDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::ExceptionDescription_var (ExceptionDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::ExceptionDescription_var (const ::CORBA::ExceptionDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExceptionDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::~ExceptionDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var &
-CORBA::ExceptionDescription_var::operator= (ExceptionDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExceptionDescription_var &
-CORBA::ExceptionDescription_var::operator= (const ::CORBA::ExceptionDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExceptionDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExceptionDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-
-          if (deep_copy != 0)
-            {
-              ExceptionDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::operator const ::CORBA::ExceptionDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::operator ::CORBA::ExceptionDescription &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::operator ::CORBA::ExceptionDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExceptionDescription_var::operator ::CORBA::ExceptionDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ExceptionDescription &
-CORBA::ExceptionDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExceptionDescription &
-CORBA::ExceptionDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ExceptionDescription *&
-CORBA::ExceptionDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_var::_retn (void)
-{
-  ::CORBA::ExceptionDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ExceptionDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExceptionDescription_out::ExceptionDescription_out (::CORBA::ExceptionDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
 ACE_INLINE
-CORBA::ExceptionDescription_out::ExceptionDescription_out (ExceptionDescription_var &p)
-  : ptr_ (p.out ())
+CORBA::Boolean
+CORBA::ExceptionDef::marshal (TAO_OutputCDR &cdr)
 {
-  delete this->ptr_;
-  this->ptr_ = 0;
+  return (cdr << this);
 }
 
-ACE_INLINE
-CORBA::ExceptionDescription_out::ExceptionDescription_out (const ::CORBA::ExceptionDescription_out &p)
-  : ptr_ (ACE_const_cast (ExceptionDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDescription_out &
-CORBA::ExceptionDescription_out::operator= (const ::CORBA::ExceptionDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExceptionDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_out &
-CORBA::ExceptionDescription_out::operator= (ExceptionDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_out::operator ::CORBA::ExceptionDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExceptionDescription *&
-CORBA::ExceptionDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -932,26 +819,26 @@ CORBA::ExceptionDef **
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
 {
   CORBA::ExceptionDef **buf = 0;
-
+  
   ACE_NEW_RETURN (buf, CORBA::ExceptionDef*[nelems], 0);
-
+  
   for (CORBA::ULong i = 0; i < nelems; i++)
     {
       buf[i] = CORBA::ExceptionDef::_nil ();
     }
-
+  
   return buf;
 }
 
 ACE_INLINE
-void
+void 
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (CORBA::ExceptionDef **buffer)
 {
   if (buffer == 0)
     {
       return;
     }
-
+  
   delete[] buffer;
 }
 
@@ -989,12 +876,12 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_TAO_Unbounded_Obje
         _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (this->maximum_);
       CORBA::ExceptionDef ** const tmp2 =
         ACE_reinterpret_cast (CORBA::ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-
+      
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
           tmp1[i] = CORBA::ExceptionDef::_duplicate (tmp2[i]);
         }
-
+      
       this->buffer_ = tmp1;
     }
   else
@@ -1013,18 +900,18 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::operator= (
     {
       return *this;
     }
-
+  
   if (this->release_)
     {
       CORBA::ExceptionDef **tmp =
         ACE_reinterpret_cast (CORBA::ExceptionDef **, this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
           CORBA::release (tmp[i]);
           tmp[i] = CORBA::ExceptionDef::_nil ();
         }
-
+      
       if (this->maximum_ < rhs.maximum_)
         {
           _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (tmp);
@@ -1036,20 +923,20 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::operator= (
       this->buffer_ =
         _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (rhs.maximum_);
     }
-
+  
   TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+  
   CORBA::ExceptionDef **tmp1 =
     ACE_reinterpret_cast (CORBA::ExceptionDef **, this->buffer_);
-
+  
   CORBA::ExceptionDef ** const tmp2 =
     ACE_reinterpret_cast (CORBA::ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-
+  
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
       tmp1[i] = CORBA::ExceptionDef::_duplicate (tmp2[i]);
     }
-
+  
   return *this;
 }
 
@@ -1068,7 +955,7 @@ CORBA::ExceptionDef* *
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::ExceptionDef **result = 0;
-
+  
   if (orphan == 0)
     {
       // We retain ownership.
@@ -1098,7 +985,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::get_buffer (CORBA::
           this->release_ = 0;
         }
     }
-
+  
   return result;
 }
 
@@ -1111,13 +998,13 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::get_buffer (void) c
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ_CI_)
 #define _CORBA_EXCEPTIONDEFSEQ_CI_
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::ExceptionDefSeq_var
@@ -1180,7 +1067,7 @@ CORBA::ExceptionDefSeq_var::operator= (const ::CORBA::ExceptionDefSeq_var &p)
               ExceptionDefSeq (*p.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               ExceptionDefSeq *tmp = deep_copy;
@@ -1190,7 +1077,7 @@ CORBA::ExceptionDefSeq_var::operator= (const ::CORBA::ExceptionDefSeq_var &p)
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -1215,20 +1102,20 @@ CORBA::ExceptionDefSeq_var::operator const ::CORBA::ExceptionDefSeq &() const //
 }
 
 ACE_INLINE
-CORBA::ExceptionDefSeq_var::operator ::CORBA::ExceptionDefSeq &() // cast
+CORBA::ExceptionDefSeq_var::operator ::CORBA::ExceptionDefSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ExceptionDefSeq_var::operator ::CORBA::ExceptionDefSeq &() const // cast
+CORBA::ExceptionDefSeq_var::operator ::CORBA::ExceptionDefSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::ExceptionDefSeq_var::operator ::CORBA::ExceptionDefSeq *&() // cast
+CORBA::ExceptionDefSeq_var::operator ::CORBA::ExceptionDefSeq *&() // cast 
 {
   return this->ptr_;
 }
@@ -1279,8 +1166,8 @@ CORBA::ExceptionDefSeq_var::ptr (void) const
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::ExceptionDefSeq_out
@@ -1352,244 +1239,54 @@ CORBA::ExceptionDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CI_
-
-ACE_INLINE
-CORBA::ExceptionDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::ExceptionDescription *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ExceptionDescription[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (CORBA::ExceptionDescription *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ExceptionDescription *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
-    const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ExceptionDescription *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::ExceptionDescription * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ExceptionDescription * 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;
-    }
-}
+#if !defined (_CORBA_ATTRIBUTEDEF___CI_)
+#define _CORBA_ATTRIBUTEDEF___CI_
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
+CORBA::AttributeDef::AttributeDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
   )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ExceptionDescription *tmp =
-            ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
-
-          _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
-
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (rhs.maximum_);
-    }
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  CORBA::ExceptionDescription *tmp1 =
-    ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
-  CORBA::ExceptionDescription * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ExceptionDescription &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ExceptionDescription* tmp =
-    ACE_reinterpret_cast (CORBA::ExceptionDescription*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ExceptionDescription &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ExceptionDescription * const tmp =
-    ACE_reinterpret_cast (CORBA::ExceptionDescription* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ExceptionDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ExceptionDescription *result = 0;
-
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ExceptionDescription*, 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::ExceptionDescription*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ExceptionDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ExceptionDescription * ACE_CAST_CONST, this->buffer_);
+  this->CORBA_AttributeDef_setup_collocation (_tao_collocated);
 }
 
 ACE_INLINE
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExceptionDescription *data,
-    CORBA::Boolean release
-  )
+CORBA::Boolean
+CORBA::AttributeDef::marshal (TAO_OutputCDR &cdr)
 {
-  this->maximum_ = max;
-  this->length_ = length;
-
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ExceptionDescription *tmp =
-        ACE_reinterpret_cast (CORBA::ExceptionDescription*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
-    }
-
-  this->buffer_ = data;
-  this->release_ = release;
+  return (cdr << this);
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CI_)
-#define _CORBA_EXCDESCRIPTIONSEQ_CI_
-
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
-// Inline operations for class CORBA::ExcDescriptionSeq_var
+// Inline operations for class CORBA::AttributeDescription_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::ExcDescriptionSeq_var::ExcDescriptionSeq_var (void)
+CORBA::AttributeDescription_var::AttributeDescription_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA::ExcDescriptionSeq_var::ExcDescriptionSeq_var (ExcDescriptionSeq *p)
+CORBA::AttributeDescription_var::AttributeDescription_var (AttributeDescription *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA::ExcDescriptionSeq_var::ExcDescriptionSeq_var (const ::CORBA::ExcDescriptionSeq_var &p)
+CORBA::AttributeDescription_var::AttributeDescription_var (const ::CORBA::AttributeDescription_var &p)
 {
   if (p.ptr_)
     {
-      ACE_NEW (this->ptr_, ::CORBA::ExcDescriptionSeq (*p.ptr_));
+      ACE_NEW (this->ptr_, ::CORBA::AttributeDescription (*p.ptr_));
     }
   else
     {
@@ -1598,161 +1295,141 @@ CORBA::ExcDescriptionSeq_var::ExcDescriptionSeq_var (const ::CORBA::ExcDescripti
 }
 
 ACE_INLINE
-CORBA::ExcDescriptionSeq_var::~ExcDescriptionSeq_var (void)
+CORBA::AttributeDescription_var::~AttributeDescription_var (void)
 {
   delete this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ExcDescriptionSeq_var &
-CORBA::ExcDescriptionSeq_var::operator= (ExcDescriptionSeq *p)
+CORBA::AttributeDescription_var &
+CORBA::AttributeDescription_var::operator= (AttributeDescription *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
 ACE_INLINE
-::CORBA::ExcDescriptionSeq_var &
-CORBA::ExcDescriptionSeq_var::operator= (const ::CORBA::ExcDescriptionSeq_var &p)
+::CORBA::AttributeDescription_var &
+CORBA::AttributeDescription_var::operator= (const ::CORBA::AttributeDescription_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
         {
-          ExcDescriptionSeq *deep_copy = 0;
+          AttributeDescription *deep_copy = 0;
           ACE_NEW_RETURN (
               deep_copy,
-              ExcDescriptionSeq (*p.ptr_),
+              AttributeDescription (*_tao_struct_var.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
-              ExcDescriptionSeq *tmp = deep_copy;
+              AttributeDescription *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
             }
         }
     }
-
+  
   return *this;
 }
 
-ACE_INLINE
-const ::CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_var::operator-> (void) const
+ACE_INLINE const ::CORBA::AttributeDescription *
+CORBA::AttributeDescription_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-::CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_var::operator-> (void)
+ACE_INLINE ::CORBA::AttributeDescription *
+CORBA::AttributeDescription_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ExcDescriptionSeq_var::operator const ::CORBA::ExcDescriptionSeq &() const // cast
+CORBA::AttributeDescription_var::operator const ::CORBA::AttributeDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ExcDescriptionSeq_var::operator ::CORBA::ExcDescriptionSeq &() // cast
+CORBA::AttributeDescription_var::operator ::CORBA::AttributeDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ExcDescriptionSeq_var::operator ::CORBA::ExcDescriptionSeq &() const // cast
+CORBA::AttributeDescription_var::operator ::CORBA::AttributeDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::ExcDescriptionSeq_var::operator ::CORBA::ExcDescriptionSeq *&() // cast
+CORBA::AttributeDescription_var::operator ::CORBA::AttributeDescription *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-CORBA::ExceptionDescription &
-CORBA::ExcDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::ExceptionDescription &
-CORBA::ExcDescriptionSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::ExceptionDescription &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::ExcDescriptionSeq &
-CORBA::ExcDescriptionSeq_var::in (void) const
+ACE_INLINE const ::CORBA::AttributeDescription &
+CORBA::AttributeDescription_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-::CORBA::ExcDescriptionSeq &
-CORBA::ExcDescriptionSeq_var::inout (void)
+ACE_INLINE ::CORBA::AttributeDescription &
+CORBA::AttributeDescription_var::inout (void)
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-::CORBA::ExcDescriptionSeq *&
-CORBA::ExcDescriptionSeq_var::out (void)
+// Mapping for variable size.
+ACE_INLINE ::CORBA::AttributeDescription *&
+CORBA::AttributeDescription_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE
-::CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_var::_retn (void)
+ACE_INLINE ::CORBA::AttributeDescription *
+CORBA::AttributeDescription_var::_retn (void)
 {
-  ::CORBA::ExcDescriptionSeq *tmp = this->ptr_;
+  ::CORBA::AttributeDescription *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE
-::CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_var::ptr (void) const
+ACE_INLINE ::CORBA::AttributeDescription *
+CORBA::AttributeDescription_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
-// Inline operations for class CORBA::ExcDescriptionSeq_out
+// Inline operations for class CORBA::AttributeDescription_out
 // *************************************************************
 
 ACE_INLINE
-CORBA::ExcDescriptionSeq_out::ExcDescriptionSeq_out (ExcDescriptionSeq *&p)
+CORBA::AttributeDescription_out::AttributeDescription_out (::CORBA::AttributeDescription *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::ExcDescriptionSeq_out::ExcDescriptionSeq_out (ExcDescriptionSeq_var &p)
+CORBA::AttributeDescription_out::AttributeDescription_out (AttributeDescription_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1760,97 +1437,67 @@ CORBA::ExcDescriptionSeq_out::ExcDescriptionSeq_out (ExcDescriptionSeq_var &p)
 }
 
 ACE_INLINE
-CORBA::ExcDescriptionSeq_out::ExcDescriptionSeq_out (const ::CORBA::ExcDescriptionSeq_out &p)
-  : ptr_ (ACE_const_cast (ExcDescriptionSeq_out&, p).ptr_)
+CORBA::AttributeDescription_out::AttributeDescription_out (const ::CORBA::AttributeDescription_out &p)
+  : ptr_ (ACE_const_cast (AttributeDescription_out&, p).ptr_)
 {}
 
 ACE_INLINE
-::CORBA::ExcDescriptionSeq_out &
-CORBA::ExcDescriptionSeq_out::operator= (const ::CORBA::ExcDescriptionSeq_out &p)
+CORBA::AttributeDescription_out &
+CORBA::AttributeDescription_out::operator= (const ::CORBA::AttributeDescription_out &p)
 {
-  this->ptr_ = ACE_const_cast (ExcDescriptionSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (AttributeDescription_out&, p).ptr_;
   return *this;
 }
 
 ACE_INLINE
-::CORBA::ExcDescriptionSeq_out &
-CORBA::ExcDescriptionSeq_out::operator= (ExcDescriptionSeq *p)
+CORBA::AttributeDescription_out &
+CORBA::AttributeDescription_out::operator= (AttributeDescription *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
-ACE_INLINE
-CORBA::ExcDescriptionSeq_out::operator ::CORBA::ExcDescriptionSeq *&() // cast
+ACE_INLINE 
+CORBA::AttributeDescription_out::operator ::CORBA::AttributeDescription *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-::CORBA::ExcDescriptionSeq *&
-CORBA::ExcDescriptionSeq_out::ptr (void) // ptr
+ACE_INLINE ::CORBA::AttributeDescription *&
+CORBA::AttributeDescription_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-::CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_out::operator-> (void)
+ACE_INLINE ::CORBA::AttributeDescription *
+CORBA::AttributeDescription_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-CORBA::ExceptionDescription &
-CORBA::ExcDescriptionSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_CORBA_ATTRIBUTEDEF___CI_)
-#define _CORBA_ATTRIBUTEDEF___CI_
-
-ACE_INLINE
-CORBA::AttributeDef::AttributeDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
-{
-  this->CORBA_AttributeDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
-// Inline operations for class CORBA::AttributeDescription_var
+// Inline operations for class CORBA::ExtAttributeDescription_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::AttributeDescription_var::AttributeDescription_var (void)
+CORBA::ExtAttributeDescription_var::ExtAttributeDescription_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA::AttributeDescription_var::AttributeDescription_var (AttributeDescription *p)
+CORBA::ExtAttributeDescription_var::ExtAttributeDescription_var (ExtAttributeDescription *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA::AttributeDescription_var::AttributeDescription_var (const ::CORBA::AttributeDescription_var &p)
+CORBA::ExtAttributeDescription_var::ExtAttributeDescription_var (const ::CORBA::ExtAttributeDescription_var &p)
 {
   if (p.ptr_)
     {
-      ACE_NEW (this->ptr_, ::CORBA::AttributeDescription (*p.ptr_));
+      ACE_NEW (this->ptr_, ::CORBA::ExtAttributeDescription (*p.ptr_));
     }
   else
     {
@@ -1859,14 +1506,14 @@ CORBA::AttributeDescription_var::AttributeDescription_var (const ::CORBA::Attrib
 }
 
 ACE_INLINE
-CORBA::AttributeDescription_var::~AttributeDescription_var (void)
+CORBA::ExtAttributeDescription_var::~ExtAttributeDescription_var (void)
 {
   delete this->ptr_;
 }
 
 ACE_INLINE
-CORBA::AttributeDescription_var &
-CORBA::AttributeDescription_var::operator= (AttributeDescription *_tao_struct_var)
+CORBA::ExtAttributeDescription_var &
+CORBA::ExtAttributeDescription_var::operator= (ExtAttributeDescription *_tao_struct_var)
 {
   delete this->ptr_;
   this->ptr_ = _tao_struct_var;
@@ -1874,8 +1521,8 @@ CORBA::AttributeDescription_var::operator= (AttributeDescription *_tao_struct_va
 }
 
 ACE_INLINE
-::CORBA::AttributeDescription_var &
-CORBA::AttributeDescription_var::operator= (const ::CORBA::AttributeDescription_var &_tao_struct_var)
+::CORBA::ExtAttributeDescription_var &
+CORBA::ExtAttributeDescription_var::operator= (const ::CORBA::ExtAttributeDescription_var &_tao_struct_var)
 {
   if (this != &_tao_struct_var)
     {
@@ -1886,114 +1533,114 @@ CORBA::AttributeDescription_var::operator= (const ::CORBA::AttributeDescription_
         }
       else
         {
-          AttributeDescription *deep_copy = 0;
+          ExtAttributeDescription *deep_copy = 0;
           ACE_NEW_RETURN (
               deep_copy,
-              AttributeDescription (*_tao_struct_var.ptr_),
+              ExtAttributeDescription (*_tao_struct_var.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
-              AttributeDescription *tmp = deep_copy;
+              ExtAttributeDescription *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
             }
         }
     }
-
+  
   return *this;
 }
 
-ACE_INLINE const ::CORBA::AttributeDescription *
-CORBA::AttributeDescription_var::operator-> (void) const
+ACE_INLINE const ::CORBA::ExtAttributeDescription *
+CORBA::ExtAttributeDescription_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::AttributeDescription *
-CORBA::AttributeDescription_var::operator-> (void)
+ACE_INLINE ::CORBA::ExtAttributeDescription *
+CORBA::ExtAttributeDescription_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA::AttributeDescription_var::operator const ::CORBA::AttributeDescription &() const // cast
+CORBA::ExtAttributeDescription_var::operator const ::CORBA::ExtAttributeDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::AttributeDescription_var::operator ::CORBA::AttributeDescription &() // cast
+CORBA::ExtAttributeDescription_var::operator ::CORBA::ExtAttributeDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::AttributeDescription_var::operator ::CORBA::AttributeDescription &() const // cast
+CORBA::ExtAttributeDescription_var::operator ::CORBA::ExtAttributeDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::AttributeDescription_var::operator ::CORBA::AttributeDescription *&() // cast
+CORBA::ExtAttributeDescription_var::operator ::CORBA::ExtAttributeDescription *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE const ::CORBA::AttributeDescription &
-CORBA::AttributeDescription_var::in (void) const
+ACE_INLINE const ::CORBA::ExtAttributeDescription &
+CORBA::ExtAttributeDescription_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::AttributeDescription &
-CORBA::AttributeDescription_var::inout (void)
+ACE_INLINE ::CORBA::ExtAttributeDescription &
+CORBA::ExtAttributeDescription_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // Mapping for variable size.
-ACE_INLINE ::CORBA::AttributeDescription *&
-CORBA::AttributeDescription_var::out (void)
+ACE_INLINE ::CORBA::ExtAttributeDescription *&
+CORBA::ExtAttributeDescription_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::AttributeDescription *
-CORBA::AttributeDescription_var::_retn (void)
+ACE_INLINE ::CORBA::ExtAttributeDescription *
+CORBA::ExtAttributeDescription_var::_retn (void)
 {
-  ::CORBA::AttributeDescription *tmp = this->ptr_;
+  ::CORBA::ExtAttributeDescription *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA::AttributeDescription *
-CORBA::AttributeDescription_var::ptr (void) const
+ACE_INLINE ::CORBA::ExtAttributeDescription *
+CORBA::ExtAttributeDescription_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
-// Inline operations for class CORBA::AttributeDescription_out
+// Inline operations for class CORBA::ExtAttributeDescription_out
 // *************************************************************
 
 ACE_INLINE
-CORBA::AttributeDescription_out::AttributeDescription_out (::CORBA::AttributeDescription *&p)
+CORBA::ExtAttributeDescription_out::ExtAttributeDescription_out (::CORBA::ExtAttributeDescription *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::AttributeDescription_out::AttributeDescription_out (AttributeDescription_var &p)
+CORBA::ExtAttributeDescription_out::ExtAttributeDescription_out (ExtAttributeDescription_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -2001,46 +1648,72 @@ CORBA::AttributeDescription_out::AttributeDescription_out (AttributeDescription_
 }
 
 ACE_INLINE
-CORBA::AttributeDescription_out::AttributeDescription_out (const ::CORBA::AttributeDescription_out &p)
-  : ptr_ (ACE_const_cast (AttributeDescription_out&, p).ptr_)
+CORBA::ExtAttributeDescription_out::ExtAttributeDescription_out (const ::CORBA::ExtAttributeDescription_out &p)
+  : ptr_ (ACE_const_cast (ExtAttributeDescription_out&, p).ptr_)
 {}
 
 ACE_INLINE
-CORBA::AttributeDescription_out &
-CORBA::AttributeDescription_out::operator= (const ::CORBA::AttributeDescription_out &p)
+CORBA::ExtAttributeDescription_out &
+CORBA::ExtAttributeDescription_out::operator= (const ::CORBA::ExtAttributeDescription_out &p)
 {
-  this->ptr_ = ACE_const_cast (AttributeDescription_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (ExtAttributeDescription_out&, p).ptr_;
   return *this;
 }
 
 ACE_INLINE
-CORBA::AttributeDescription_out &
-CORBA::AttributeDescription_out::operator= (AttributeDescription *_tao_struct_out)
+CORBA::ExtAttributeDescription_out &
+CORBA::ExtAttributeDescription_out::operator= (ExtAttributeDescription *_tao_struct_out)
 {
   this->ptr_ = _tao_struct_out;
   return *this;
 }
 
-ACE_INLINE
-CORBA::AttributeDescription_out::operator ::CORBA::AttributeDescription *&() // cast
+ACE_INLINE 
+CORBA::ExtAttributeDescription_out::operator ::CORBA::ExtAttributeDescription *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::AttributeDescription *&
-CORBA::AttributeDescription_out::ptr (void) // ptr
+ACE_INLINE ::CORBA::ExtAttributeDescription *&
+CORBA::ExtAttributeDescription_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::AttributeDescription *
-CORBA::AttributeDescription_out::operator-> (void)
+ACE_INLINE ::CORBA::ExtAttributeDescription *
+CORBA::ExtAttributeDescription_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
+#if !defined (_CORBA_EXTATTRIBUTEDEF___CI_)
+#define _CORBA_EXTATTRIBUTEDEF___CI_
+
+ACE_INLINE
+CORBA::ExtAttributeDef::ExtAttributeDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
+{
+  this->CORBA_ExtAttributeDef_setup_collocation (_tao_collocated);
+}
+
+ACE_INLINE
+CORBA::Boolean
+CORBA::ExtAttributeDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::ParameterDescription_var
@@ -2103,7 +1776,7 @@ CORBA::ParameterDescription_var::operator= (const ::CORBA::ParameterDescription_
               ParameterDescription (*_tao_struct_var.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               ParameterDescription *tmp = deep_copy;
@@ -2113,7 +1786,7 @@ CORBA::ParameterDescription_var::operator= (const ::CORBA::ParameterDescription_
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -2136,20 +1809,20 @@ CORBA::ParameterDescription_var::operator const ::CORBA::ParameterDescription &(
 }
 
 ACE_INLINE
-CORBA::ParameterDescription_var::operator ::CORBA::ParameterDescription &() // cast
+CORBA::ParameterDescription_var::operator ::CORBA::ParameterDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ParameterDescription_var::operator ::CORBA::ParameterDescription &() const // cast
+CORBA::ParameterDescription_var::operator ::CORBA::ParameterDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::ParameterDescription_var::operator ::CORBA::ParameterDescription *&() // cast
+CORBA::ParameterDescription_var::operator ::CORBA::ParameterDescription *&() // cast 
 {
   return this->ptr_;
 }
@@ -2190,7 +1863,7 @@ CORBA::ParameterDescription_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::ParameterDescription_out
@@ -2232,7 +1905,7 @@ CORBA::ParameterDescription_out::operator= (ParameterDescription *_tao_struct_ou
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 CORBA::ParameterDescription_out::operator ::CORBA::ParameterDescription *&() // cast
 {
   return this->ptr_;
@@ -2250,8 +1923,8 @@ CORBA::ParameterDescription_out::operator-> (void)
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -2279,7 +1952,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum)
+CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (maximum))
 {
 }
@@ -2307,12 +1980,12 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_
         _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (this->maximum_);
       CORBA::ParameterDescription * const tmp2 =
         ACE_reinterpret_cast (CORBA::ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
           tmp1[i] = tmp2[i];
         }
-
+      
       this->buffer_ = tmp1;
     }
   else
@@ -2331,7 +2004,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::operator= (
     {
       return *this;
     }
-
+  
   if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -2339,9 +2012,9 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::operator= (
           // Free the old buffer.
           CORBA::ParameterDescription *tmp =
             ACE_reinterpret_cast (CORBA::ParameterDescription *, this->buffer_);
-
+          
           _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
-
+          
           this->buffer_ =
             _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (rhs.maximum_);
         }
@@ -2351,19 +2024,19 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::operator= (
       this->buffer_ =
         _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (rhs.maximum_);
     }
-
+  
   TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+  
   CORBA::ParameterDescription *tmp1 =
     ACE_reinterpret_cast (CORBA::ParameterDescription *, this->buffer_);
   CORBA::ParameterDescription * const tmp2 =
     ACE_reinterpret_cast (CORBA::ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tmp1[i] = tmp2[i];
     }
-
+  
   return *this;
 }
 
@@ -2395,7 +2068,7 @@ CORBA::ParameterDescription *
 CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::ParameterDescription *result = 0;
-
+  
   if (orphan == 0)
     {
       // We retain ownership.
@@ -2425,7 +2098,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::get_buffer (CORBA::Boole
           this->release_ = 0;
         }
     }
-
+  
   return result;
 }
 
@@ -2447,27 +2120,27 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::replace (
 {
   this->maximum_ = max;
   this->length_ = length;
-
+  
   if (this->buffer_ && this->release_ == 1)
     {
       CORBA::ParameterDescription *tmp =
         ACE_reinterpret_cast (CORBA::ParameterDescription*, this->buffer_);
       _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
     }
-
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ_CI_)
 #define _CORBA_PARDESCRIPTIONSEQ_CI_
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::ParDescriptionSeq_var
@@ -2530,7 +2203,7 @@ CORBA::ParDescriptionSeq_var::operator= (const ::CORBA::ParDescriptionSeq_var &p
               ParDescriptionSeq (*p.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               ParDescriptionSeq *tmp = deep_copy;
@@ -2540,7 +2213,7 @@ CORBA::ParDescriptionSeq_var::operator= (const ::CORBA::ParDescriptionSeq_var &p
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -2565,20 +2238,20 @@ CORBA::ParDescriptionSeq_var::operator const ::CORBA::ParDescriptionSeq &() cons
 }
 
 ACE_INLINE
-CORBA::ParDescriptionSeq_var::operator ::CORBA::ParDescriptionSeq &() // cast
+CORBA::ParDescriptionSeq_var::operator ::CORBA::ParDescriptionSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ParDescriptionSeq_var::operator ::CORBA::ParDescriptionSeq &() const // cast
+CORBA::ParDescriptionSeq_var::operator ::CORBA::ParDescriptionSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::ParDescriptionSeq_var::operator ::CORBA::ParDescriptionSeq *&() // cast
+CORBA::ParDescriptionSeq_var::operator ::CORBA::ParDescriptionSeq *&() // cast 
 {
   return this->ptr_;
 }
@@ -2636,8 +2309,8 @@ CORBA::ParDescriptionSeq_var::ptr (void) const
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::ParDescriptionSeq_out
@@ -2711,8 +2384,8 @@ CORBA::ParDescriptionSeq_out::operator[] (CORBA::ULong index)
 #if !defined (_CORBA_CONTEXTIDSEQ_CI_)
 #define _CORBA_CONTEXTIDSEQ_CI_
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::ContextIdSeq_var
@@ -2775,7 +2448,7 @@ CORBA::ContextIdSeq_var::operator= (const ::CORBA::ContextIdSeq_var &p)
               ContextIdSeq (*p.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               ContextIdSeq *tmp = deep_copy;
@@ -2785,7 +2458,7 @@ CORBA::ContextIdSeq_var::operator= (const ::CORBA::ContextIdSeq_var &p)
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -2810,20 +2483,20 @@ CORBA::ContextIdSeq_var::operator const ::CORBA::ContextIdSeq &() const // cast
 }
 
 ACE_INLINE
-CORBA::ContextIdSeq_var::operator ::CORBA::ContextIdSeq &() // cast
+CORBA::ContextIdSeq_var::operator ::CORBA::ContextIdSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ContextIdSeq_var::operator ::CORBA::ContextIdSeq &() const // cast
+CORBA::ContextIdSeq_var::operator ::CORBA::ContextIdSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::ContextIdSeq_var::operator ::CORBA::ContextIdSeq *&() // cast
+CORBA::ContextIdSeq_var::operator ::CORBA::ContextIdSeq *&() // cast 
 {
   return this->ptr_;
 }
@@ -2874,8 +2547,8 @@ CORBA::ContextIdSeq_var::ptr (void) const
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::ContextIdSeq_out
@@ -2947,7 +2620,7 @@ CORBA::ContextIdSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_OPERATIONDEF___CI_)
 #define _CORBA_OPERATIONDEF___CI_
@@ -2963,10 +2636,17 @@ CORBA::OperationDef::OperationDef (
   this->CORBA_OperationDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::OperationDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::OperationDescription_var
@@ -3029,7 +2709,7 @@ CORBA::OperationDescription_var::operator= (const ::CORBA::OperationDescription_
               OperationDescription (*_tao_struct_var.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               OperationDescription *tmp = deep_copy;
@@ -3039,7 +2719,7 @@ CORBA::OperationDescription_var::operator= (const ::CORBA::OperationDescription_
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -3062,20 +2742,20 @@ CORBA::OperationDescription_var::operator const ::CORBA::OperationDescription &(
 }
 
 ACE_INLINE
-CORBA::OperationDescription_var::operator ::CORBA::OperationDescription &() // cast
+CORBA::OperationDescription_var::operator ::CORBA::OperationDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::OperationDescription_var::operator ::CORBA::OperationDescription &() const // cast
+CORBA::OperationDescription_var::operator ::CORBA::OperationDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::OperationDescription_var::operator ::CORBA::OperationDescription *&() // cast
+CORBA::OperationDescription_var::operator ::CORBA::OperationDescription *&() // cast 
 {
   return this->ptr_;
 }
@@ -3116,7 +2796,7 @@ CORBA::OperationDescription_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::OperationDescription_out
@@ -3158,7 +2838,7 @@ CORBA::OperationDescription_out::operator= (OperationDescription *_tao_struct_ou
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 CORBA::OperationDescription_out::operator ::CORBA::OperationDescription *&() // cast
 {
   return this->ptr_;
@@ -3179,8 +2859,8 @@ CORBA::OperationDescription_out::operator-> (void)
 #if !defined (_CORBA_REPOSITORYIDSEQ_CI_)
 #define _CORBA_REPOSITORYIDSEQ_CI_
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::RepositoryIdSeq_var
@@ -3243,7 +2923,7 @@ CORBA::RepositoryIdSeq_var::operator= (const ::CORBA::RepositoryIdSeq_var &p)
               RepositoryIdSeq (*p.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               RepositoryIdSeq *tmp = deep_copy;
@@ -3253,7 +2933,7 @@ CORBA::RepositoryIdSeq_var::operator= (const ::CORBA::RepositoryIdSeq_var &p)
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -3278,20 +2958,20 @@ CORBA::RepositoryIdSeq_var::operator const ::CORBA::RepositoryIdSeq &() const //
 }
 
 ACE_INLINE
-CORBA::RepositoryIdSeq_var::operator ::CORBA::RepositoryIdSeq &() // cast
+CORBA::RepositoryIdSeq_var::operator ::CORBA::RepositoryIdSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::RepositoryIdSeq_var::operator ::CORBA::RepositoryIdSeq &() const // cast
+CORBA::RepositoryIdSeq_var::operator ::CORBA::RepositoryIdSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::RepositoryIdSeq_var::operator ::CORBA::RepositoryIdSeq *&() // cast
+CORBA::RepositoryIdSeq_var::operator ::CORBA::RepositoryIdSeq *&() // cast 
 {
   return this->ptr_;
 }
@@ -3342,8 +3022,8 @@ CORBA::RepositoryIdSeq_var::ptr (void) const
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::RepositoryIdSeq_out
@@ -3414,8 +3094,8 @@ CORBA::RepositoryIdSeq_out::operator[] (CORBA::ULong index)
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -3443,7 +3123,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_C
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum)
+CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (maximum))
 {
 }
@@ -3471,12 +3151,12 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_C
         _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (this->maximum_);
       CORBA::OperationDescription * const tmp2 =
         ACE_reinterpret_cast (CORBA::OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
           tmp1[i] = tmp2[i];
         }
-
+      
       this->buffer_ = tmp1;
     }
   else
@@ -3495,7 +3175,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::operator= (
     {
       return *this;
     }
-
+  
   if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -3503,9 +3183,9 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::operator= (
           // Free the old buffer.
           CORBA::OperationDescription *tmp =
             ACE_reinterpret_cast (CORBA::OperationDescription *, this->buffer_);
-
+          
           _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
-
+          
           this->buffer_ =
             _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (rhs.maximum_);
         }
@@ -3515,19 +3195,19 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::operator= (
       this->buffer_ =
         _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (rhs.maximum_);
     }
-
+  
   TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+  
   CORBA::OperationDescription *tmp1 =
     ACE_reinterpret_cast (CORBA::OperationDescription *, this->buffer_);
   CORBA::OperationDescription * const tmp2 =
     ACE_reinterpret_cast (CORBA::OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tmp1[i] = tmp2[i];
     }
-
+  
   return *this;
 }
 
@@ -3559,7 +3239,7 @@ CORBA::OperationDescription *
 CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::OperationDescription *result = 0;
-
+  
   if (orphan == 0)
     {
       // We retain ownership.
@@ -3589,7 +3269,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::get_buffer (CORBA::Boolea
           this->release_ = 0;
         }
     }
-
+  
   return result;
 }
 
@@ -3611,27 +3291,27 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::replace (
 {
   this->maximum_ = max;
   this->length_ = length;
-
+  
   if (this->buffer_ && this->release_ == 1)
     {
       CORBA::OperationDescription *tmp =
         ACE_reinterpret_cast (CORBA::OperationDescription*, this->buffer_);
       _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
     }
-
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_OPDESCRIPTIONSEQ_CI_)
 #define _CORBA_OPDESCRIPTIONSEQ_CI_
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::OpDescriptionSeq_var
@@ -3694,7 +3374,7 @@ CORBA::OpDescriptionSeq_var::operator= (const ::CORBA::OpDescriptionSeq_var &p)
               OpDescriptionSeq (*p.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               OpDescriptionSeq *tmp = deep_copy;
@@ -3704,7 +3384,7 @@ CORBA::OpDescriptionSeq_var::operator= (const ::CORBA::OpDescriptionSeq_var &p)
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -3729,20 +3409,20 @@ CORBA::OpDescriptionSeq_var::operator const ::CORBA::OpDescriptionSeq &() const
 }
 
 ACE_INLINE
-CORBA::OpDescriptionSeq_var::operator ::CORBA::OpDescriptionSeq &() // cast
+CORBA::OpDescriptionSeq_var::operator ::CORBA::OpDescriptionSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::OpDescriptionSeq_var::operator ::CORBA::OpDescriptionSeq &() const // cast
+CORBA::OpDescriptionSeq_var::operator ::CORBA::OpDescriptionSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::OpDescriptionSeq_var::operator ::CORBA::OpDescriptionSeq *&() // cast
+CORBA::OpDescriptionSeq_var::operator ::CORBA::OpDescriptionSeq *&() // cast 
 {
   return this->ptr_;
 }
@@ -3800,8 +3480,8 @@ CORBA::OpDescriptionSeq_var::ptr (void) const
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::OpDescriptionSeq_out
@@ -3872,8 +3552,8 @@ CORBA::OpDescriptionSeq_out::operator[] (CORBA::ULong index)
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -3901,7 +3581,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum)
+CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (maximum))
 {
 }
@@ -3929,12 +3609,12 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence
         _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (this->maximum_);
       CORBA::AttributeDescription * const tmp2 =
         ACE_reinterpret_cast (CORBA::AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
           tmp1[i] = tmp2[i];
         }
-
+      
       this->buffer_ = tmp1;
     }
   else
@@ -3953,7 +3633,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::operator= (
     {
       return *this;
     }
-
+  
   if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -3961,9 +3641,9 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::operator= (
           // Free the old buffer.
           CORBA::AttributeDescription *tmp =
             ACE_reinterpret_cast (CORBA::AttributeDescription *, this->buffer_);
-
+          
           _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
-
+          
           this->buffer_ =
             _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (rhs.maximum_);
         }
@@ -3973,19 +3653,19 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::operator= (
       this->buffer_ =
         _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (rhs.maximum_);
     }
-
+  
   TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+  
   CORBA::AttributeDescription *tmp1 =
     ACE_reinterpret_cast (CORBA::AttributeDescription *, this->buffer_);
   CORBA::AttributeDescription * const tmp2 =
     ACE_reinterpret_cast (CORBA::AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tmp1[i] = tmp2[i];
     }
-
+  
   return *this;
 }
 
@@ -4017,7 +3697,7 @@ CORBA::AttributeDescription *
 CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::AttributeDescription *result = 0;
-
+  
   if (orphan == 0)
     {
       // We retain ownership.
@@ -4047,7 +3727,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::get_buffer (CORBA::Bool
           this->release_ = 0;
         }
     }
-
+  
   return result;
 }
 
@@ -4069,27 +3749,27 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::replace (
 {
   this->maximum_ = max;
   this->length_ = length;
-
+  
   if (this->buffer_ && this->release_ == 1)
     {
       CORBA::AttributeDescription *tmp =
         ACE_reinterpret_cast (CORBA::AttributeDescription*, this->buffer_);
       _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
     }
-
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CI_)
 #define _CORBA_ATTRDESCRIPTIONSEQ_CI_
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::AttrDescriptionSeq_var
@@ -4152,7 +3832,7 @@ CORBA::AttrDescriptionSeq_var::operator= (const ::CORBA::AttrDescriptionSeq_var
               AttrDescriptionSeq (*p.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               AttrDescriptionSeq *tmp = deep_copy;
@@ -4162,7 +3842,7 @@ CORBA::AttrDescriptionSeq_var::operator= (const ::CORBA::AttrDescriptionSeq_var
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -4187,20 +3867,20 @@ CORBA::AttrDescriptionSeq_var::operator const ::CORBA::AttrDescriptionSeq &() co
 }
 
 ACE_INLINE
-CORBA::AttrDescriptionSeq_var::operator ::CORBA::AttrDescriptionSeq &() // cast
+CORBA::AttrDescriptionSeq_var::operator ::CORBA::AttrDescriptionSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::AttrDescriptionSeq_var::operator ::CORBA::AttrDescriptionSeq &() const // cast
+CORBA::AttrDescriptionSeq_var::operator ::CORBA::AttrDescriptionSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::AttrDescriptionSeq_var::operator ::CORBA::AttrDescriptionSeq *&() // cast
+CORBA::AttrDescriptionSeq_var::operator ::CORBA::AttrDescriptionSeq *&() // cast 
 {
   return this->ptr_;
 }
@@ -4258,8 +3938,8 @@ CORBA::AttrDescriptionSeq_var::ptr (void) const
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::AttrDescriptionSeq_out
@@ -4330,8 +4010,466 @@ CORBA::AttrDescriptionSeq_out::operator[] (CORBA::ULong index)
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXTATTRDESCRIPTIONSEQ_CI_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXTATTRDESCRIPTIONSEQ_CI_
+
+ACE_INLINE
+CORBA::ExtAttributeDescription *
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (CORBA::ULong size)
+{
+  CORBA::ExtAttributeDescription *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA::ExtAttributeDescription[size], 0);
+  return retval;
+}
+
+ACE_INLINE
+void CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::freebuf (CORBA::ExtAttributeDescription *buffer)
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (void)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (CORBA::ULong maximum) 
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ExtAttributeDescription *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (
+    const _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::ExtAttributeDescription *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (this->maximum_);
+      CORBA::ExtAttributeDescription * const tmp2 =
+        ACE_reinterpret_cast (CORBA::ExtAttributeDescription * 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
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq &
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+  
+  if (this->release_)
+    {
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          CORBA::ExtAttributeDescription *tmp =
+            ACE_reinterpret_cast (CORBA::ExtAttributeDescription *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::ExtAttributeDescription *tmp1 =
+    ACE_reinterpret_cast (CORBA::ExtAttributeDescription *, this->buffer_);
+  CORBA::ExtAttributeDescription * const tmp2 =
+    ACE_reinterpret_cast (CORBA::ExtAttributeDescription * ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tmp1[i] = tmp2[i];
+    }
+  
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE
+CORBA::ExtAttributeDescription &
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::operator[] (CORBA::ULong i)
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ExtAttributeDescription* tmp =
+    ACE_reinterpret_cast (CORBA::ExtAttributeDescription*, this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE
+const CORBA::ExtAttributeDescription &
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::operator[] (CORBA::ULong i) const
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ExtAttributeDescription * const tmp =
+    ACE_reinterpret_cast (CORBA::ExtAttributeDescription* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE
+CORBA::ExtAttributeDescription *
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::ExtAttributeDescription *result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::ExtAttributeDescription*, 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::ExtAttributeDescription*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+  
+  return result;
+}
+
+ACE_INLINE
+const CORBA::ExtAttributeDescription *
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const CORBA::ExtAttributeDescription * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE
+void
+CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ExtAttributeDescription *data,
+    CORBA::Boolean release
+  )
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  
+  if (this->buffer_ && this->release_ == 1)
+    {
+      CORBA::ExtAttributeDescription *tmp =
+        ACE_reinterpret_cast (CORBA::ExtAttributeDescription*, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::freebuf (tmp);
+    }
+  
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ_CI_)
+#define _CORBA_EXTATTRDESCRIPTIONSEQ_CI_
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
+// *************************************************************
+// Inline operations for class CORBA::ExtAttrDescriptionSeq_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_var::ExtAttrDescriptionSeq_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_var::ExtAttrDescriptionSeq_var (ExtAttrDescriptionSeq *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_var::ExtAttrDescriptionSeq_var (const ::CORBA::ExtAttrDescriptionSeq_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ExtAttrDescriptionSeq (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_var::~ExtAttrDescriptionSeq_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_var &
+CORBA::ExtAttrDescriptionSeq_var::operator= (ExtAttrDescriptionSeq *p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtAttrDescriptionSeq_var &
+CORBA::ExtAttrDescriptionSeq_var::operator= (const ::CORBA::ExtAttrDescriptionSeq_var &p)
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ExtAttrDescriptionSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExtAttrDescriptionSeq (*p.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ExtAttrDescriptionSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+const ::CORBA::ExtAttrDescriptionSeq *
+CORBA::ExtAttrDescriptionSeq_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtAttrDescriptionSeq *
+CORBA::ExtAttrDescriptionSeq_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_var::operator const ::CORBA::ExtAttrDescriptionSeq &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_var::operator ::CORBA::ExtAttrDescriptionSeq &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_var::operator ::CORBA::ExtAttrDescriptionSeq &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_var::operator ::CORBA::ExtAttrDescriptionSeq *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtAttributeDescription &
+CORBA::ExtAttrDescriptionSeq_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE
+const CORBA::ExtAttributeDescription &
+CORBA::ExtAttrDescriptionSeq_var::operator[] (CORBA::ULong index) const
+{
+  return ACE_const_cast (const CORBA::ExtAttributeDescription &, this->ptr_->operator[] (index));
+}
+
+ACE_INLINE
+const ::CORBA::ExtAttrDescriptionSeq &
+CORBA::ExtAttrDescriptionSeq_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtAttrDescriptionSeq &
+CORBA::ExtAttrDescriptionSeq_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtAttrDescriptionSeq *&
+CORBA::ExtAttrDescriptionSeq_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtAttrDescriptionSeq *
+CORBA::ExtAttrDescriptionSeq_var::_retn (void)
+{
+  ::CORBA::ExtAttrDescriptionSeq *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE
+::CORBA::ExtAttrDescriptionSeq *
+CORBA::ExtAttrDescriptionSeq_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
+
+// *************************************************************
+// Inline operations for class CORBA::ExtAttrDescriptionSeq_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_out::ExtAttrDescriptionSeq_out (ExtAttrDescriptionSeq *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_out::ExtAttrDescriptionSeq_out (ExtAttrDescriptionSeq_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_out::ExtAttrDescriptionSeq_out (const ::CORBA::ExtAttrDescriptionSeq_out &p)
+  : ptr_ (ACE_const_cast (ExtAttrDescriptionSeq_out&, p).ptr_)
+{}
+
+ACE_INLINE
+::CORBA::ExtAttrDescriptionSeq_out &
+CORBA::ExtAttrDescriptionSeq_out::operator= (const ::CORBA::ExtAttrDescriptionSeq_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtAttrDescriptionSeq_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtAttrDescriptionSeq_out &
+CORBA::ExtAttrDescriptionSeq_out::operator= (ExtAttrDescriptionSeq *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ExtAttrDescriptionSeq_out::operator ::CORBA::ExtAttrDescriptionSeq *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtAttrDescriptionSeq *&
+CORBA::ExtAttrDescriptionSeq_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ExtAttrDescriptionSeq *
+CORBA::ExtAttrDescriptionSeq_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtAttributeDescription &
+CORBA::ExtAttrDescriptionSeq_out::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+#endif /* end #if !defined */
+
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::InterfaceDef::FullInterfaceDescription_var
@@ -4394,7 +4532,7 @@ CORBA::InterfaceDef::FullInterfaceDescription_var::operator= (const ::CORBA::Int
               FullInterfaceDescription (*_tao_struct_var.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               FullInterfaceDescription *tmp = deep_copy;
@@ -4404,7 +4542,7 @@ CORBA::InterfaceDef::FullInterfaceDescription_var::operator= (const ::CORBA::Int
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -4427,20 +4565,20 @@ CORBA::InterfaceDef::FullInterfaceDescription_var::operator const ::CORBA::Inter
 }
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator ::CORBA::InterfaceDef::FullInterfaceDescription &() // cast
+CORBA::InterfaceDef::FullInterfaceDescription_var::operator ::CORBA::InterfaceDef::FullInterfaceDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator ::CORBA::InterfaceDef::FullInterfaceDescription &() const // cast
+CORBA::InterfaceDef::FullInterfaceDescription_var::operator ::CORBA::InterfaceDef::FullInterfaceDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator ::CORBA::InterfaceDef::FullInterfaceDescription *&() // cast
+CORBA::InterfaceDef::FullInterfaceDescription_var::operator ::CORBA::InterfaceDef::FullInterfaceDescription *&() // cast 
 {
   return this->ptr_;
 }
@@ -4481,7 +4619,7 @@ CORBA::InterfaceDef::FullInterfaceDescription_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::InterfaceDef::FullInterfaceDescription_out
@@ -4523,7 +4661,7 @@ CORBA::InterfaceDef::FullInterfaceDescription_out::operator= (FullInterfaceDescr
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 CORBA::InterfaceDef::FullInterfaceDescription_out::operator ::CORBA::InterfaceDef::FullInterfaceDescription *&() // cast
 {
   return this->ptr_;
@@ -4542,7 +4680,7 @@ CORBA::InterfaceDef::FullInterfaceDescription_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_INTERFACEDEF___CI_)
 #define _CORBA_INTERFACEDEF___CI_
@@ -4558,10 +4696,17 @@ CORBA::InterfaceDef::InterfaceDef (
   this->CORBA_InterfaceDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::InterfaceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::InterfaceDescription_var
@@ -4624,7 +4769,7 @@ CORBA::InterfaceDescription_var::operator= (const ::CORBA::InterfaceDescription_
               InterfaceDescription (*_tao_struct_var.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               InterfaceDescription *tmp = deep_copy;
@@ -4634,7 +4779,7 @@ CORBA::InterfaceDescription_var::operator= (const ::CORBA::InterfaceDescription_
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -4657,20 +4802,20 @@ CORBA::InterfaceDescription_var::operator const ::CORBA::InterfaceDescription &(
 }
 
 ACE_INLINE
-CORBA::InterfaceDescription_var::operator ::CORBA::InterfaceDescription &() // cast
+CORBA::InterfaceDescription_var::operator ::CORBA::InterfaceDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::InterfaceDescription_var::operator ::CORBA::InterfaceDescription &() const // cast
+CORBA::InterfaceDescription_var::operator ::CORBA::InterfaceDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-CORBA::InterfaceDescription_var::operator ::CORBA::InterfaceDescription *&() // cast
+CORBA::InterfaceDescription_var::operator ::CORBA::InterfaceDescription *&() // cast 
 {
   return this->ptr_;
 }
@@ -4711,7 +4856,7 @@ CORBA::InterfaceDescription_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::InterfaceDescription_out
@@ -4753,7 +4898,7 @@ CORBA::InterfaceDescription_out::operator= (InterfaceDescription *_tao_struct_ou
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 CORBA::InterfaceDescription_out::operator ::CORBA::InterfaceDescription *&() // cast
 {
   return this->ptr_;
@@ -4772,7 +4917,270 @@ CORBA::InterfaceDescription_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
+// *************************************************************
+// Inline operations for class CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::ExtFullInterfaceDescription_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::ExtFullInterfaceDescription_var (ExtFullInterfaceDescription *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::ExtFullInterfaceDescription_var (const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::~ExtFullInterfaceDescription_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator= (ExtFullInterfaceDescription *_tao_struct_var)
+{
+  delete this->ptr_;
+  this->ptr_ = _tao_struct_var;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator= (const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &_tao_struct_var)
+{
+  if (this != &_tao_struct_var)
+    {
+      if (_tao_struct_var.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ExtFullInterfaceDescription *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExtFullInterfaceDescription (*_tao_struct_var.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ExtFullInterfaceDescription *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+// Mapping for variable size.
+ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::_retn (void)
+{
+  ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_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 CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::ExtFullInterfaceDescription_out (::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::ExtFullInterfaceDescription_out (ExtFullInterfaceDescription_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::ExtFullInterfaceDescription_out (const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out &p)
+  : ptr_ (ACE_const_cast (ExtFullInterfaceDescription_out&, p).ptr_)
+{}
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out &
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::operator= (const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtFullInterfaceDescription_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out &
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::operator= (ExtFullInterfaceDescription *_tao_struct_out)
+{
+  this->ptr_ = _tao_struct_out;
+  return *this;
+}
+
+ACE_INLINE 
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::operator ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
+CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
+#if !defined (_CORBA_INTERFACEATTREXTENSION___CI_)
+#define _CORBA_INTERFACEATTREXTENSION___CI_
+
+ACE_INLINE
+CORBA::InterfaceAttrExtension::InterfaceAttrExtension (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
+{
+  this->CORBA_InterfaceAttrExtension_setup_collocation (_tao_collocated);
+}
+
+ACE_INLINE
+CORBA::Boolean
+CORBA::InterfaceAttrExtension::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
+#if !defined (_CORBA_EXTINTERFACEDEF___CI_)
+#define _CORBA_EXTINTERFACEDEF___CI_
+
+ACE_INLINE
+CORBA::ExtInterfaceDef::ExtInterfaceDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
+{
+  this->CORBA_ExtInterfaceDef_setup_collocation (_tao_collocated);
+}
+
+ACE_INLINE
+CORBA::Boolean
+CORBA::ExtInterfaceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___CI_)
 #define _CORBA_ABSTRACTINTERFACEDEF___CI_
@@ -4788,10 +5196,43 @@ CORBA::AbstractInterfaceDef::AbstractInterfaceDef (
   this->CORBA_AbstractInterfaceDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::AbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___CI_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF___CI_
+
+ACE_INLINE
+CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
+{
+  this->CORBA_ExtAbstractInterfaceDef_setup_collocation (_tao_collocated);
+}
+
+ACE_INLINE
+CORBA::Boolean
+CORBA::ExtAbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_LOCALINTERFACEDEF___CI_)
 #define _CORBA_LOCALINTERFACEDEF___CI_
@@ -4807,10 +5248,43 @@ CORBA::LocalInterfaceDef::LocalInterfaceDef (
   this->CORBA_LocalInterfaceDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::LocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF___CI_)
+#define _CORBA_EXTLOCALINTERFACEDEF___CI_
+
+ACE_INLINE
+CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
+{
+  this->CORBA_ExtLocalInterfaceDef_setup_collocation (_tao_collocated);
+}
+
+ACE_INLINE
+CORBA::Boolean
+CORBA::ExtLocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -4823,7 +5297,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -4836,7 +5310,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -4849,7 +5323,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -4862,7 +5336,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -4875,7 +5349,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -4888,7 +5362,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ci.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
 
 ACE_INLINE
 CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::PrimitiveKind &_tao_enumval)
@@ -4902,17 +5376,17 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::PrimitiveKind &_tao_enumva
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (CORBA::PrimitiveKind, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -4925,7 +5399,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -4938,7 +5412,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -4983,7 +5457,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -4996,7 +5470,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -5045,7 +5519,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5058,7 +5532,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5071,7 +5545,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5084,7 +5558,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5097,7 +5571,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5110,7 +5584,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5123,54 +5597,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExceptionDescription &_tao_aggregate
-  )
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.type.in ())
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExceptionDescription &_tao_aggregate
-  )
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.type.out ())
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_ExceptionDefSeq_I_
 #define _TAO_CDR_OP_CORBA_ExceptionDefSeq_I_
@@ -5188,25 +5615,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ExceptionDefSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_CORBA_ExcDescriptionSeq_I_
-#define _TAO_CDR_OP_CORBA_ExcDescriptionSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExcDescriptionSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    CORBA::ExcDescriptionSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ci.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
 
 ACE_INLINE
 CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::AttributeMode &_tao_enumval)
@@ -5220,17 +5629,17 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::AttributeMode &_tao_enumva
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (CORBA::AttributeMode, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5243,7 +5652,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -5292,7 +5701,73 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ci.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExtAttributeDescription &_tao_aggregate
+  )
+{
+  if (
+    (strm << _tao_aggregate.name.in ()) &&
+    (strm << _tao_aggregate.id.in ()) &&
+    (strm << _tao_aggregate.defined_in.in ()) &&
+    (strm << _tao_aggregate.version.in ()) &&
+    (strm << _tao_aggregate.type.in ()) &&
+    (strm << _tao_aggregate.mode) &&
+    (strm << _tao_aggregate.get_exceptions) &&
+    (strm << _tao_aggregate.put_exceptions)
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExtAttributeDescription &_tao_aggregate
+  )
+{
+  if (
+    (strm >> _tao_aggregate.name.out ()) &&
+    (strm >> _tao_aggregate.id.out ()) &&
+    (strm >> _tao_aggregate.defined_in.out ()) &&
+    (strm >> _tao_aggregate.version.out ()) &&
+    (strm >> _tao_aggregate.type.out ()) &&
+    (strm >> _tao_aggregate.mode) &&
+    (strm >> _tao_aggregate.get_exceptions) &&
+    (strm >> _tao_aggregate.put_exceptions)
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtAttributeDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtAttributeDef_ptr &
+  );
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
 
 ACE_INLINE
 CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::OperationMode &_tao_enumval)
@@ -5306,20 +5781,17 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::OperationMode &_tao_enumva
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (CORBA::OperationMode, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ci.cpp:51
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -5330,7 +5802,7 @@ CORBA::Boolean operator<< (
   if (
     (strm << _tao_aggregate.name.in ()) &&
     (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.type_def.in ()) &&
+    _tao_aggregate.type_def.in ()->marshal (strm) &&
     (strm << _tao_aggregate.mode)
    )
     {
@@ -5364,7 +5836,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_ParDescriptionSeq_I_
 #define _TAO_CDR_OP_CORBA_ParDescriptionSeq_I_
@@ -5382,7 +5854,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ParDescriptionSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_ContextIdSeq_I_
 #define _TAO_CDR_OP_CORBA_ContextIdSeq_I_
@@ -5400,7 +5872,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ContextIdSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5413,7 +5885,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -5468,7 +5940,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_RepositoryIdSeq_I_
 #define _TAO_CDR_OP_CORBA_RepositoryIdSeq_I_
@@ -5486,7 +5958,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_RepositoryIdSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_OpDescriptionSeq_I_
 #define _TAO_CDR_OP_CORBA_OpDescriptionSeq_I_
@@ -5504,7 +5976,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_OpDescriptionSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_AttrDescriptionSeq_I_
 #define _TAO_CDR_OP_CORBA_AttrDescriptionSeq_I_
@@ -5522,7 +5994,25 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_AttrDescriptionSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+
+#if !defined _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_I_
+#define _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtAttrDescriptionSeq &
+  );
+
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtAttrDescriptionSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5535,7 +6025,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -5588,7 +6078,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -5635,7 +6125,86 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::InterfaceAttrExtension_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::InterfaceAttrExtension_ptr &
+  );
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &_tao_aggregate
+  )
+{
+  if (
+    (strm << _tao_aggregate.name.in ()) &&
+    (strm << _tao_aggregate.id.in ()) &&
+    (strm << _tao_aggregate.defined_in.in ()) &&
+    (strm << _tao_aggregate.version.in ()) &&
+    (strm << _tao_aggregate.operations) &&
+    (strm << _tao_aggregate.attributes) &&
+    (strm << _tao_aggregate.base_interfaces) &&
+    (strm << _tao_aggregate.type.in ())
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &_tao_aggregate
+  )
+{
+  if (
+    (strm >> _tao_aggregate.name.out ()) &&
+    (strm >> _tao_aggregate.id.out ()) &&
+    (strm >> _tao_aggregate.defined_in.out ()) &&
+    (strm >> _tao_aggregate.version.out ()) &&
+    (strm >> _tao_aggregate.operations) &&
+    (strm >> _tao_aggregate.attributes) &&
+    (strm >> _tao_aggregate.base_interfaces) &&
+    (strm >> _tao_aggregate.type.out ())
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtInterfaceDef_ptr &
+  );
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5648,7 +6217,20 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtAbstractInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtAbstractInterfaceDef_ptr &
+  );
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -5659,3 +6241,18 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     CORBA::LocalInterfaceDef_ptr &
   );
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtLocalInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtLocalInterfaceDef_ptr &
+  );
+
+
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index 422c01ff809..8919e874581 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "IFR_Client_Adapter_Impl.h"
 #include "IFR_ExtendedC.h"
 #include "tao/ORB_Core.h"
@@ -58,7 +60,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
 
   CORBA::Repository_var repo =
     CORBA::Repository::_narrow (obj.in ()
-                               ACE_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
 
   if (CORBA::is_nil (repo.in ()))
@@ -68,7 +70,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
     }
 
   CORBA::Contained_var result = repo->lookup_id (repo_id
-                                                ACE_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
 
   if (CORBA::is_nil (result.in ()))
@@ -78,7 +80,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
   else
     {
       return CORBA::InterfaceDef::_narrow (result.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
     }
 }
 
@@ -97,13 +99,16 @@ TAO_IFR_Client_Adapter_Impl::get_interface_remote (
       // CORBA::OBJECT_NOT_EXIST then we must return 1, instead of
       // propagating the exception.
       TAO_Stub *istub = target->_stubobj ();
+
       if (istub == 0)
-        ACE_THROW_RETURN (CORBA::INTERNAL (
-                            CORBA::SystemException::_tao_minor_code (
-                              TAO_DEFAULT_MINOR_CODE,
-                              EINVAL),
-                            CORBA::COMPLETED_NO),
-                          _tao_retval);
+        {
+          ACE_THROW_RETURN (CORBA::INTERNAL (
+                              CORBA::SystemException::_tao_minor_code (
+                                TAO_DEFAULT_MINOR_CODE,
+                                EINVAL),
+                              CORBA::COMPLETED_NO),
+                            _tao_retval);
+        }
 
       TAO_GIOP_Twoway_Invocation _tao_call (istub,
                                             "_interface",
@@ -133,19 +138,25 @@ TAO_IFR_Client_Adapter_Impl::get_interface_remote (
             }
 
           ACE_ASSERT (_invoke_status != TAO_INVOKE_EXCEPTION);
+
           if (_invoke_status != TAO_INVOKE_OK)
             {
               ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
                                                 CORBA::COMPLETED_YES),
                                 CORBA::InterfaceDef::_nil ());
             }
+
           break;
         }
       TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+
       if (!(
             (_tao_in >> _tao_safe_retval.inout ())
             ))
-        ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::InterfaceDef::_nil ());
+        {
+          ACE_THROW_RETURN (CORBA::MARSHAL (), 
+                            CORBA::InterfaceDef::_nil ());
+        }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
@@ -162,5810 +173,11 @@ TAO_IFR_Client_Adapter_Impl::get_interface_remote (
 
 // *********************************************************************
 
-// Initialization of IFR typecodes that are in the CORBA namespace.
-
-static const CORBA::Long _oc_CORBA_Identifier[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4964),
-  ACE_NTOHL (0x656e7469),
-  ACE_NTOHL (0x66696572),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-  11,
-  ACE_NTOHL (0x4964656e),
-  ACE_NTOHL (0x74696669),
-  ACE_NTOHL (0x65720000),  // name = Identifier
-  CORBA::tk_string,
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Identifier (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_Identifier),
-    (char *) &_oc_CORBA_Identifier,
-    0,
-    sizeof (CORBA::Identifier)
-  );
-
-static const CORBA::Long _oc_CORBA_ScopedName[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5363),
-  ACE_NTOHL (0x6f706564),
-  ACE_NTOHL (0x4e616d65),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ScopedName:1.0
-  11,
-  ACE_NTOHL (0x53636f70),
-  ACE_NTOHL (0x65644e61),
-  ACE_NTOHL (0x6d650000),  // name = ScopedName
-  CORBA::tk_string,
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ScopedName (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ScopedName),
-    (char *) &_oc_CORBA_ScopedName,
-    0,
-    sizeof (CORBA::ScopedName)
-  );
-
-static const CORBA::Long _oc_CORBA_RepositoryId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x49643a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-  13,
-  ACE_NTOHL (0x5265706f),
-  ACE_NTOHL (0x7369746f),
-  ACE_NTOHL (0x72794964),
-  ACE_NTOHL (0x0),  // name = RepositoryId
-  CORBA::tk_string,
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_RepositoryId (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_RepositoryId),
-    (char *) &_oc_CORBA_RepositoryId,
-    0,
-    sizeof (CORBA::RepositoryId)
-  );
-
-static const CORBA::Long _oc_CORBA_Visibility[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5669),
-  ACE_NTOHL (0x73696269),
-  ACE_NTOHL (0x6c697479),
-  ACE_NTOHL (0x3a312e30),
-  9,
-  ACE_NTOHL (0x62696c69),
-  ACE_NTOHL (0x74790000),  // name = Visibility
-  CORBA::tk_short,
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Visibility (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_Visibility),
-    (char *) &_oc_CORBA_Visibility,
-    0,
-    sizeof (CORBA::Visibility)
-  );
-
-static const CORBA::Long _oc_CORBA_ValueModifier[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  28,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c75654d),
-  ACE_NTOHL (0x6f646966),
-  ACE_NTOHL (0x6965723a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:CORBA/ValueModifier:1.0
-  14,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x654d6f64),
-  ACE_NTOHL (0x69666965),
-  ACE_NTOHL (0x72000000),  // name = ValueModifier
-  CORBA::tk_short,
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueModifier (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ValueModifier),
-    (char *) &_oc_CORBA_ValueModifier,
-    0,
-    sizeof (CORBA::ValueModifier)
-  );
-
-static const CORBA::Long _oc_CORBA_DefinitionKind[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4465),
-  ACE_NTOHL (0x66696e69),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x4b696e64),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
-  15,
-  ACE_NTOHL (0x44656669),
-  ACE_NTOHL (0x6e697469),
-  ACE_NTOHL (0x6f6e4b69),
-  ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-  26, // member count
-  8,
-  ACE_NTOHL (0x646b5f6e),
-  ACE_NTOHL (0x6f6e6500),  // name = dk_none
-  7,
-  ACE_NTOHL (0x646b5f61),
-  ACE_NTOHL (0x6c6c0000),  // name = dk_all
-  13,
-  ACE_NTOHL (0x646b5f41),
-  ACE_NTOHL (0x74747269),
-  ACE_NTOHL (0x62757465),
-  ACE_NTOHL (0x0),  // name = dk_Attribute
-  12,
-  ACE_NTOHL (0x646b5f43),
-  ACE_NTOHL (0x6f6e7374),
-  ACE_NTOHL (0x616e7400),  // name = dk_Constant
-  13,
-  ACE_NTOHL (0x646b5f45),
-  ACE_NTOHL (0x78636570),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x0),  // name = dk_Exception
-  13,
-  ACE_NTOHL (0x646b5f49),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
-  ACE_NTOHL (0x0),  // name = dk_Interface
-  10,
-  ACE_NTOHL (0x646b5f4d),
-  ACE_NTOHL (0x6f64756c),
-  ACE_NTOHL (0x65000000),  // name = dk_Module
-  13,
-  ACE_NTOHL (0x646b5f4f),
-  ACE_NTOHL (0x70657261),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x0),  // name = dk_Operation
-  11,
-  ACE_NTOHL (0x646b5f54),
-  ACE_NTOHL (0x79706564),
-  ACE_NTOHL (0x65660000),  // name = dk_Typedef
-  9,
-  ACE_NTOHL (0x646b5f41),
-  ACE_NTOHL (0x6c696173),
-  ACE_NTOHL (0x0),  // name = dk_Alias
-  10,
-  ACE_NTOHL (0x646b5f53),
-  ACE_NTOHL (0x74727563),
-  ACE_NTOHL (0x74000000),  // name = dk_Struct
-  9,
-  ACE_NTOHL (0x646b5f55),
-  ACE_NTOHL (0x6e696f6e),
-  ACE_NTOHL (0x0),  // name = dk_Union
-  8,
-  ACE_NTOHL (0x646b5f45),
-  ACE_NTOHL (0x6e756d00),  // name = dk_Enum
-  13,
-  ACE_NTOHL (0x646b5f50),
-  ACE_NTOHL (0x72696d69),
-  ACE_NTOHL (0x74697665),
-  ACE_NTOHL (0x0),  // name = dk_Primitive
-  10,
-  ACE_NTOHL (0x646b5f53),
-  ACE_NTOHL (0x7472696e),
-  ACE_NTOHL (0x67000000),  // name = dk_String
-  12,
-  ACE_NTOHL (0x646b5f53),
-  ACE_NTOHL (0x65717565),
-  ACE_NTOHL (0x6e636500),  // name = dk_Sequence
-  9,
-  ACE_NTOHL (0x646b5f41),
-  ACE_NTOHL (0x72726179),
-  ACE_NTOHL (0x0),  // name = dk_Array
-  14,
-  ACE_NTOHL (0x646b5f52),
-  ACE_NTOHL (0x65706f73),
-  ACE_NTOHL (0x69746f72),
-  ACE_NTOHL (0x79000000),  // name = dk_Repository
-  11,
-  ACE_NTOHL (0x646b5f57),
-  ACE_NTOHL (0x73747269),
-  ACE_NTOHL (0x6e670000),  // name = dk_Wstring
-  9,
-  ACE_NTOHL (0x646b5f46),
-  ACE_NTOHL (0x69786564),
-  ACE_NTOHL (0x0),  // name = dk_Fixed
-  9,
-  ACE_NTOHL (0x646b5f56),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x0),  // name = dk_Value
-  12,
-  ACE_NTOHL (0x646b5f56),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
-  15,
-  ACE_NTOHL (0x646b5f56),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x4d656d62),
-  ACE_NTOHL (0x65720000),  // name = dk_ValueMember
-  10,
-  ACE_NTOHL (0x646b5f4e),
-  ACE_NTOHL (0x61746976),
-  ACE_NTOHL (0x65000000),  // name = dk_Native
-  21,
-  ACE_NTOHL (0x646b5f41),
-  ACE_NTOHL (0x62737472),
-  ACE_NTOHL (0x61637449),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
-  ACE_NTOHL (0x0),  // name = dk_AbstractInterface
-  18,
-  ACE_NTOHL (0x646b5f4c),
-  ACE_NTOHL (0x6f63616c),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DefinitionKind (
-    CORBA::tk_enum,
-    sizeof (_oc_CORBA_DefinitionKind),
-    (char *) &_oc_CORBA_DefinitionKind,
-    0,
-    sizeof (CORBA::DefinitionKind)
-  );
-
-static const CORBA::Long _oc_CORBA_IRObject[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4952),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63743a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/IRObject:1.0
-  9,
-  ACE_NTOHL (0x49524f62),
-  ACE_NTOHL (0x6a656374),
-  ACE_NTOHL (0x0),  // name = IRObject
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_IRObject (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_IRObject),
-    (char *) &_oc_CORBA_IRObject,
-    0,
-    sizeof (CORBA::IRObject)
-  );
-
-static const CORBA::Long _oc_CORBA_VersionSpec[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5665),
-  ACE_NTOHL (0x7273696f),
-  ACE_NTOHL (0x6e537065),
-  ACE_NTOHL (0x633a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-  12,
-  ACE_NTOHL (0x56657273),
-  ACE_NTOHL (0x696f6e53),
-  ACE_NTOHL (0x70656300),  // name = VersionSpec
-  CORBA::tk_string,
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_VersionSpec (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_VersionSpec),
-    (char *) &_oc_CORBA_VersionSpec,
-    0,
-    sizeof (CORBA::VersionSpec)
-  );
-
-static const CORBA::Long _oc_CORBA_Contained[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746169),
-  ACE_NTOHL (0x6e65643a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
-  10,
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x61696e65),
-  ACE_NTOHL (0x64000000),  // name = Contained
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Contained (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_Contained),
-    (char *) &_oc_CORBA_Contained,
-    0,
-    sizeof (CORBA::Contained)
-  );
-
-static const CORBA::Long _oc_CORBA_ContainedSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746169),
-  ACE_NTOHL (0x6e656453),
-  ACE_NTOHL (0x65713a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContainedSeq:1.0
-  13,
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x61696e65),
-  ACE_NTOHL (0x64536571),
-  ACE_NTOHL (0x0),  // name = ContainedSeq
-  CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      32,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f436f),
-      ACE_NTOHL (0x6e746169),
-      ACE_NTOHL (0x6e65643a),
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
-      10,
-      ACE_NTOHL (0x436f6e74),
-      ACE_NTOHL (0x61696e65),
-      ACE_NTOHL (0x64000000),  // name = Contained
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ContainedSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ContainedSeq),
-    (char *) &_oc_CORBA_ContainedSeq,
-    0,
-    sizeof (CORBA::ContainedSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_InterfaceDefSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65665365),
-  ACE_NTOHL (0x713a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InterfaceDefSeq:1.0
-  16,
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446566),
-  ACE_NTOHL (0x53657100),  // name = InterfaceDefSeq
-  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
-      35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f496e),
-      ACE_NTOHL (0x74657266),
-      ACE_NTOHL (0x61636544),
-      ACE_NTOHL (0x65663a31),
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-      13,
-      ACE_NTOHL (0x496e7465),
-      ACE_NTOHL (0x72666163),
-      ACE_NTOHL (0x65446566),
-      ACE_NTOHL (0x0),  // name = InterfaceDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_InterfaceDefSeq),
-    (char *) &_oc_CORBA_InterfaceDefSeq,
-    0,
-    sizeof (CORBA::InterfaceDefSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_AbstractInterfaceDefSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4162),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x6374496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65665365),
-  ACE_NTOHL (0x713a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0
-  24,
-  ACE_NTOHL (0x41627374),
-  ACE_NTOHL (0x72616374),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446566),
-  ACE_NTOHL (0x53657100),  // name = AbstractInterfaceDefSeq
-  CORBA::tk_sequence, // typecode kind
-  96, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    80, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      43,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4162),
-      ACE_NTOHL (0x73747261),
-      ACE_NTOHL (0x6374496e),
-      ACE_NTOHL (0x74657266),
-      ACE_NTOHL (0x61636544),
-      ACE_NTOHL (0x65663a31),
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDef:1.0
-      21,
-      ACE_NTOHL (0x41627374),
-      ACE_NTOHL (0x72616374),
-      ACE_NTOHL (0x496e7465),
-      ACE_NTOHL (0x72666163),
-      ACE_NTOHL (0x65446566),
-      ACE_NTOHL (0x0),  // name = AbstractInterfaceDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AbstractInterfaceDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_AbstractInterfaceDefSeq),
-    (char *) &_oc_CORBA_AbstractInterfaceDefSeq,
-    0,
-    sizeof (CORBA::AbstractInterfaceDefSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_LocalInterfaceDefSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4c6f),
-  ACE_NTOHL (0x63616c49),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
-  ACE_NTOHL (0x44656653),
-  ACE_NTOHL (0x65713a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0
-  21,
-  ACE_NTOHL (0x4c6f6361),
-  ACE_NTOHL (0x6c496e74),
-  ACE_NTOHL (0x65726661),
-  ACE_NTOHL (0x63654465),
-  ACE_NTOHL (0x66536571),
-  ACE_NTOHL (0x0),  // name = LocalInterfaceDefSeq
-  CORBA::tk_sequence, // typecode kind
-  88, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    72, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      40,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4c6f),
-      ACE_NTOHL (0x63616c49),
-      ACE_NTOHL (0x6e746572),
-      ACE_NTOHL (0x66616365),
-      ACE_NTOHL (0x4465663a),
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDef:1.0
-      18,
-      ACE_NTOHL (0x4c6f6361),
-      ACE_NTOHL (0x6c496e74),
-      ACE_NTOHL (0x65726661),
-      ACE_NTOHL (0x63654465),
-      ACE_NTOHL (0x66000000),  // name = LocalInterfaceDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_LocalInterfaceDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_LocalInterfaceDefSeq),
-    (char *) &_oc_CORBA_LocalInterfaceDefSeq,
-    0,
-    sizeof (CORBA::LocalInterfaceDefSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_StructMember[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5374),
-  ACE_NTOHL (0x72756374),
-  ACE_NTOHL (0x4d656d62),
-  ACE_NTOHL (0x65723a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-  13,
-  ACE_NTOHL (0x53747275),
-  ACE_NTOHL (0x63744d65),
-  ACE_NTOHL (0x6d626572),
-  ACE_NTOHL (0x0),  // name = StructMember
-  3, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-  5,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  9,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x5f646566),
-  ACE_NTOHL (0x0),  // name = type_def
-  CORBA::tk_objref, // typecode kind
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4944),
-    ACE_NTOHL (0x4c547970),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-    8,
-    ACE_NTOHL (0x49444c54),
-    ACE_NTOHL (0x79706500),  // name = IDLType
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMember (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_StructMember),
-    (char *) &_oc_CORBA_StructMember,
-    0,
-    sizeof (CORBA::StructMember)
-  );
-
-static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5374),
-  ACE_NTOHL (0x72756374),
-  ACE_NTOHL (0x4d656d62),
-  ACE_NTOHL (0x65725365),
-  ACE_NTOHL (0x713a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-  16,
-  ACE_NTOHL (0x53747275),
-  ACE_NTOHL (0x63744d65),
-  ACE_NTOHL (0x6d626572),
-  ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-  CORBA::tk_sequence, // typecode kind
-  264, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    248, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5374),
-      ACE_NTOHL (0x72756374),
-      ACE_NTOHL (0x4d656d62),
-      ACE_NTOHL (0x65723a31),
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-      13,
-      ACE_NTOHL (0x53747275),
-      ACE_NTOHL (0x63744d65),
-      ACE_NTOHL (0x6d626572),
-      ACE_NTOHL (0x0),  // name = StructMember
-      3, // member count
-      5,
-      ACE_NTOHL (0x6e616d65),
-      ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
-        ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
-        0U, // string length
-
-      5,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-      9,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x5f646566),
-      ACE_NTOHL (0x0),  // name = type_def
-      CORBA::tk_objref, // typecode kind
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4944),
-        ACE_NTOHL (0x4c547970),
-        ACE_NTOHL (0x653a312e),
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8,
-        ACE_NTOHL (0x49444c54),
-        ACE_NTOHL (0x79706500),  // name = IDLType
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMemberSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_StructMemberSeq),
-    (char *) &_oc_CORBA_StructMemberSeq,
-    0,
-    sizeof (CORBA::StructMemberSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_Initializer[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x69746961),
-  ACE_NTOHL (0x6c697a65),
-  ACE_NTOHL (0x723a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
-  12,
-  ACE_NTOHL (0x496e6974),
-  ACE_NTOHL (0x69616c69),
-  ACE_NTOHL (0x7a657200),  // name = Initializer
-  2, // member count
-  8,
-  ACE_NTOHL (0x6d656d62),
-  ACE_NTOHL (0x65727300),  // name = members
-  CORBA::tk_alias, // typecode kind for typedefs
-  340, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5374),
-    ACE_NTOHL (0x72756374),
-    ACE_NTOHL (0x4d656d62),
-    ACE_NTOHL (0x65725365),
-    ACE_NTOHL (0x713a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-    16,
-    ACE_NTOHL (0x53747275),
-    ACE_NTOHL (0x63744d65),
-    ACE_NTOHL (0x6d626572),
-    ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-    CORBA::tk_sequence, // typecode kind
-    264, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      248, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5374),
-        ACE_NTOHL (0x72756374),
-        ACE_NTOHL (0x4d656d62),
-        ACE_NTOHL (0x65723a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-        13,
-        ACE_NTOHL (0x53747275),
-        ACE_NTOHL (0x63744d65),
-        ACE_NTOHL (0x6d626572),
-        ACE_NTOHL (0x0),  // name = StructMember
-        3, // member count
-        5,
-        ACE_NTOHL (0x6e616d65),
-        ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
-          ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string,
-          0U, // string length
-
-        5,
-        ACE_NTOHL (0x74797065),
-        ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
-
-        9,
-        ACE_NTOHL (0x74797065),
-        ACE_NTOHL (0x5f646566),
-        ACE_NTOHL (0x0),  // name = type_def
-        CORBA::tk_objref, // typecode kind
-        52, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          30,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4944),
-          ACE_NTOHL (0x4c547970),
-          ACE_NTOHL (0x653a312e),
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-          8,
-          ACE_NTOHL (0x49444c54),
-          ACE_NTOHL (0x79706500),  // name = IDLType
-
-
-      0U,
-
-
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Initializer (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_Initializer),
-    (char *) &_oc_CORBA_Initializer,
-    0,
-    sizeof (CORBA::Initializer)
-  );
-
-static const CORBA::Long _oc_CORBA_InitializerSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x69746961),
-  ACE_NTOHL (0x6c697a65),
-  ACE_NTOHL (0x72536571),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InitializerSeq:1.0
-  15,
-  ACE_NTOHL (0x496e6974),
-  ACE_NTOHL (0x69616c69),
-  ACE_NTOHL (0x7a657253),
-  ACE_NTOHL (0x65710000),  // name = InitializerSeq
-  CORBA::tk_sequence, // typecode kind
-  528, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    512, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f496e),
-      ACE_NTOHL (0x69746961),
-      ACE_NTOHL (0x6c697a65),
-      ACE_NTOHL (0x723a312e),
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
-      12,
-      ACE_NTOHL (0x496e6974),
-      ACE_NTOHL (0x69616c69),
-      ACE_NTOHL (0x7a657200),  // name = Initializer
-      2, // member count
-      8,
-      ACE_NTOHL (0x6d656d62),
-      ACE_NTOHL (0x65727300),  // name = members
-      CORBA::tk_alias, // typecode kind for typedefs
-      340, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        38,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5374),
-        ACE_NTOHL (0x72756374),
-        ACE_NTOHL (0x4d656d62),
-        ACE_NTOHL (0x65725365),
-        ACE_NTOHL (0x713a312e),
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-        16,
-        ACE_NTOHL (0x53747275),
-        ACE_NTOHL (0x63744d65),
-        ACE_NTOHL (0x6d626572),
-        ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-        CORBA::tk_sequence, // typecode kind
-        264, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_struct, // typecode kind
-          248, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            35,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f5374),
-            ACE_NTOHL (0x72756374),
-            ACE_NTOHL (0x4d656d62),
-            ACE_NTOHL (0x65723a31),
-            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-            13,
-            ACE_NTOHL (0x53747275),
-            ACE_NTOHL (0x63744d65),
-            ACE_NTOHL (0x6d626572),
-            ACE_NTOHL (0x0),  // name = StructMember
-            3, // member count
-            5,
-            ACE_NTOHL (0x6e616d65),
-            ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              33,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4964),
-              ACE_NTOHL (0x656e7469),
-              ACE_NTOHL (0x66696572),
-              ACE_NTOHL (0x3a312e30),
-              ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-              11,
-              ACE_NTOHL (0x4964656e),
-              ACE_NTOHL (0x74696669),
-              ACE_NTOHL (0x65720000),  // name = Identifier
-              CORBA::tk_string,
-              0U, // string length
-
-            5,
-            ACE_NTOHL (0x74797065),
-            ACE_NTOHL (0x0),  // name = type
-            CORBA::tk_TypeCode,
-
-            9,
-            ACE_NTOHL (0x74797065),
-            ACE_NTOHL (0x5f646566),
-            ACE_NTOHL (0x0),  // name = type_def
-            CORBA::tk_objref, // typecode kind
-            52, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              30,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4944),
-              ACE_NTOHL (0x4c547970),
-              ACE_NTOHL (0x653a312e),
-              ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-              8,
-              ACE_NTOHL (0x49444c54),
-              ACE_NTOHL (0x79706500),  // name = IDLType
-
-
-          0U,
-
-
-      5,
-      ACE_NTOHL (0x6e616d65),
-      ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
-        ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
-        0U, // string length
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InitializerSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_InitializerSeq),
-    (char *) &_oc_CORBA_InitializerSeq,
-    0,
-    sizeof (CORBA::InitializerSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_UnionMember[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f556e),
-  ACE_NTOHL (0x696f6e4d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x723a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
-  12,
-  ACE_NTOHL (0x556e696f),
-  ACE_NTOHL (0x6e4d656d),
-  ACE_NTOHL (0x62657200),  // name = UnionMember
-  4, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-  6,
-  ACE_NTOHL (0x6c616265),
-  ACE_NTOHL (0x6c000000),  // name = label
-  CORBA::tk_any,
-
-  5,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  9,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x5f646566),
-  ACE_NTOHL (0x0),  // name = type_def
-  CORBA::tk_objref, // typecode kind
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4944),
-    ACE_NTOHL (0x4c547970),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-    8,
-    ACE_NTOHL (0x49444c54),
-    ACE_NTOHL (0x79706500),  // name = IDLType
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMember (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_UnionMember),
-    (char *) &_oc_CORBA_UnionMember,
-    0,
-    sizeof (CORBA::UnionMember)
-  );
-
-static const CORBA::Long _oc_CORBA_UnionMemberSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f556e),
-  ACE_NTOHL (0x696f6e4d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x72536571),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/UnionMemberSeq:1.0
-  15,
-  ACE_NTOHL (0x556e696f),
-  ACE_NTOHL (0x6e4d656d),
-  ACE_NTOHL (0x62657253),
-  ACE_NTOHL (0x65710000),  // name = UnionMemberSeq
-  CORBA::tk_sequence, // typecode kind
-  276, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    260, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f556e),
-      ACE_NTOHL (0x696f6e4d),
-      ACE_NTOHL (0x656d6265),
-      ACE_NTOHL (0x723a312e),
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
-      12,
-      ACE_NTOHL (0x556e696f),
-      ACE_NTOHL (0x6e4d656d),
-      ACE_NTOHL (0x62657200),  // name = UnionMember
-      4, // member count
-      5,
-      ACE_NTOHL (0x6e616d65),
-      ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
-        ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
-        0U, // string length
-
-      6,
-      ACE_NTOHL (0x6c616265),
-      ACE_NTOHL (0x6c000000),  // name = label
-      CORBA::tk_any,
-
-      5,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-      9,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x5f646566),
-      ACE_NTOHL (0x0),  // name = type_def
-      CORBA::tk_objref, // typecode kind
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4944),
-        ACE_NTOHL (0x4c547970),
-        ACE_NTOHL (0x653a312e),
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8,
-        ACE_NTOHL (0x49444c54),
-        ACE_NTOHL (0x79706500),  // name = IDLType
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMemberSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_UnionMemberSeq),
-    (char *) &_oc_CORBA_UnionMemberSeq,
-    0,
-    sizeof (CORBA::UnionMemberSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_EnumMemberSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f456e),
-  ACE_NTOHL (0x756d4d65),
-  ACE_NTOHL (0x6d626572),
-  ACE_NTOHL (0x5365713a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/EnumMemberSeq:1.0
-  14,
-  ACE_NTOHL (0x456e756d),
-  ACE_NTOHL (0x4d656d62),
-  ACE_NTOHL (0x65725365),
-  ACE_NTOHL (0x71000000),  // name = EnumMemberSeq
-  CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      33,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4964),
-      ACE_NTOHL (0x656e7469),
-      ACE_NTOHL (0x66696572),
-      ACE_NTOHL (0x3a312e30),
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-      11,
-      ACE_NTOHL (0x4964656e),
-      ACE_NTOHL (0x74696669),
-      ACE_NTOHL (0x65720000),  // name = Identifier
-      CORBA::tk_string,
-      0U, // string length
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_EnumMemberSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_EnumMemberSeq),
-    (char *) &_oc_CORBA_EnumMemberSeq,
-    0,
-    sizeof (CORBA::EnumMemberSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_Container[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746169),
-  ACE_NTOHL (0x6e65723a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container:1.0
-  10,
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x61696e65),
-  ACE_NTOHL (0x72000000),  // name = Container
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Container (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_Container),
-    (char *) &_oc_CORBA_Container,
-    0,
-    sizeof (CORBA::Container)
-  );
-
-static const CORBA::Long _oc_CORBA_IDLType[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4944),
-  ACE_NTOHL (0x4c547970),
-  ACE_NTOHL (0x653a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-  8,
-  ACE_NTOHL (0x49444c54),
-  ACE_NTOHL (0x79706500),  // name = IDLType
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_IDLType (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_IDLType),
-    (char *) &_oc_CORBA_IDLType,
-    0,
-    sizeof (CORBA::IDLType)
-  );
-
-static const CORBA::Long _oc_CORBA_TypedefDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5479),
-  ACE_NTOHL (0x70656465),
-  ACE_NTOHL (0x66446566),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/TypedefDef:1.0
-  11,
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x64656644),
-  ACE_NTOHL (0x65660000),  // name = TypedefDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_TypedefDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_TypedefDef),
-    (char *) &_oc_CORBA_TypedefDef,
-    0,
-    sizeof (CORBA::TypedefDef)
-  );
-
-static const CORBA::Long _oc_CORBA_TypeDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5479),
-  ACE_NTOHL (0x70654465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e3a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/TypeDescription:1.0
-  16,
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e00),  // name = TypeDescription
-  5, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
-  ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  8,
-  ACE_NTOHL (0x76657273),
-  ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
-    0U, // string length
-
-  5,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_TypeDescription (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_TypeDescription),
-    (char *) &_oc_CORBA_TypeDescription,
-    0,
-    sizeof (CORBA::TypeDescription)
-  );
-
-static const CORBA::Long _oc_CORBA_PrimitiveKind[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5072),
-  ACE_NTOHL (0x696d6974),
-  ACE_NTOHL (0x6976654b),
-  ACE_NTOHL (0x696e643a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PrimitiveKind:1.0
-  14,
-  ACE_NTOHL (0x5072696d),
-  ACE_NTOHL (0x69746976),
-  ACE_NTOHL (0x654b696e),
-  ACE_NTOHL (0x64000000),  // name = PrimitiveKind
-  22, // member count
-  8,
-  ACE_NTOHL (0x706b5f6e),
-  ACE_NTOHL (0x756c6c00),  // name = pk_null
-  8,
-  ACE_NTOHL (0x706b5f76),
-  ACE_NTOHL (0x6f696400),  // name = pk_void
-  9,
-  ACE_NTOHL (0x706b5f73),
-  ACE_NTOHL (0x686f7274),
-  ACE_NTOHL (0x0),  // name = pk_short
-  8,
-  ACE_NTOHL (0x706b5f6c),
-  ACE_NTOHL (0x6f6e6700),  // name = pk_long
-  10,
-  ACE_NTOHL (0x706b5f75),
-  ACE_NTOHL (0x73686f72),
-  ACE_NTOHL (0x74000000),  // name = pk_ushort
-  9,
-  ACE_NTOHL (0x706b5f75),
-  ACE_NTOHL (0x6c6f6e67),
-  ACE_NTOHL (0x0),  // name = pk_ulong
-  9,
-  ACE_NTOHL (0x706b5f66),
-  ACE_NTOHL (0x6c6f6174),
-  ACE_NTOHL (0x0),  // name = pk_float
-  10,
-  ACE_NTOHL (0x706b5f64),
-  ACE_NTOHL (0x6f75626c),
-  ACE_NTOHL (0x65000000),  // name = pk_double
-  11,
-  ACE_NTOHL (0x706b5f62),
-  ACE_NTOHL (0x6f6f6c65),
-  ACE_NTOHL (0x616e0000),  // name = pk_boolean
-  8,
-  ACE_NTOHL (0x706b5f63),
-  ACE_NTOHL (0x68617200),  // name = pk_char
-  9,
-  ACE_NTOHL (0x706b5f6f),
-  ACE_NTOHL (0x63746574),
-  ACE_NTOHL (0x0),  // name = pk_octet
-  7,
-  ACE_NTOHL (0x706b5f61),
-  ACE_NTOHL (0x6e790000),  // name = pk_any
-  12,
-  ACE_NTOHL (0x706b5f54),
-  ACE_NTOHL (0x79706543),
-  ACE_NTOHL (0x6f646500),  // name = pk_TypeCode
-  13,
-  ACE_NTOHL (0x706b5f50),
-  ACE_NTOHL (0x72696e63),
-  ACE_NTOHL (0x6970616c),
-  ACE_NTOHL (0x0),  // name = pk_Principal
-  10,
-  ACE_NTOHL (0x706b5f73),
-  ACE_NTOHL (0x7472696e),
-  ACE_NTOHL (0x67000000),  // name = pk_string
-  10,
-  ACE_NTOHL (0x706b5f6f),
-  ACE_NTOHL (0x626a7265),
-  ACE_NTOHL (0x66000000),  // name = pk_objref
-  12,
-  ACE_NTOHL (0x706b5f6c),
-  ACE_NTOHL (0x6f6e676c),
-  ACE_NTOHL (0x6f6e6700),  // name = pk_longlong
-  13,
-  ACE_NTOHL (0x706b5f75),
-  ACE_NTOHL (0x6c6f6e67),
-  ACE_NTOHL (0x6c6f6e67),
-  ACE_NTOHL (0x0),  // name = pk_ulonglong
-  14,
-  ACE_NTOHL (0x706b5f6c),
-  ACE_NTOHL (0x6f6e6764),
-  ACE_NTOHL (0x6f75626c),
-  ACE_NTOHL (0x65000000),  // name = pk_longdouble
-  9,
-  ACE_NTOHL (0x706b5f77),
-  ACE_NTOHL (0x63686172),
-  ACE_NTOHL (0x0),  // name = pk_wchar
-  11,
-  ACE_NTOHL (0x706b5f77),
-  ACE_NTOHL (0x73747269),
-  ACE_NTOHL (0x6e670000),  // name = pk_wstring
-  14,
-  ACE_NTOHL (0x706b5f76),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x5f626173),
-  ACE_NTOHL (0x65000000),  // name = pk_value_base
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PrimitiveKind (
-    CORBA::tk_enum,
-    sizeof (_oc_CORBA_PrimitiveKind),
-    (char *) &_oc_CORBA_PrimitiveKind,
-    0,
-    sizeof (CORBA::PrimitiveKind)
-  );
-
-static const CORBA::Long _oc_CORBA_Repository[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Repository:1.0
-  11,
-  ACE_NTOHL (0x5265706f),
-  ACE_NTOHL (0x7369746f),
-  ACE_NTOHL (0x72790000),  // name = Repository
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Repository (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_Repository),
-    (char *) &_oc_CORBA_Repository,
-    0,
-    sizeof (CORBA::Repository)
-  );
-
-static const CORBA::Long _oc_CORBA_ModuleDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4d6f),
-  ACE_NTOHL (0x64756c65),
-  ACE_NTOHL (0x4465663a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ModuleDef:1.0
-  10,
-  ACE_NTOHL (0x4d6f6475),
-  ACE_NTOHL (0x6c654465),
-  ACE_NTOHL (0x66000000),  // name = ModuleDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ModuleDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_ModuleDef),
-    (char *) &_oc_CORBA_ModuleDef,
-    0,
-    sizeof (CORBA::ModuleDef)
-  );
-
-static const CORBA::Long _oc_CORBA_ModuleDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4d6f),
-  ACE_NTOHL (0x64756c65),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e3a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ModuleDescription:1.0
-  18,
-  ACE_NTOHL (0x4d6f6475),
-  ACE_NTOHL (0x6c654465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e000000),  // name = ModuleDescription
-  4, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
-  ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  8,
-  ACE_NTOHL (0x76657273),
-  ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
-    0U, // string length
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ModuleDescription (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ModuleDescription),
-    (char *) &_oc_CORBA_ModuleDescription,
-    0,
-    sizeof (CORBA::ModuleDescription)
-  );
-
-static const CORBA::Long _oc_CORBA_ConstantDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e737461),
-  ACE_NTOHL (0x6e744465),
-  ACE_NTOHL (0x663a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ConstantDef:1.0
-  12,
-  ACE_NTOHL (0x436f6e73),
-  ACE_NTOHL (0x74616e74),
-  ACE_NTOHL (0x44656600),  // name = ConstantDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstantDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_ConstantDef),
-    (char *) &_oc_CORBA_ConstantDef,
-    0,
-    sizeof (CORBA::ConstantDef)
-  );
-
-static const CORBA::Long _oc_CORBA_ConstantDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e737461),
-  ACE_NTOHL (0x6e744465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e3a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ConstantDescription:1.0
-  20,
-  ACE_NTOHL (0x436f6e73),
-  ACE_NTOHL (0x74616e74),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e00),  // name = ConstantDescription
-  6, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
-  ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  8,
-  ACE_NTOHL (0x76657273),
-  ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
-    0U, // string length
-
-  5,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  6,
-  ACE_NTOHL (0x76616c75),
-  ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_any,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstantDescription (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ConstantDescription),
-    (char *) &_oc_CORBA_ConstantDescription,
-    0,
-    sizeof (CORBA::ConstantDescription)
-  );
-
-static const CORBA::Long _oc_CORBA_StructDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5374),
-  ACE_NTOHL (0x72756374),
-  ACE_NTOHL (0x4465663a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StructDef:1.0
-  10,
-  ACE_NTOHL (0x53747275),
-  ACE_NTOHL (0x63744465),
-  ACE_NTOHL (0x66000000),  // name = StructDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StructDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_StructDef),
-    (char *) &_oc_CORBA_StructDef,
-    0,
-    sizeof (CORBA::StructDef)
-  );
-
-static const CORBA::Long _oc_CORBA_UnionDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f556e),
-  ACE_NTOHL (0x696f6e44),
-  ACE_NTOHL (0x65663a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/UnionDef:1.0
-  9,
-  ACE_NTOHL (0x556e696f),
-  ACE_NTOHL (0x6e446566),
-  ACE_NTOHL (0x0),  // name = UnionDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_UnionDef),
-    (char *) &_oc_CORBA_UnionDef,
-    0,
-    sizeof (CORBA::UnionDef)
-  );
-
-static const CORBA::Long _oc_CORBA_EnumDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f456e),
-  ACE_NTOHL (0x756d4465),
-  ACE_NTOHL (0x663a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/EnumDef:1.0
-  8,
-  ACE_NTOHL (0x456e756d),
-  ACE_NTOHL (0x44656600),  // name = EnumDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_EnumDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_EnumDef),
-    (char *) &_oc_CORBA_EnumDef,
-    0,
-    sizeof (CORBA::EnumDef)
-  );
-
-static const CORBA::Long _oc_CORBA_AliasDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f416c),
-  ACE_NTOHL (0x69617344),
-  ACE_NTOHL (0x65663a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AliasDef:1.0
-  9,
-  ACE_NTOHL (0x416c6961),
-  ACE_NTOHL (0x73446566),
-  ACE_NTOHL (0x0),  // name = AliasDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AliasDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_AliasDef),
-    (char *) &_oc_CORBA_AliasDef,
-    0,
-    sizeof (CORBA::AliasDef)
-  );
-
-static const CORBA::Long _oc_CORBA_NativeDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4e61),
-  ACE_NTOHL (0x74697665),
-  ACE_NTOHL (0x4465663a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/NativeDef:1.0
-  10,
-  ACE_NTOHL (0x4e617469),
-  ACE_NTOHL (0x76654465),
-  ACE_NTOHL (0x66000000),  // name = NativeDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_NativeDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_NativeDef),
-    (char *) &_oc_CORBA_NativeDef,
-    0,
-    sizeof (CORBA::NativeDef)
-  );
-
-static const CORBA::Long _oc_CORBA_PrimitiveDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5072),
-  ACE_NTOHL (0x696d6974),
-  ACE_NTOHL (0x69766544),
-  ACE_NTOHL (0x65663a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/PrimitiveDef:1.0
-  13,
-  ACE_NTOHL (0x5072696d),
-  ACE_NTOHL (0x69746976),
-  ACE_NTOHL (0x65446566),
-  ACE_NTOHL (0x0),  // name = PrimitiveDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PrimitiveDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_PrimitiveDef),
-    (char *) &_oc_CORBA_PrimitiveDef,
-    0,
-    sizeof (CORBA::PrimitiveDef)
-  );
-
-static const CORBA::Long _oc_CORBA_StringDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5374),
-  ACE_NTOHL (0x72696e67),
-  ACE_NTOHL (0x4465663a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringDef:1.0
-  10,
-  ACE_NTOHL (0x53747269),
-  ACE_NTOHL (0x6e674465),
-  ACE_NTOHL (0x66000000),  // name = StringDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StringDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_StringDef),
-    (char *) &_oc_CORBA_StringDef,
-    0,
-    sizeof (CORBA::StringDef)
-  );
-
-static const CORBA::Long _oc_CORBA_WstringDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5773),
-  ACE_NTOHL (0x7472696e),
-  ACE_NTOHL (0x67446566),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WstringDef:1.0
-  11,
-  ACE_NTOHL (0x57737472),
-  ACE_NTOHL (0x696e6744),
-  ACE_NTOHL (0x65660000),  // name = WstringDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_WstringDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_WstringDef),
-    (char *) &_oc_CORBA_WstringDef,
-    0,
-    sizeof (CORBA::WstringDef)
-  );
-
-static const CORBA::Long _oc_CORBA_SequenceDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x7175656e),
-  ACE_NTOHL (0x63654465),
-  ACE_NTOHL (0x663a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/SequenceDef:1.0
-  12,
-  ACE_NTOHL (0x53657175),
-  ACE_NTOHL (0x656e6365),
-  ACE_NTOHL (0x44656600),  // name = SequenceDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_SequenceDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_SequenceDef),
-    (char *) &_oc_CORBA_SequenceDef,
-    0,
-    sizeof (CORBA::SequenceDef)
-  );
-
-static const CORBA::Long _oc_CORBA_ArrayDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4172),
-  ACE_NTOHL (0x72617944),
-  ACE_NTOHL (0x65663a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ArrayDef:1.0
-  9,
-  ACE_NTOHL (0x41727261),
-  ACE_NTOHL (0x79446566),
-  ACE_NTOHL (0x0),  // name = ArrayDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ArrayDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_ArrayDef),
-    (char *) &_oc_CORBA_ArrayDef,
-    0,
-    sizeof (CORBA::ArrayDef)
-  );
-
-static const CORBA::Long _oc_CORBA_ExceptionDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e44),
-  ACE_NTOHL (0x65663a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDef:1.0
-  13,
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e446566),
-  ACE_NTOHL (0x0),  // name = ExceptionDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_ExceptionDef),
-    (char *) &_oc_CORBA_ExceptionDef,
-    0,
-    sizeof (CORBA::ExceptionDef)
-  );
-
-static const CORBA::Long _oc_CORBA_ExceptionDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e44),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-  21,
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x0),  // name = ExceptionDescription
-  5, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
-  ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  8,
-  ACE_NTOHL (0x76657273),
-  ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
-    0U, // string length
-
-  5,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDescription (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ExceptionDescription),
-    (char *) &_oc_CORBA_ExceptionDescription,
-    0,
-    sizeof (CORBA::ExceptionDescription)
-  );
-
-static const CORBA::Long _oc_CORBA_ExceptionDefSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e44),
-  ACE_NTOHL (0x65665365),
-  ACE_NTOHL (0x713a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExceptionDefSeq:1.0
-  16,
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e446566),
-  ACE_NTOHL (0x53657100),  // name = ExceptionDefSeq
-  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
-      35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4578),
-      ACE_NTOHL (0x63657074),
-      ACE_NTOHL (0x696f6e44),
-      ACE_NTOHL (0x65663a31),
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDef:1.0
-      13,
-      ACE_NTOHL (0x45786365),
-      ACE_NTOHL (0x7074696f),
-      ACE_NTOHL (0x6e446566),
-      ACE_NTOHL (0x0),  // name = ExceptionDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ExceptionDefSeq),
-    (char *) &_oc_CORBA_ExceptionDefSeq,
-    0,
-    sizeof (CORBA::ExceptionDefSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_ExcDescriptionSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x63446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x5365713a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-  18,
-  ACE_NTOHL (0x45786344),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e5365),
-  ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-  CORBA::tk_sequence, // typecode kind
-  476, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    460, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      43,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4578),
-      ACE_NTOHL (0x63657074),
-      ACE_NTOHL (0x696f6e44),
-      ACE_NTOHL (0x65736372),
-      ACE_NTOHL (0x69707469),
-      ACE_NTOHL (0x6f6e3a31),
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-      21,
-      ACE_NTOHL (0x45786365),
-      ACE_NTOHL (0x7074696f),
-      ACE_NTOHL (0x6e446573),
-      ACE_NTOHL (0x63726970),
-      ACE_NTOHL (0x74696f6e),
-      ACE_NTOHL (0x0),  // name = ExceptionDescription
-      5, // member count
-      5,
-      ACE_NTOHL (0x6e616d65),
-      ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
-        ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
-        0U, // string length
-
-      3,
-      ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
-        0U, // string length
-
-      11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
-      ACE_NTOHL (0x696e0000),  // name = defined_in
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
-        0U, // string length
-
-      8,
-      ACE_NTOHL (0x76657273),
-      ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
-        ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
-        0U, // string length
-
-      5,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExcDescriptionSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ExcDescriptionSeq),
-    (char *) &_oc_CORBA_ExcDescriptionSeq,
-    0,
-    sizeof (CORBA::ExcDescriptionSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_AttributeMode[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4174),
-  ACE_NTOHL (0x74726962),
-  ACE_NTOHL (0x7574654d),
-  ACE_NTOHL (0x6f64653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-  14,
-  ACE_NTOHL (0x41747472),
-  ACE_NTOHL (0x69627574),
-  ACE_NTOHL (0x654d6f64),
-  ACE_NTOHL (0x65000000),  // name = AttributeMode
-  2, // member count
-  12,
-  ACE_NTOHL (0x41545452),
-  ACE_NTOHL (0x5f4e4f52),
-  ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-  14,
-  ACE_NTOHL (0x41545452),
-  ACE_NTOHL (0x5f524541),
-  ACE_NTOHL (0x444f4e4c),
-  ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeMode (
-    CORBA::tk_enum,
-    sizeof (_oc_CORBA_AttributeMode),
-    (char *) &_oc_CORBA_AttributeMode,
-    0,
-    sizeof (CORBA::AttributeMode)
-  );
-
-static const CORBA::Long _oc_CORBA_AttributeDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4174),
-  ACE_NTOHL (0x74726962),
-  ACE_NTOHL (0x75746544),
-  ACE_NTOHL (0x65663a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDef:1.0
-  13,
-  ACE_NTOHL (0x41747472),
-  ACE_NTOHL (0x69627574),
-  ACE_NTOHL (0x65446566),
-  ACE_NTOHL (0x0),  // name = AttributeDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_AttributeDef),
-    (char *) &_oc_CORBA_AttributeDef,
-    0,
-    sizeof (CORBA::AttributeDef)
-  );
-
-static const CORBA::Long _oc_CORBA_AttributeDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4174),
-  ACE_NTOHL (0x74726962),
-  ACE_NTOHL (0x75746544),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-  21,
-  ACE_NTOHL (0x41747472),
-  ACE_NTOHL (0x69627574),
-  ACE_NTOHL (0x65446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x0),  // name = AttributeDescription
-  6, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
-  ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  8,
-  ACE_NTOHL (0x76657273),
-  ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
-    0U, // string length
-
-  5,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  5,
-  ACE_NTOHL (0x6d6f6465),
-  ACE_NTOHL (0x0),  // name = mode
-  CORBA::tk_enum, // typecode kind
-  104, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4174),
-    ACE_NTOHL (0x74726962),
-    ACE_NTOHL (0x7574654d),
-    ACE_NTOHL (0x6f64653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-    14,
-    ACE_NTOHL (0x41747472),
-    ACE_NTOHL (0x69627574),
-    ACE_NTOHL (0x654d6f64),
-    ACE_NTOHL (0x65000000),  // name = AttributeMode
-    2, // member count
-    12,
-    ACE_NTOHL (0x41545452),
-    ACE_NTOHL (0x5f4e4f52),
-    ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-    14,
-    ACE_NTOHL (0x41545452),
-    ACE_NTOHL (0x5f524541),
-    ACE_NTOHL (0x444f4e4c),
-    ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDescription (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_AttributeDescription),
-    (char *) &_oc_CORBA_AttributeDescription,
-    0,
-    sizeof (CORBA::AttributeDescription)
-  );
-
-static const CORBA::Long _oc_CORBA_OperationMode[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4f70),
-  ACE_NTOHL (0x65726174),
-  ACE_NTOHL (0x696f6e4d),
-  ACE_NTOHL (0x6f64653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-  14,
-  ACE_NTOHL (0x4f706572),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e4d6f64),
-  ACE_NTOHL (0x65000000),  // name = OperationMode
-  2, // member count
-  10,
-  ACE_NTOHL (0x4f505f4e),
-  ACE_NTOHL (0x4f524d41),
-  ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-  10,
-  ACE_NTOHL (0x4f505f4f),
-  ACE_NTOHL (0x4e455741),
-  ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationMode (
-    CORBA::tk_enum,
-    sizeof (_oc_CORBA_OperationMode),
-    (char *) &_oc_CORBA_OperationMode,
-    0,
-    sizeof (CORBA::OperationMode)
-  );
-
-static const CORBA::Long _oc_CORBA_ParameterMode[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5061),
-  ACE_NTOHL (0x72616d65),
-  ACE_NTOHL (0x7465724d),
-  ACE_NTOHL (0x6f64653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-  14,
-  ACE_NTOHL (0x50617261),
-  ACE_NTOHL (0x6d657465),
-  ACE_NTOHL (0x724d6f64),
-  ACE_NTOHL (0x65000000),  // name = ParameterMode
-  3, // member count
-  9,
-  ACE_NTOHL (0x50415241),
-  ACE_NTOHL (0x4d5f494e),
-  ACE_NTOHL (0x0),  // name = PARAM_IN
-  10,
-  ACE_NTOHL (0x50415241),
-  ACE_NTOHL (0x4d5f4f55),
-  ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-  12,
-  ACE_NTOHL (0x50415241),
-  ACE_NTOHL (0x4d5f494e),
-  ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ParameterMode (
-    CORBA::tk_enum,
-    sizeof (_oc_CORBA_ParameterMode),
-    (char *) &_oc_CORBA_ParameterMode,
-    0,
-    sizeof (CORBA::ParameterMode)
-  );
-
-static const CORBA::Long _oc_CORBA_ParameterDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5061),
-  ACE_NTOHL (0x72616d65),
-  ACE_NTOHL (0x74657244),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-  21,
-  ACE_NTOHL (0x50617261),
-  ACE_NTOHL (0x6d657465),
-  ACE_NTOHL (0x72446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x0),  // name = ParameterDescription
-  4, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-  5,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  9,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x5f646566),
-  ACE_NTOHL (0x0),  // name = type_def
-  CORBA::tk_objref, // typecode kind
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4944),
-    ACE_NTOHL (0x4c547970),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-    8,
-    ACE_NTOHL (0x49444c54),
-    ACE_NTOHL (0x79706500),  // name = IDLType
-
-  5,
-  ACE_NTOHL (0x6d6f6465),
-  ACE_NTOHL (0x0),  // name = mode
-  CORBA::tk_enum, // typecode kind
-  116, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5061),
-    ACE_NTOHL (0x72616d65),
-    ACE_NTOHL (0x7465724d),
-    ACE_NTOHL (0x6f64653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-    14,
-    ACE_NTOHL (0x50617261),
-    ACE_NTOHL (0x6d657465),
-    ACE_NTOHL (0x724d6f64),
-    ACE_NTOHL (0x65000000),  // name = ParameterMode
-    3, // member count
-    9,
-    ACE_NTOHL (0x50415241),
-    ACE_NTOHL (0x4d5f494e),
-    ACE_NTOHL (0x0),  // name = PARAM_IN
-    10,
-    ACE_NTOHL (0x50415241),
-    ACE_NTOHL (0x4d5f4f55),
-    ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-    12,
-    ACE_NTOHL (0x50415241),
-    ACE_NTOHL (0x4d5f494e),
-    ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ParameterDescription (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ParameterDescription),
-    (char *) &_oc_CORBA_ParameterDescription,
-    0,
-    sizeof (CORBA::ParameterDescription)
-  );
-
-static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5061),
-  ACE_NTOHL (0x72446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x5365713a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-  18,
-  ACE_NTOHL (0x50617244),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e5365),
-  ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-  CORBA::tk_sequence, // typecode kind
-  416, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    400, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      43,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5061),
-      ACE_NTOHL (0x72616d65),
-      ACE_NTOHL (0x74657244),
-      ACE_NTOHL (0x65736372),
-      ACE_NTOHL (0x69707469),
-      ACE_NTOHL (0x6f6e3a31),
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-      21,
-      ACE_NTOHL (0x50617261),
-      ACE_NTOHL (0x6d657465),
-      ACE_NTOHL (0x72446573),
-      ACE_NTOHL (0x63726970),
-      ACE_NTOHL (0x74696f6e),
-      ACE_NTOHL (0x0),  // name = ParameterDescription
-      4, // member count
-      5,
-      ACE_NTOHL (0x6e616d65),
-      ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
-        ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
-        0U, // string length
-
-      5,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-      9,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x5f646566),
-      ACE_NTOHL (0x0),  // name = type_def
-      CORBA::tk_objref, // typecode kind
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4944),
-        ACE_NTOHL (0x4c547970),
-        ACE_NTOHL (0x653a312e),
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8,
-        ACE_NTOHL (0x49444c54),
-        ACE_NTOHL (0x79706500),  // name = IDLType
-
-      5,
-      ACE_NTOHL (0x6d6f6465),
-      ACE_NTOHL (0x0),  // name = mode
-      CORBA::tk_enum, // typecode kind
-      116, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        36,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5061),
-        ACE_NTOHL (0x72616d65),
-        ACE_NTOHL (0x7465724d),
-        ACE_NTOHL (0x6f64653a),
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-        14,
-        ACE_NTOHL (0x50617261),
-        ACE_NTOHL (0x6d657465),
-        ACE_NTOHL (0x724d6f64),
-        ACE_NTOHL (0x65000000),  // name = ParameterMode
-        3, // member count
-        9,
-        ACE_NTOHL (0x50415241),
-        ACE_NTOHL (0x4d5f494e),
-        ACE_NTOHL (0x0),  // name = PARAM_IN
-        10,
-        ACE_NTOHL (0x50415241),
-        ACE_NTOHL (0x4d5f4f55),
-        ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-        12,
-        ACE_NTOHL (0x50415241),
-        ACE_NTOHL (0x4d5f494e),
-        ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ParDescriptionSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ParDescriptionSeq),
-    (char *) &_oc_CORBA_ParDescriptionSeq,
-    0,
-    sizeof (CORBA::ParDescriptionSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_ContextIdentifier[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746578),
-  ACE_NTOHL (0x74496465),
-  ACE_NTOHL (0x6e746966),
-  ACE_NTOHL (0x6965723a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-  18,
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x65787449),
-  ACE_NTOHL (0x64656e74),
-  ACE_NTOHL (0x69666965),
-  ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ContextIdentifier (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ContextIdentifier),
-    (char *) &_oc_CORBA_ContextIdentifier,
-    0,
-    sizeof (CORBA::ContextIdentifier)
-  );
-
-static const CORBA::Long _oc_CORBA_ContextIdSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746578),
-  ACE_NTOHL (0x74496453),
-  ACE_NTOHL (0x65713a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-  13,
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x65787449),
-  ACE_NTOHL (0x64536571),
-  ACE_NTOHL (0x0),  // name = ContextIdSeq
-  CORBA::tk_sequence, // typecode kind
-  164, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    148, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      40,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f436f),
-      ACE_NTOHL (0x6e746578),
-      ACE_NTOHL (0x74496465),
-      ACE_NTOHL (0x6e746966),
-      ACE_NTOHL (0x6965723a),
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-      18,
-      ACE_NTOHL (0x436f6e74),
-      ACE_NTOHL (0x65787449),
-      ACE_NTOHL (0x64656e74),
-      ACE_NTOHL (0x69666965),
-      ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
-        ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
-        0U, // string length
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ContextIdSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ContextIdSeq),
-    (char *) &_oc_CORBA_ContextIdSeq,
-    0,
-    sizeof (CORBA::ContextIdSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_OperationDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4f70),
-  ACE_NTOHL (0x65726174),
-  ACE_NTOHL (0x696f6e44),
-  ACE_NTOHL (0x65663a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDef:1.0
-  13,
-  ACE_NTOHL (0x4f706572),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e446566),
-  ACE_NTOHL (0x0),  // name = OperationDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_OperationDef),
-    (char *) &_oc_CORBA_OperationDef,
-    0,
-    sizeof (CORBA::OperationDef)
-  );
-
-static const CORBA::Long _oc_CORBA_OperationDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4f70),
-  ACE_NTOHL (0x65726174),
-  ACE_NTOHL (0x696f6e44),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
-  21,
-  ACE_NTOHL (0x4f706572),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x0),  // name = OperationDescription
-  9, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
-  ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  8,
-  ACE_NTOHL (0x76657273),
-  ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
-    0U, // string length
-
-  7,
-  ACE_NTOHL (0x72657375),
-  ACE_NTOHL (0x6c740000),  // name = result
-  CORBA::tk_TypeCode,
-
-  5,
-  ACE_NTOHL (0x6d6f6465),
-  ACE_NTOHL (0x0),  // name = mode
-  CORBA::tk_enum, // typecode kind
-  100, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f70),
-    ACE_NTOHL (0x65726174),
-    ACE_NTOHL (0x696f6e4d),
-    ACE_NTOHL (0x6f64653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-    14,
-    ACE_NTOHL (0x4f706572),
-    ACE_NTOHL (0x6174696f),
-    ACE_NTOHL (0x6e4d6f64),
-    ACE_NTOHL (0x65000000),  // name = OperationMode
-    2, // member count
-    10,
-    ACE_NTOHL (0x4f505f4e),
-    ACE_NTOHL (0x4f524d41),
-    ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-    10,
-    ACE_NTOHL (0x4f505f4f),
-    ACE_NTOHL (0x4e455741),
-    ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
-  9,
-  ACE_NTOHL (0x636f6e74),
-  ACE_NTOHL (0x65787473),
-  ACE_NTOHL (0x0),  // name = contexts
-  CORBA::tk_alias, // typecode kind for typedefs
-  236, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f436f),
-    ACE_NTOHL (0x6e746578),
-    ACE_NTOHL (0x74496453),
-    ACE_NTOHL (0x65713a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-    13,
-    ACE_NTOHL (0x436f6e74),
-    ACE_NTOHL (0x65787449),
-    ACE_NTOHL (0x64536571),
-    ACE_NTOHL (0x0),  // name = ContextIdSeq
-    CORBA::tk_sequence, // typecode kind
-    164, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      148, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        40,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f436f),
-        ACE_NTOHL (0x6e746578),
-        ACE_NTOHL (0x74496465),
-        ACE_NTOHL (0x6e746966),
-        ACE_NTOHL (0x6965723a),
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-        18,
-        ACE_NTOHL (0x436f6e74),
-        ACE_NTOHL (0x65787449),
-        ACE_NTOHL (0x64656e74),
-        ACE_NTOHL (0x69666965),
-        ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
-          ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string,
-          0U, // string length
-
-
-      0U,
-
-
-  11,
-  ACE_NTOHL (0x70617261),
-  ACE_NTOHL (0x6d657465),
-  ACE_NTOHL (0x72730000),  // name = parameters
-  CORBA::tk_alias, // typecode kind for typedefs
-  496, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5061),
-    ACE_NTOHL (0x72446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x5365713a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-    18,
-    ACE_NTOHL (0x50617244),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
-    ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
-    416, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      400, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5061),
-        ACE_NTOHL (0x72616d65),
-        ACE_NTOHL (0x74657244),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-        21,
-        ACE_NTOHL (0x50617261),
-        ACE_NTOHL (0x6d657465),
-        ACE_NTOHL (0x72446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
-        ACE_NTOHL (0x0),  // name = ParameterDescription
-        4, // member count
-        5,
-        ACE_NTOHL (0x6e616d65),
-        ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
-          ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string,
-          0U, // string length
-
-        5,
-        ACE_NTOHL (0x74797065),
-        ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
-
-        9,
-        ACE_NTOHL (0x74797065),
-        ACE_NTOHL (0x5f646566),
-        ACE_NTOHL (0x0),  // name = type_def
-        CORBA::tk_objref, // typecode kind
-        52, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          30,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4944),
-          ACE_NTOHL (0x4c547970),
-          ACE_NTOHL (0x653a312e),
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-          8,
-          ACE_NTOHL (0x49444c54),
-          ACE_NTOHL (0x79706500),  // name = IDLType
-
-        5,
-        ACE_NTOHL (0x6d6f6465),
-        ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
-        116, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5061),
-          ACE_NTOHL (0x72616d65),
-          ACE_NTOHL (0x7465724d),
-          ACE_NTOHL (0x6f64653a),
-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-          14,
-          ACE_NTOHL (0x50617261),
-          ACE_NTOHL (0x6d657465),
-          ACE_NTOHL (0x724d6f64),
-          ACE_NTOHL (0x65000000),  // name = ParameterMode
-          3, // member count
-          9,
-          ACE_NTOHL (0x50415241),
-          ACE_NTOHL (0x4d5f494e),
-          ACE_NTOHL (0x0),  // name = PARAM_IN
-          10,
-          ACE_NTOHL (0x50415241),
-          ACE_NTOHL (0x4d5f4f55),
-          ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-          12,
-          ACE_NTOHL (0x50415241),
-          ACE_NTOHL (0x4d5f494e),
-          ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
-
-      0U,
-
-
-  11,
-  ACE_NTOHL (0x65786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e730000),  // name = exceptions
-  CORBA::tk_alias, // typecode kind for typedefs
-  556, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4578),
-    ACE_NTOHL (0x63446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x5365713a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-    18,
-    ACE_NTOHL (0x45786344),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
-    ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
-    476, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      460, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x63657074),
-        ACE_NTOHL (0x696f6e44),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-        21,
-        ACE_NTOHL (0x45786365),
-        ACE_NTOHL (0x7074696f),
-        ACE_NTOHL (0x6e446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
-        ACE_NTOHL (0x0),  // name = ExceptionDescription
-        5, // member count
-        5,
-        ACE_NTOHL (0x6e616d65),
-        ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
-          ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string,
-          0U, // string length
-
-        3,
-        ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
-          ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string,
-          0U, // string length
-
-        11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
-        ACE_NTOHL (0x696e0000),  // name = defined_in
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
-          ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string,
-          0U, // string length
-
-        8,
-        ACE_NTOHL (0x76657273),
-        ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
-          ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string,
-          0U, // string length
-
-        5,
-        ACE_NTOHL (0x74797065),
-        ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
-
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationDescription (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_OperationDescription),
-    (char *) &_oc_CORBA_OperationDescription,
-    0,
-    sizeof (CORBA::OperationDescription)
-  );
-
-static const CORBA::Long _oc_CORBA_RepositoryIdSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x49645365),
-  ACE_NTOHL (0x713a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-  16,
-  ACE_NTOHL (0x5265706f),
-  ACE_NTOHL (0x7369746f),
-  ACE_NTOHL (0x72794964),
-  ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-  CORBA::tk_sequence, // typecode kind
-  88, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    72, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x49643a31),
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-      13,
-      ACE_NTOHL (0x5265706f),
-      ACE_NTOHL (0x7369746f),
-      ACE_NTOHL (0x72794964),
-      ACE_NTOHL (0x0),  // name = RepositoryId
-      CORBA::tk_string,
-      0U, // string length
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_RepositoryIdSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_RepositoryIdSeq),
-    (char *) &_oc_CORBA_RepositoryIdSeq,
-    0,
-    sizeof (CORBA::RepositoryIdSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4f70),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e53),
-  ACE_NTOHL (0x65713a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
-  17,
-  ACE_NTOHL (0x4f704465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e536571),
-  ACE_NTOHL (0x0),  // name = OpDescriptionSeq
-  CORBA::tk_sequence, // typecode kind
-  1956, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    1940, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      43,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4f70),
-      ACE_NTOHL (0x65726174),
-      ACE_NTOHL (0x696f6e44),
-      ACE_NTOHL (0x65736372),
-      ACE_NTOHL (0x69707469),
-      ACE_NTOHL (0x6f6e3a31),
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
-      21,
-      ACE_NTOHL (0x4f706572),
-      ACE_NTOHL (0x6174696f),
-      ACE_NTOHL (0x6e446573),
-      ACE_NTOHL (0x63726970),
-      ACE_NTOHL (0x74696f6e),
-      ACE_NTOHL (0x0),  // name = OperationDescription
-      9, // member count
-      5,
-      ACE_NTOHL (0x6e616d65),
-      ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
-        ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
-        0U, // string length
-
-      3,
-      ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
-        0U, // string length
-
-      11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
-      ACE_NTOHL (0x696e0000),  // name = defined_in
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
-        0U, // string length
-
-      8,
-      ACE_NTOHL (0x76657273),
-      ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
-        ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
-        0U, // string length
-
-      7,
-      ACE_NTOHL (0x72657375),
-      ACE_NTOHL (0x6c740000),  // name = result
-      CORBA::tk_TypeCode,
-
-      5,
-      ACE_NTOHL (0x6d6f6465),
-      ACE_NTOHL (0x0),  // name = mode
-      CORBA::tk_enum, // typecode kind
-      100, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        36,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4f70),
-        ACE_NTOHL (0x65726174),
-        ACE_NTOHL (0x696f6e4d),
-        ACE_NTOHL (0x6f64653a),
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-        14,
-        ACE_NTOHL (0x4f706572),
-        ACE_NTOHL (0x6174696f),
-        ACE_NTOHL (0x6e4d6f64),
-        ACE_NTOHL (0x65000000),  // name = OperationMode
-        2, // member count
-        10,
-        ACE_NTOHL (0x4f505f4e),
-        ACE_NTOHL (0x4f524d41),
-        ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-        10,
-        ACE_NTOHL (0x4f505f4f),
-        ACE_NTOHL (0x4e455741),
-        ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
-      9,
-      ACE_NTOHL (0x636f6e74),
-      ACE_NTOHL (0x65787473),
-      ACE_NTOHL (0x0),  // name = contexts
-      CORBA::tk_alias, // typecode kind for typedefs
-      236, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f436f),
-        ACE_NTOHL (0x6e746578),
-        ACE_NTOHL (0x74496453),
-        ACE_NTOHL (0x65713a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-        13,
-        ACE_NTOHL (0x436f6e74),
-        ACE_NTOHL (0x65787449),
-        ACE_NTOHL (0x64536571),
-        ACE_NTOHL (0x0),  // name = ContextIdSeq
-        CORBA::tk_sequence, // typecode kind
-        164, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_alias, // typecode kind for typedefs
-          148, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            40,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f436f),
-            ACE_NTOHL (0x6e746578),
-            ACE_NTOHL (0x74496465),
-            ACE_NTOHL (0x6e746966),
-            ACE_NTOHL (0x6965723a),
-            ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-            18,
-            ACE_NTOHL (0x436f6e74),
-            ACE_NTOHL (0x65787449),
-            ACE_NTOHL (0x64656e74),
-            ACE_NTOHL (0x69666965),
-            ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-            CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              33,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4964),
-              ACE_NTOHL (0x656e7469),
-              ACE_NTOHL (0x66696572),
-              ACE_NTOHL (0x3a312e30),
-              ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-              11,
-              ACE_NTOHL (0x4964656e),
-              ACE_NTOHL (0x74696669),
-              ACE_NTOHL (0x65720000),  // name = Identifier
-              CORBA::tk_string,
-              0U, // string length
-
-
-          0U,
-
-
-      11,
-      ACE_NTOHL (0x70617261),
-      ACE_NTOHL (0x6d657465),
-      ACE_NTOHL (0x72730000),  // name = parameters
-      CORBA::tk_alias, // typecode kind for typedefs
-      496, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        40,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5061),
-        ACE_NTOHL (0x72446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
-        ACE_NTOHL (0x5365713a),
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-        18,
-        ACE_NTOHL (0x50617244),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e5365),
-        ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-        CORBA::tk_sequence, // typecode kind
-        416, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_struct, // typecode kind
-          400, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            43,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f5061),
-            ACE_NTOHL (0x72616d65),
-            ACE_NTOHL (0x74657244),
-            ACE_NTOHL (0x65736372),
-            ACE_NTOHL (0x69707469),
-            ACE_NTOHL (0x6f6e3a31),
-            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-            21,
-            ACE_NTOHL (0x50617261),
-            ACE_NTOHL (0x6d657465),
-            ACE_NTOHL (0x72446573),
-            ACE_NTOHL (0x63726970),
-            ACE_NTOHL (0x74696f6e),
-            ACE_NTOHL (0x0),  // name = ParameterDescription
-            4, // member count
-            5,
-            ACE_NTOHL (0x6e616d65),
-            ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              33,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4964),
-              ACE_NTOHL (0x656e7469),
-              ACE_NTOHL (0x66696572),
-              ACE_NTOHL (0x3a312e30),
-              ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-              11,
-              ACE_NTOHL (0x4964656e),
-              ACE_NTOHL (0x74696669),
-              ACE_NTOHL (0x65720000),  // name = Identifier
-              CORBA::tk_string,
-              0U, // string length
-
-            5,
-            ACE_NTOHL (0x74797065),
-            ACE_NTOHL (0x0),  // name = type
-            CORBA::tk_TypeCode,
-
-            9,
-            ACE_NTOHL (0x74797065),
-            ACE_NTOHL (0x5f646566),
-            ACE_NTOHL (0x0),  // name = type_def
-            CORBA::tk_objref, // typecode kind
-            52, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              30,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4944),
-              ACE_NTOHL (0x4c547970),
-              ACE_NTOHL (0x653a312e),
-              ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-              8,
-              ACE_NTOHL (0x49444c54),
-              ACE_NTOHL (0x79706500),  // name = IDLType
-
-            5,
-            ACE_NTOHL (0x6d6f6465),
-            ACE_NTOHL (0x0),  // name = mode
-            CORBA::tk_enum, // typecode kind
-            116, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              36,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5061),
-              ACE_NTOHL (0x72616d65),
-              ACE_NTOHL (0x7465724d),
-              ACE_NTOHL (0x6f64653a),
-              ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-              14,
-              ACE_NTOHL (0x50617261),
-              ACE_NTOHL (0x6d657465),
-              ACE_NTOHL (0x724d6f64),
-              ACE_NTOHL (0x65000000),  // name = ParameterMode
-              3, // member count
-              9,
-              ACE_NTOHL (0x50415241),
-              ACE_NTOHL (0x4d5f494e),
-              ACE_NTOHL (0x0),  // name = PARAM_IN
-              10,
-              ACE_NTOHL (0x50415241),
-              ACE_NTOHL (0x4d5f4f55),
-              ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-              12,
-              ACE_NTOHL (0x50415241),
-              ACE_NTOHL (0x4d5f494e),
-              ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
-
-          0U,
-
-
-      11,
-      ACE_NTOHL (0x65786365),
-      ACE_NTOHL (0x7074696f),
-      ACE_NTOHL (0x6e730000),  // name = exceptions
-      CORBA::tk_alias, // typecode kind for typedefs
-      556, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        40,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x63446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
-        ACE_NTOHL (0x5365713a),
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-        18,
-        ACE_NTOHL (0x45786344),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e5365),
-        ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-        CORBA::tk_sequence, // typecode kind
-        476, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_struct, // typecode kind
-          460, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            43,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f4578),
-            ACE_NTOHL (0x63657074),
-            ACE_NTOHL (0x696f6e44),
-            ACE_NTOHL (0x65736372),
-            ACE_NTOHL (0x69707469),
-            ACE_NTOHL (0x6f6e3a31),
-            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-            21,
-            ACE_NTOHL (0x45786365),
-            ACE_NTOHL (0x7074696f),
-            ACE_NTOHL (0x6e446573),
-            ACE_NTOHL (0x63726970),
-            ACE_NTOHL (0x74696f6e),
-            ACE_NTOHL (0x0),  // name = ExceptionDescription
-            5, // member count
-            5,
-            ACE_NTOHL (0x6e616d65),
-            ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              33,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4964),
-              ACE_NTOHL (0x656e7469),
-              ACE_NTOHL (0x66696572),
-              ACE_NTOHL (0x3a312e30),
-              ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-              11,
-              ACE_NTOHL (0x4964656e),
-              ACE_NTOHL (0x74696669),
-              ACE_NTOHL (0x65720000),  // name = Identifier
-              CORBA::tk_string,
-              0U, // string length
-
-            3,
-            ACE_NTOHL (0x69640000),  // name = id
-            CORBA::tk_alias, // typecode kind for typedefs
-            72, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x49643a31),
-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-              13,
-              ACE_NTOHL (0x5265706f),
-              ACE_NTOHL (0x7369746f),
-              ACE_NTOHL (0x72794964),
-              ACE_NTOHL (0x0),  // name = RepositoryId
-              CORBA::tk_string,
-              0U, // string length
-
-            11,
-            ACE_NTOHL (0x64656669),
-            ACE_NTOHL (0x6e65645f),
-            ACE_NTOHL (0x696e0000),  // name = defined_in
-            CORBA::tk_alias, // typecode kind for typedefs
-            72, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x49643a31),
-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-              13,
-              ACE_NTOHL (0x5265706f),
-              ACE_NTOHL (0x7369746f),
-              ACE_NTOHL (0x72794964),
-              ACE_NTOHL (0x0),  // name = RepositoryId
-              CORBA::tk_string,
-              0U, // string length
-
-            8,
-            ACE_NTOHL (0x76657273),
-            ACE_NTOHL (0x696f6e00),  // name = version
-            CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              34,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5665),
-              ACE_NTOHL (0x7273696f),
-              ACE_NTOHL (0x6e537065),
-              ACE_NTOHL (0x633a312e),
-              ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-              12,
-              ACE_NTOHL (0x56657273),
-              ACE_NTOHL (0x696f6e53),
-              ACE_NTOHL (0x70656300),  // name = VersionSpec
-              CORBA::tk_string,
-              0U, // string length
-
-            5,
-            ACE_NTOHL (0x74797065),
-            ACE_NTOHL (0x0),  // name = type
-            CORBA::tk_TypeCode,
-
-
-          0U,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_OpDescriptionSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_OpDescriptionSeq),
-    (char *) &_oc_CORBA_OpDescriptionSeq,
-    0,
-    sizeof (CORBA::OpDescriptionSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4174),
-  ACE_NTOHL (0x74724465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e536571),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
-  19,
-  ACE_NTOHL (0x41747472),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e53),
-  ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
-  CORBA::tk_sequence, // typecode kind
-  600, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    584, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      43,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4174),
-      ACE_NTOHL (0x74726962),
-      ACE_NTOHL (0x75746544),
-      ACE_NTOHL (0x65736372),
-      ACE_NTOHL (0x69707469),
-      ACE_NTOHL (0x6f6e3a31),
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-      21,
-      ACE_NTOHL (0x41747472),
-      ACE_NTOHL (0x69627574),
-      ACE_NTOHL (0x65446573),
-      ACE_NTOHL (0x63726970),
-      ACE_NTOHL (0x74696f6e),
-      ACE_NTOHL (0x0),  // name = AttributeDescription
-      6, // member count
-      5,
-      ACE_NTOHL (0x6e616d65),
-      ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
-        ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
-        0U, // string length
-
-      3,
-      ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
-        0U, // string length
-
-      11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
-      ACE_NTOHL (0x696e0000),  // name = defined_in
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
-        0U, // string length
-
-      8,
-      ACE_NTOHL (0x76657273),
-      ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
-        ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
-        0U, // string length
-
-      5,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-      5,
-      ACE_NTOHL (0x6d6f6465),
-      ACE_NTOHL (0x0),  // name = mode
-      CORBA::tk_enum, // typecode kind
-      104, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        36,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4174),
-        ACE_NTOHL (0x74726962),
-        ACE_NTOHL (0x7574654d),
-        ACE_NTOHL (0x6f64653a),
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-        14,
-        ACE_NTOHL (0x41747472),
-        ACE_NTOHL (0x69627574),
-        ACE_NTOHL (0x654d6f64),
-        ACE_NTOHL (0x65000000),  // name = AttributeMode
-        2, // member count
-        12,
-        ACE_NTOHL (0x41545452),
-        ACE_NTOHL (0x5f4e4f52),
-        ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-        14,
-        ACE_NTOHL (0x41545452),
-        ACE_NTOHL (0x5f524541),
-        ACE_NTOHL (0x444f4e4c),
-        ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttrDescriptionSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_AttrDescriptionSeq),
-    (char *) &_oc_CORBA_AttrDescriptionSeq,
-    0,
-    sizeof (CORBA::AttrDescriptionSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_InterfaceDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65663a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-  13,
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446566),
-  ACE_NTOHL (0x0),  // name = InterfaceDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_InterfaceDef),
-    (char *) &_oc_CORBA_InterfaceDef,
-    0,
-    sizeof (CORBA::InterfaceDef)
-  );
-
-static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDescription:1.0
-  21,
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x0),  // name = InterfaceDescription
-  5, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
-  ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  8,
-  ACE_NTOHL (0x76657273),
-  ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
-    0U, // string length
-
-  16,
-  ACE_NTOHL (0x62617365),
-  ACE_NTOHL (0x5f696e74),
-  ACE_NTOHL (0x65726661),
-  ACE_NTOHL (0x63657300),  // name = base_interfaces
-  CORBA::tk_alias, // typecode kind for typedefs
-  164, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-    16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
-    88, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
-        0U, // string length
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDescription (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_InterfaceDescription),
-    (char *) &_oc_CORBA_InterfaceDescription,
-    0,
-    sizeof (CORBA::InterfaceDescription)
-  );
-
-static const CORBA::Long _oc_CORBA_AbstractInterfaceDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4162),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x6374496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65663a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDef:1.0
-  21,
-  ACE_NTOHL (0x41627374),
-  ACE_NTOHL (0x72616374),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446566),
-  ACE_NTOHL (0x0),  // name = AbstractInterfaceDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AbstractInterfaceDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_AbstractInterfaceDef),
-    (char *) &_oc_CORBA_AbstractInterfaceDef,
-    0,
-    sizeof (CORBA::AbstractInterfaceDef)
-  );
-
-static const CORBA::Long _oc_CORBA_LocalInterfaceDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4c6f),
-  ACE_NTOHL (0x63616c49),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
-  ACE_NTOHL (0x4465663a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDef:1.0
-  18,
-  ACE_NTOHL (0x4c6f6361),
-  ACE_NTOHL (0x6c496e74),
-  ACE_NTOHL (0x65726661),
-  ACE_NTOHL (0x63654465),
-  ACE_NTOHL (0x66000000),  // name = LocalInterfaceDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_LocalInterfaceDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_LocalInterfaceDef),
-    (char *) &_oc_CORBA_LocalInterfaceDef,
-    0,
-    sizeof (CORBA::LocalInterfaceDef)
-  );
-
-static const CORBA::Long _oc_CORBA_FixedDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4669),
-  ACE_NTOHL (0x78656444),
-  ACE_NTOHL (0x65663a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/FixedDef:1.0
-  9,
-  ACE_NTOHL (0x46697865),
-  ACE_NTOHL (0x64446566),
-  ACE_NTOHL (0x0),  // name = FixedDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_FixedDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_FixedDef),
-    (char *) &_oc_CORBA_FixedDef,
-    0,
-    sizeof (CORBA::FixedDef)
-  );
-
-static const CORBA::Long _oc_CORBA_ValueDefSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756544),
-  ACE_NTOHL (0x65665365),
-  ACE_NTOHL (0x713a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueDefSeq:1.0
-  12,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65446566),
-  ACE_NTOHL (0x53657100),  // name = ValueDefSeq
-  CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5661),
-      ACE_NTOHL (0x6c756544),
-      ACE_NTOHL (0x65663a31),
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-      9,
-      ACE_NTOHL (0x56616c75),
-      ACE_NTOHL (0x65446566),
-      ACE_NTOHL (0x0),  // name = ValueDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ValueDefSeq),
-    (char *) &_oc_CORBA_ValueDefSeq,
-    0,
-    sizeof (CORBA::ValueDefSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_ValueMember[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c75654d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x723a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
-  12,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x654d656d),
-  ACE_NTOHL (0x62657200),  // name = ValueMember
-  7, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
-  ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  8,
-  ACE_NTOHL (0x76657273),
-  ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
-    0U, // string length
-
-  5,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
-
-  9,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x5f646566),
-  ACE_NTOHL (0x0),  // name = type_def
-  CORBA::tk_objref, // typecode kind
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4944),
-    ACE_NTOHL (0x4c547970),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-    8,
-    ACE_NTOHL (0x49444c54),
-    ACE_NTOHL (0x79706500),  // name = IDLType
-
-  7,
-  ACE_NTOHL (0x61636365),
-  ACE_NTOHL (0x73730000),  // name = access
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5669),
-    ACE_NTOHL (0x73696269),
-    ACE_NTOHL (0x6c697479),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
-    11,
-    ACE_NTOHL (0x56697369),
-    ACE_NTOHL (0x62696c69),
-    ACE_NTOHL (0x74790000),  // name = Visibility
-    CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMember (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ValueMember),
-    (char *) &_oc_CORBA_ValueMember,
-    0,
-    sizeof (CORBA::ValueMember)
-  );
-
-static const CORBA::Long _oc_CORBA_ValueMemberSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c75654d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x72536571),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
-  15,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x654d656d),
-  ACE_NTOHL (0x62657253),
-  ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
-  CORBA::tk_sequence, // typecode kind
-  616, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    600, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5661),
-      ACE_NTOHL (0x6c75654d),
-      ACE_NTOHL (0x656d6265),
-      ACE_NTOHL (0x723a312e),
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
-      12,
-      ACE_NTOHL (0x56616c75),
-      ACE_NTOHL (0x654d656d),
-      ACE_NTOHL (0x62657200),  // name = ValueMember
-      7, // member count
-      5,
-      ACE_NTOHL (0x6e616d65),
-      ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
-        ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
-        0U, // string length
-
-      3,
-      ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
-        0U, // string length
-
-      11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
-      ACE_NTOHL (0x696e0000),  // name = defined_in
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
-        0U, // string length
-
-      8,
-      ACE_NTOHL (0x76657273),
-      ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
-        ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
-        0U, // string length
-
-      5,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
-
-      9,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x5f646566),
-      ACE_NTOHL (0x0),  // name = type_def
-      CORBA::tk_objref, // typecode kind
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4944),
-        ACE_NTOHL (0x4c547970),
-        ACE_NTOHL (0x653a312e),
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8,
-        ACE_NTOHL (0x49444c54),
-        ACE_NTOHL (0x79706500),  // name = IDLType
-
-      7,
-      ACE_NTOHL (0x61636365),
-      ACE_NTOHL (0x73730000),  // name = access
-      CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5669),
-        ACE_NTOHL (0x73696269),
-        ACE_NTOHL (0x6c697479),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
-        11,
-        ACE_NTOHL (0x56697369),
-        ACE_NTOHL (0x62696c69),
-        ACE_NTOHL (0x74790000),  // name = Visibility
-        CORBA::tk_short,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMemberSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ValueMemberSeq),
-    (char *) &_oc_CORBA_ValueMemberSeq,
-    0,
-    sizeof (CORBA::ValueMemberSeq)
-  );
-
-static const CORBA::Long _oc_CORBA_ValueMemberDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c75654d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x72446566),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberDef:1.0
-  15,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x654d656d),
-  ACE_NTOHL (0x62657244),
-  ACE_NTOHL (0x65660000),  // name = ValueMemberDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMemberDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_ValueMemberDef),
-    (char *) &_oc_CORBA_ValueMemberDef,
-    0,
-    sizeof (CORBA::ValueMemberDef)
-  );
-
-static const CORBA::Long _oc_CORBA_ValueDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756544),
-  ACE_NTOHL (0x65663a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-  9,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65446566),
-  ACE_NTOHL (0x0),  // name = ValueDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_ValueDef),
-    (char *) &_oc_CORBA_ValueDef,
-    0,
-    sizeof (CORBA::ValueDef)
-  );
-
-static const CORBA::Long _oc_CORBA_ValueDescription[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756544),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDescription:1.0
-  17,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x0),  // name = ValueDescription
-  10, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
-    0U, // string length
-
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  12,
-  ACE_NTOHL (0x69735f61),
-  ACE_NTOHL (0x62737472),
-  ACE_NTOHL (0x61637400),  // name = is_abstract
-  CORBA::tk_boolean,
-
-  10,
-  ACE_NTOHL (0x69735f63),
-  ACE_NTOHL (0x7573746f),
-  ACE_NTOHL (0x6d000000),  // name = is_custom
-  CORBA::tk_boolean,
-
-  11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
-  ACE_NTOHL (0x696e0000),  // name = defined_in
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-  8,
-  ACE_NTOHL (0x76657273),
-  ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
-    0U, // string length
-
-  21,
-  ACE_NTOHL (0x73757070),
-  ACE_NTOHL (0x6f727465),
-  ACE_NTOHL (0x645f696e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636573),
-  ACE_NTOHL (0x0),  // name = supported_interfaces
-  CORBA::tk_alias, // typecode kind for typedefs
-  164, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-    16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
-    88, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
-        0U, // string length
-
-      0U,
-
-
-  21,
-  ACE_NTOHL (0x61627374),
-  ACE_NTOHL (0x72616374),
-  ACE_NTOHL (0x5f626173),
-  ACE_NTOHL (0x655f7661),
-  ACE_NTOHL (0x6c756573),
-  ACE_NTOHL (0x0),  // name = abstract_base_values
-  CORBA::tk_alias, // typecode kind for typedefs
-  164, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-    16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
-    88, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
-        0U, // string length
-
-      0U,
-
-
-  15,
-  ACE_NTOHL (0x69735f74),
-  ACE_NTOHL (0x72756e63),
-  ACE_NTOHL (0x61746162),
-  ACE_NTOHL (0x6c650000),  // name = is_truncatable
-  CORBA::tk_boolean,
-
-  11,
-  ACE_NTOHL (0x62617365),
-  ACE_NTOHL (0x5f76616c),
-  ACE_NTOHL (0x75650000),  // name = base_value
-  CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
-    0U, // string length
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDescription (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ValueDescription),
-    (char *) &_oc_CORBA_ValueDescription,
-    0,
-    sizeof (CORBA::ValueDescription)
-  );
-
-static const CORBA::Long _oc_CORBA_ValueBoxDef[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756542),
-  ACE_NTOHL (0x6f784465),
-  ACE_NTOHL (0x663a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueBoxDef:1.0
-  12,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65426f78),
-  ACE_NTOHL (0x44656600),  // name = ValueBoxDef
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueBoxDef (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_ValueBoxDef),
-    (char *) &_oc_CORBA_ValueBoxDef,
-    0,
-    sizeof (CORBA::ValueBoxDef)
-  );
-
-// *********************************************************************
-
 // Initialization and registration of dynamic service object.
 
 int
 TAO_IFR_Client_Adapter_Impl::Initializer (void)
 {
-  CORBA::_tc_Identifier = &_tc_TAO_tc_CORBA_Identifier;
-  CORBA::_tc_ScopedName = &_tc_TAO_tc_CORBA_ScopedName;
-  CORBA::_tc_ScopedName = &_tc_TAO_tc_CORBA_RepositoryId;
-  CORBA::_tc_IRObject = &_tc_TAO_tc_CORBA_IRObject;
-  CORBA::_tc_Visibility = &_tc_TAO_tc_CORBA_Visibility;
-  CORBA::_tc_ValueModifier = &_tc_TAO_tc_CORBA_ValueModifier;
-  CORBA::_tc_DefinitionKind = &_tc_TAO_tc_CORBA_DefinitionKind;
-  CORBA::_tc_VersionSpec = &_tc_TAO_tc_CORBA_VersionSpec;
-  CORBA::_tc_Contained = &_tc_TAO_tc_CORBA_Contained;
-  CORBA::_tc_ContainedSeq = &_tc_TAO_tc_CORBA_ContainedSeq;
-  CORBA::_tc_InterfaceDefSeq = &_tc_TAO_tc_CORBA_InterfaceDefSeq;
-  CORBA::_tc_AbstractInterfaceDefSeq =
-    &_tc_TAO_tc_CORBA_AbstractInterfaceDefSeq;
-  CORBA::_tc_LocalInterfaceDefSeq = &_tc_TAO_tc_CORBA_LocalInterfaceDefSeq;
-  CORBA::_tc_StructMember = &_tc_TAO_tc_CORBA_StructMember;
-  CORBA::_tc_StructMemberSeq = &_tc_TAO_tc_CORBA_StructMemberSeq;
-  CORBA::_tc_Initializer = &_tc_TAO_tc_CORBA_Initializer;
-  CORBA::_tc_InitializerSeq = &_tc_TAO_tc_CORBA_InitializerSeq;
-  CORBA::_tc_UnionMember = &_tc_TAO_tc_CORBA_UnionMember;
-  CORBA::_tc_UnionMemberSeq = &_tc_TAO_tc_CORBA_UnionMemberSeq;
-  CORBA::_tc_EnumMemberSeq = &_tc_TAO_tc_CORBA_EnumMemberSeq;
-  CORBA::_tc_Container = &_tc_TAO_tc_CORBA_Container;
-  CORBA::_tc_IDLType = &_tc_TAO_tc_CORBA_IDLType;
-  CORBA::_tc_TypedefDef = &_tc_TAO_tc_CORBA_TypedefDef;
-  CORBA::_tc_TypeDescription = &_tc_TAO_tc_CORBA_TypeDescription;
-  CORBA::_tc_PrimitiveKind = &_tc_TAO_tc_CORBA_PrimitiveKind;
-  CORBA::_tc_Repository = &_tc_TAO_tc_CORBA_Repository;
-  CORBA::_tc_ModuleDef = &_tc_TAO_tc_CORBA_ModuleDef;
-  CORBA::_tc_ModuleDescription = &_tc_TAO_tc_CORBA_ModuleDescription;
-  CORBA::_tc_ConstantDef = &_tc_TAO_tc_CORBA_ConstantDef;
-  CORBA::_tc_ConstantDescription = &_tc_TAO_tc_CORBA_ConstantDescription;
-  CORBA::_tc_StructDef = &_tc_TAO_tc_CORBA_StructDef;
-  CORBA::_tc_UnionDef = &_tc_TAO_tc_CORBA_UnionDef;
-  CORBA::_tc_EnumDef = &_tc_TAO_tc_CORBA_EnumDef;
-  CORBA::_tc_AliasDef = &_tc_TAO_tc_CORBA_AliasDef;
-  CORBA::_tc_NativeDef = &_tc_TAO_tc_CORBA_NativeDef;
-  CORBA::_tc_PrimitiveDef = &_tc_TAO_tc_CORBA_PrimitiveDef;
-  CORBA::_tc_StringDef = &_tc_TAO_tc_CORBA_StringDef;
-  CORBA::_tc_WstringDef = &_tc_TAO_tc_CORBA_WstringDef;
-  CORBA::_tc_SequenceDef = &_tc_TAO_tc_CORBA_SequenceDef;
-  CORBA::_tc_ArrayDef = &_tc_TAO_tc_CORBA_ArrayDef;
-  CORBA::_tc_ExceptionDef = &_tc_TAO_tc_CORBA_ExceptionDef;
-  CORBA::_tc_ExceptionDescription = &_tc_TAO_tc_CORBA_ExceptionDescription;
-  CORBA::_tc_ExceptionDefSeq = &_tc_TAO_tc_CORBA_ExceptionDefSeq;
-  CORBA::_tc_ExcDescriptionSeq = &_tc_TAO_tc_CORBA_ExcDescriptionSeq;
-  CORBA::_tc_AttributeMode = &_tc_TAO_tc_CORBA_AttributeMode;
-  CORBA::_tc_AttributeDef = &_tc_TAO_tc_CORBA_AttributeDef;
-  CORBA::_tc_AttributeDescription = &_tc_TAO_tc_CORBA_AttributeDescription;
-  CORBA::_tc_OperationMode = &_tc_TAO_tc_CORBA_OperationMode;
-  CORBA::_tc_ParameterMode = &_tc_TAO_tc_CORBA_ParameterMode;
-  CORBA::_tc_ParameterDescription = &_tc_TAO_tc_CORBA_ParameterDescription;
-  CORBA::_tc_ParDescriptionSeq = &_tc_TAO_tc_CORBA_ParDescriptionSeq;
-  CORBA::_tc_ContextIdentifier = &_tc_TAO_tc_CORBA_ContextIdentifier;
-  CORBA::_tc_ContextIdSeq = &_tc_TAO_tc_CORBA_ContextIdSeq;
-  CORBA::_tc_OperationDef = &_tc_TAO_tc_CORBA_OperationDef;
-  CORBA::_tc_OperationDescription = &_tc_TAO_tc_CORBA_OperationDescription;
-  CORBA::_tc_RepositoryIdSeq = &_tc_TAO_tc_CORBA_RepositoryIdSeq;
-  CORBA::_tc_OpDescriptionSeq = &_tc_TAO_tc_CORBA_OpDescriptionSeq;
-  CORBA::_tc_AttrDescriptionSeq = &_tc_TAO_tc_CORBA_AttrDescriptionSeq;
-  CORBA::_tc_InterfaceDef = &_tc_TAO_tc_CORBA_InterfaceDef;
-  CORBA::_tc_InterfaceDescription = &_tc_TAO_tc_CORBA_InterfaceDescription;
-  CORBA::_tc_AbstractInterfaceDef = &_tc_TAO_tc_CORBA_AbstractInterfaceDef;
-  CORBA::_tc_LocalInterfaceDef = &_tc_TAO_tc_CORBA_LocalInterfaceDef;
-
-  CORBA::_tc_FixedDef = &_tc_TAO_tc_CORBA_FixedDef;
-  CORBA::_tc_ValueDefSeq = &_tc_TAO_tc_CORBA_ValueDefSeq;
-  CORBA::_tc_ValueMember = &_tc_TAO_tc_CORBA_ValueMember;
-  CORBA::_tc_ValueMemberSeq = &_tc_TAO_tc_CORBA_ValueMemberSeq;
-  CORBA::_tc_ValueMemberDef = &_tc_TAO_tc_CORBA_ValueMemberDef;
-  CORBA::_tc_ValueDef = &_tc_TAO_tc_CORBA_ValueDef;
-  CORBA::_tc_ValueDescription = &_tc_TAO_tc_CORBA_ValueDescription;
-  CORBA::_tc_ValueBoxDef = &_tc_TAO_tc_CORBA_ValueBoxDef;
-
   TAO_ORB_Core::ifr_client_adapter_name ("Concrete_IFR_Client_Adapter");
 
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IFR_Client_Adapter_Impl);
@@ -5981,3 +193,4 @@ ACE_STATIC_SVC_DEFINE (
   )
 
 ACE_FACTORY_DEFINE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl)
+
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index 6d4b54dd82a..6bc2ce68bca 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -16,50 +16,39 @@
 //   time. This IDL file contains all the interfaces and other data
 //   types related to CORBA components.
 //
-//   1. Patch this pidl file with
+//   The command used to generate code from this IDL file is:
 //
-//      patch < diffs/IFR_Components.pidl.diff
-//
-//   This will remove the CORBA module, rename most types foo
-//   declared in it as CORBA_foo, unalias the simple typedefs
-//   which don't have a CORBA_ analog in corbafwd.h.
-//
-//   2. Generate the code. The command used to generate code from this 
-//   IDL file is:
-//
-//     tao_idl -o orig -Ge 1 -I.. \
+//     tao_idl -Ge 1 -I.. \
 //          -Wb,export_macro=TAO_IFR_Client_Export \
 //          -Wb,export_include=ifr_client_export.h \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
 //          IFR_Components.pidl
 //
-//   3. Copy the generated files to the current directory.
-//
-//   4. Patch the generated files, using
-//      
-//      patch < diffs/IFR_ComponentsC.h.diff
-//      patch < diffs/IFR_ComponentsC.i.diff
-//      patch < diffs/IFR_ComponentsC.cpp.diff
+//   Only the stub files are used in the TAO_IFR_Client library. The
+//   skeleton files can be deleted from this directory.
 //
-//   If this fails for some reason, the files must be patched
-//   by hand, and the diff files regenerated with
+//   No patching of the generated stub files is necessary.
 //
-//      diff -wbu orig/IFR_ComponentsC.h IFR_ComponentsC.h > diffs/IFR_ComponentsC.h.diff
-//      diff -wbu orig/IFR_ComponentsC.i IFR_ComponentsC.i > diffs/IFR_ComponentsC.i.diff
-//      diff -wbu orig/IFR_ComponentsC.cpp IFR_ComponentsC.cpp > diffs/IFR_ComponentsC.cpp.diff
+//   To generate the skeleton files for the IFR Service, the command is:
 //
-//   5. Restore IFR_Components.pidl.
-//
-//   To regenerate the skeleton files IFR_ComponentsS.{h,i,cpp} and 
-//   IFR_ComponentsS_T.{h,i.cpp} in ACE_ROOT/TAO/orbsvcs/IFR_Service,
-//   use the command
-//
-//     tao_idl -o ../../orbsvcs/IFR_Service/orig -Ge 1 \
+//     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
 //          IFR_Components.pidl
 //
+//   The only modification necessary to the skelton files is to 
+//   change
+//
+//   #include "IFR_ComponentsC.h"
+//
+//   to
+//
+//   #include "tao/IFR_Client/IFR_ComponentsC.h"
+//
+//   in IFR_ComponentsS.h. The stub files may be deleted from the IFRService
+//   directory.
+//
 // ================================================================
 
 #ifndef _IFR_COMPONENTS_IDL_
@@ -67,293 +56,237 @@
 
 #include "IFR_Extended.pidl"
 
-#pragma prefix "omg.org"
-
-module IR
+module CORBA
 {
-  enum DefinitionKind 
+  module ComponentIR
   {
-    dk_none, 
-    dk_all,
-    dk_Attribute, 
-    dk_Constant, 
-    dk_Exception, 
-    dk_Interface,
-    dk_Module, 
-    dk_Operation, 
-    dk_Typedef,
-    dk_Alias, 
-    dk_Struct, 
-    dk_Union, 
-    dk_Enum,
-    dk_Primitive, 
-    dk_String, 
-    dk_Sequence, 
-    dk_Array,
-    dk_Repository,
-    dk_Wstring, 
-    dk_Fixed,
-    dk_Value, 
-    dk_ValueBox, 
-    dk_ValueMember,
-    dk_Native,
-    dk_Component,
-    dk_Home,
-    dk_Factory,
-    dk_Finder,
-    dk_PrimaryKey,
-    dk_Emits,
-    dk_Publishes,
-    dk_Consumes,
-    dk_Provides,
-    dk_Uses
-  };
+    typeprefix ComponentIR "omg.org";
 
-  typedef string Identifier;
-  typedef string ScopedName;
-  typedef string RepositoryId;
-  typedef sequence<RepositoryId> RepositoryIdSeq;
-  typedef string VersionSpec;
-
-  interface ComponentDef;
-  typedef sequence <ComponentDef> ComponentDefSeq;
-  interface ProvidesDef;
-  typedef sequence <ProvidesDef> ProvidesDefSeq;
-  interface UsesDef;
-  typedef sequence <UsesDef> UsesDefSeq;
-  interface HomeDef;
-  typedef sequence <HomeDef> HomeDefSeq;
-  interface EventDef;
-  interface EmitsDef;
-  typedef sequence <EmitsDef> EmitsDefSeq;
-  interface PublishesDef;
-  typedef sequence <PublishesDef> PublishesDefSeq;
-  interface ConsumesDef;
-  typedef sequence <ConsumesDef> ConsumesDefSeq;
-  interface FactoryDef;
-  typedef sequence <FactoryDef> FactoryDefSeq;
-  interface FinderDef;
-  typedef sequence <FinderDef> FinderDefSeq;
-  interface PrimaryKeyDef;
-
-  interface ComponentRepository : CORBA::Repository
-  {
-    ComponentDef create_component (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in ComponentDef base_component,
-        in CORBA::InterfaceDefSeq supports_interfaces
-      );
-    HomeDef create_home (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in HomeDef base_home,
-        in ComponentDef managed_component,
-        in CORBA::ValueDef primary_key
-      );
-  };
+    interface ComponentDef;
+    interface HomeDef;
 
-  interface ProvidesDef : CORBA::Contained 
-  {
-    // read interface
-    readonly attribute CORBA::InterfaceDef interface_type;
-  };
+    interface EventDef : ExtValueDef 
+    {
+    };
 
-  struct ProvidesDescription 
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    CORBA::InterfaceDef interface_type;
-  };
+    interface Container
+    {
+      ComponentDef create_component (
+	  in RepositoryId id,
+	  in Identifier name,
+	  in VersionSpec version,
+	  in ComponentDef base_component,
+	  in InterfaceDefSeq supports_interfaces
+	);
 
-  interface UsesDef : CORBA::Contained 
-  {
-    // read interface
-    readonly attribute CORBA::InterfaceDef interface_type;
-    readonly attribute boolean is_multiple;
-  };
+      HomeDef create_home (
+	  in RepositoryId id,
+	  in Identifier name,
+	  in VersionSpec version,
+	  in HomeDef base_home,
+	  in ComponentDef managed_component,
+	  in InterfaceDefSeq supports_interfaces,
+	  in ValueDef primary_key
+	);
 
-  struct UsesDescription 
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    CORBA::InterfaceDef interface_type;
-    boolean is_multiple;
-  };
+      EventDef create_event (
+	  in RepositoryId id,
+	  in Identifier name,
+	  in VersionSpec version,
+	  in boolean is_custom,
+	  in boolean is_abstract,
+	  in ValueDef base_value,
+	  in boolean is_truncatable,
+	  in ValueDefSeq abstract_base_values,
+	  in InterfaceDefSeq supported_interfaces,
+	in ExtInitializerSeq initializers
+	);
+    };
 
-  typedef sequence <ProvidesDescription> ProvidesDescSeq;
-  typedef sequence <UsesDescription> UsesDescSeq;
+    interface ModuleDef : CORBA::ModuleDef, 
+			  Container
+    {
+    };
 
-  interface EventDef : CORBA::Contained 
-  { // abstract - never instantiated
-    // read interface
-    boolean is_a (in RepositoryId event_id);
-    readonly attribute CORBA::ValueDef event;
-  };
+    interface Repository : CORBA::Repository, 
+			   Container
+    {
+    };
 
-  struct EventDescription 
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    CORBA::ValueDef value;
-  };
+    interface ProvidesDef : Contained 
+    {
+      attribute InterfaceDef interface_type;
+    };
 
-  interface EmitsDef : EventDef 
-  {
-  };
+    struct ProvidesDescription 
+    {
+      Identifier name;
+      RepositoryId id;
+      RepositoryId defined_in;
+      VersionSpec version;
+      RepositoryId interface_type;
+    };
 
-  interface PublishesDef : EventDef 
-  {
-  };
+    interface UsesDef : Contained 
+    {
+      attribute InterfaceDef interface_type;
+      attribute boolean is_multiple;
+    };
 
-  interface ConsumesDef : EventDef 
-  {
-  };
+    struct UsesDescription 
+    {
+      Identifier name;
+      RepositoryId id;
+      RepositoryId defined_in;
+      VersionSpec version;
+      RepositoryId interface_type;
+      boolean is_multiple;
+    };
 
-  interface ComponentDef : CORBA::InterfaceDef 
-  {
-    // read/write interface
-    attribute CORBA::InterfaceDefSeq supported_interfaces;
-    // read interface
-    readonly attribute ComponentDef base_component;
-    readonly attribute ProvidesDefSeq provides_interfaces;
-    readonly attribute UsesDefSeq uses_interfaces;
-    readonly attribute EmitsDefSeq emits_events;
-    readonly attribute PublishesDefSeq publishes_events;
-    readonly attribute ConsumesDefSeq consumes_events;
-    readonly attribute boolean is_basic;
-    // write interface
-    ProvidesDef create_provides (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in CORBA::InterfaceDef interface_type
-      );
-    UsesDef create_uses (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in CORBA::InterfaceDef interface_type,
-        in boolean is_multiple
-      );
-    EmitsDef create_emits (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in CORBA::ValueDef value
-      );
-    PublishesDef create_publishes (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in CORBA::ValueDef value
-      );
-    ConsumesDef create_consumes (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in CORBA::ValueDef value
-      );
-  };
+    interface EventPortDef : Contained 
+    {
+      // read/write interface
+      attribute EventDef event;
+      // read interface
+      boolean is_a (in RepositoryId event_id);
+    };
 
-  struct ComponentDescription 
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    RepositoryId base_component;
-    RepositoryIdSeq supports_interfaces;
-    ProvidesDefSeq provides_interfaces;
-    UsesDefSeq uses_interfaces;
-    CORBA::AttrDescriptionSeq attributes;
-    EmitsDefSeq emits_events;
-    PublishesDefSeq publishes_events;
-    ConsumesDefSeq consumes_events;
-    boolean is_basic;
-  };
+    struct EventPortDescription 
+    {
+      Identifier name;
+      RepositoryId id;
+      RepositoryId defined_in;
+      VersionSpec version;
+      RepositoryId event;
+    };
 
-  interface PrimaryKeyDef : CORBA::Contained 
-  {
-    // read interface
-    boolean is_a (in RepositoryId primary_key_id);
-    readonly attribute CORBA::ValueDef primary_key;
-  };
+    interface EmitsDef : EventPortDef 
+    {
+    };
 
-  struct PrimaryKeyDescription 
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    CORBA::ValueDef primary_key;
-  };
+    interface PublishesDef : EventPortDef 
+    {
+    };
 
-  interface FactoryDef : CORBA::OperationDef 
-  { // only PARAM_IN parameters
-  };
+    interface ConsumesDef : EventPortDef 
+    {
+    };
 
-  interface FinderDef : CORBA::OperationDef 
-  { // only PARAM_IN parameters
-  };
+    interface ComponentDef : ExtInterfaceDef 
+    {
+      // read/write interface
+      attribute ComponentDef base_component;
+      attribute InterfaceDefSeq supported_interfaces;
 
-  interface HomeDef : CORBA::InterfaceDef 
-  {
-    // read operations
-    readonly attribute HomeDef base_home;
-    readonly attribute ComponentDef managed_component;
-    readonly attribute PrimaryKeyDef primary_key;
-    readonly attribute FactoryDefSeq factories;
-    readonly attribute FinderDefSeq finders;
-    readonly attribute boolean is_basic;
-    // write interfaces
-    PrimaryKeyDef create_primary_key (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in CORBA::ValueDef primary_key
-      );
-    FactoryDef create_factory (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in CORBA::ParDescriptionSeq params, // only PARAM_INs
-        in CORBA::ExceptionDefSeq exceptions
-      );
-    FinderDef create_finder (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in CORBA::ParDescriptionSeq params, // only PARAM_INs
-        in CORBA::ExceptionDefSeq exceptions
-      );
-  };
+      // write interface
+      ProvidesDef create_provides (
+	  in RepositoryId id,
+	  in Identifier name,
+	  in VersionSpec version,
+	  in InterfaceDef interface_type
+	);
 
-  struct HomeDescription 
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    RepositoryId base_home;
-    RepositoryId managed_component;
-    PrimaryKeyDef primary_key_def;
-    FactoryDefSeq factories;
-    FinderDefSeq finders;
-    CORBA::OpDescriptionSeq operations;
-    CORBA::AttrDescriptionSeq attributes;
-    boolean is_basic;
+      UsesDef create_uses (
+	  in RepositoryId id,
+	  in Identifier name,
+	  in VersionSpec version,
+	  in InterfaceDef interface_type,
+	  in boolean is_multiple
+	);
+
+      EmitsDef create_emits (
+	  in RepositoryId id,
+	  in Identifier name,
+	  in VersionSpec version,
+	  in EventDef event
+	);
+
+      PublishesDef create_publishes (
+	  in RepositoryId id,
+	  in Identifier name,
+	  in VersionSpec version,
+	  in EventDef event
+	);
+
+      ConsumesDef create_consumes (
+	  in RepositoryId id,
+	  in Identifier name,
+	  in VersionSpec version,
+	  in EventDef event
+	);
+    };
+
+    typedef sequence<ProvidesDescription> ProvidesDescriptionSeq;
+    typedef sequence<UsesDescription> UsesDescriptionSeq;
+    typedef sequence<EventPortDescription> EventPortDescriptionSeq;
+
+    struct ComponentDescription 
+    {
+      Identifier name;
+      RepositoryId id;
+      RepositoryId defined_in;
+      VersionSpec version;
+      RepositoryId base_component;
+      RepositoryIdSeq supported_interfaces;
+      ProvidesDescriptionSeq provided_interfaces;
+      UsesDescriptionSeq used_interfaces;
+      EventPortDescriptionSeq emits_events;
+      EventPortDescriptionSeq publishes_events;
+      EventPortDescriptionSeq consumes_events;
+      ExtAttrDescriptionSeq attributes;
+      TypeCode type;
+    };
+
+    interface FactoryDef : OperationDef 
+    {
+    };
+
+    interface FinderDef : OperationDef 
+    {
+    };
+
+    interface HomeDef : ExtInterfaceDef 
+    {
+      // read/write interface
+      attribute HomeDef base_home;
+      attribute InterfaceDefSeq supported_interfaces;
+      attribute ComponentDef managed_component;
+      attribute ValueDef primary_key;
+
+      // write interface
+      FactoryDef create_factory (
+	  in RepositoryId id,
+	  in Identifier name,
+	  in VersionSpec version,
+	  in ParDescriptionSeq params,
+	  in ExceptionDefSeq exceptions
+	);
+
+      FinderDef create_finder (
+	  in RepositoryId id,
+	  in Identifier name,
+	  in VersionSpec version,
+	  in ParDescriptionSeq params,
+	  in ExceptionDefSeq exceptions
+	);
+    };
+
+    struct HomeDescription 
+    {
+      Identifier name;
+      RepositoryId id;
+      RepositoryId defined_in;
+      VersionSpec version;
+      RepositoryId base_home;
+      RepositoryId managed_component;
+      ValueDescription primary_key;
+      OpDescriptionSeq factories;
+      OpDescriptionSeq finders;
+      OpDescriptionSeq operations;
+      ExtAttrDescriptionSeq attributes;
+      TypeCode type;
+    };
   };
 };
 
-#pragma prefix ""
-
 #endif /* _IFR_COMPONENTS_IDL_ */
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index eb9bf0a0f93..3a9a0b8b0e0 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -20,7 +20,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:314
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
 #include "IFR_ComponentsC.h"
@@ -35,6 +35,7 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -44,2765 +45,941 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_DefinitionKind[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f44), 
-  ACE_NTOHL (0x6566696e), 
-  ACE_NTOHL (0x6974696f), 
-  ACE_NTOHL (0x6e4b696e), 
-  ACE_NTOHL (0x643a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/DefinitionKind:1.0
-15,
-  ACE_NTOHL (0x44656669), 
-  ACE_NTOHL (0x6e697469), 
-  ACE_NTOHL (0x6f6e4b69), 
-  ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-  34, // member count
-8,
-  ACE_NTOHL (0x646b5f6e), 
-  ACE_NTOHL (0x6f6e6500),  // name = dk_none
-7,
-  ACE_NTOHL (0x646b5f61), 
-  ACE_NTOHL (0x6c6c0000),  // name = dk_all
-13,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x74747269), 
-  ACE_NTOHL (0x62757465), 
-  ACE_NTOHL (0x0),  // name = dk_Attribute
-12,
-  ACE_NTOHL (0x646b5f43), 
-  ACE_NTOHL (0x6f6e7374), 
-  ACE_NTOHL (0x616e7400),  // name = dk_Constant
-13,
-  ACE_NTOHL (0x646b5f45), 
-  ACE_NTOHL (0x78636570), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = dk_Exception
-13,
-  ACE_NTOHL (0x646b5f49), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
-  ACE_NTOHL (0x0),  // name = dk_Interface
-10,
-  ACE_NTOHL (0x646b5f4d), 
-  ACE_NTOHL (0x6f64756c), 
-  ACE_NTOHL (0x65000000),  // name = dk_Module
-13,
-  ACE_NTOHL (0x646b5f4f), 
-  ACE_NTOHL (0x70657261), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = dk_Operation
-11,
-  ACE_NTOHL (0x646b5f54), 
-  ACE_NTOHL (0x79706564), 
-  ACE_NTOHL (0x65660000),  // name = dk_Typedef
-9,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x6c696173), 
-  ACE_NTOHL (0x0),  // name = dk_Alias
-10,
-  ACE_NTOHL (0x646b5f53), 
-  ACE_NTOHL (0x74727563), 
-  ACE_NTOHL (0x74000000),  // name = dk_Struct
-9,
-  ACE_NTOHL (0x646b5f55), 
-  ACE_NTOHL (0x6e696f6e), 
-  ACE_NTOHL (0x0),  // name = dk_Union
-8,
-  ACE_NTOHL (0x646b5f45), 
-  ACE_NTOHL (0x6e756d00),  // name = dk_Enum
-13,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x72696d69), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x0),  // name = dk_Primitive
-10,
-  ACE_NTOHL (0x646b5f53), 
-  ACE_NTOHL (0x7472696e), 
-  ACE_NTOHL (0x67000000),  // name = dk_String
-12,
-  ACE_NTOHL (0x646b5f53), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x6e636500),  // name = dk_Sequence
-9,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x72726179), 
-  ACE_NTOHL (0x0),  // name = dk_Array
-14,
-  ACE_NTOHL (0x646b5f52), 
-  ACE_NTOHL (0x65706f73), 
-  ACE_NTOHL (0x69746f72), 
-  ACE_NTOHL (0x79000000),  // name = dk_Repository
-11,
-  ACE_NTOHL (0x646b5f57), 
-  ACE_NTOHL (0x73747269), 
-  ACE_NTOHL (0x6e670000),  // name = dk_Wstring
-9,
-  ACE_NTOHL (0x646b5f46), 
-  ACE_NTOHL (0x69786564), 
-  ACE_NTOHL (0x0),  // name = dk_Fixed
-9,
-  ACE_NTOHL (0x646b5f56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x0),  // name = dk_Value
-12,
-  ACE_NTOHL (0x646b5f56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
-15,
-  ACE_NTOHL (0x646b5f56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x4d656d62), 
-  ACE_NTOHL (0x65720000),  // name = dk_ValueMember
-10,
-  ACE_NTOHL (0x646b5f4e), 
-  ACE_NTOHL (0x61746976), 
-  ACE_NTOHL (0x65000000),  // name = dk_Native
-13,
-  ACE_NTOHL (0x646b5f43), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x0),  // name = dk_Component
-8,
-  ACE_NTOHL (0x646b5f48), 
-  ACE_NTOHL (0x6f6d6500),  // name = dk_Home
-11,
-  ACE_NTOHL (0x646b5f46), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72790000),  // name = dk_Factory
-10,
-  ACE_NTOHL (0x646b5f46), 
-  ACE_NTOHL (0x696e6465), 
-  ACE_NTOHL (0x72000000),  // name = dk_Finder
-14,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x72696d61), 
-  ACE_NTOHL (0x72794b65), 
-  ACE_NTOHL (0x79000000),  // name = dk_PrimaryKey
-9,
-  ACE_NTOHL (0x646b5f45), 
-  ACE_NTOHL (0x6d697473), 
-  ACE_NTOHL (0x0),  // name = dk_Emits
-13,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x75626c69), 
-  ACE_NTOHL (0x73686573), 
-  ACE_NTOHL (0x0),  // name = dk_Publishes
-12,
-  ACE_NTOHL (0x646b5f43), 
-  ACE_NTOHL (0x6f6e7375), 
-  ACE_NTOHL (0x6d657300),  // name = dk_Consumes
-12,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x726f7669), 
-  ACE_NTOHL (0x64657300),  // name = dk_Provides
-8,
-  ACE_NTOHL (0x646b5f55), 
-  ACE_NTOHL (0x73657300),  // name = dk_Uses
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_DefinitionKind (
-    CORBA::tk_enum,
-    sizeof (_oc_IR_DefinitionKind),
-    (char *) &_oc_IR_DefinitionKind,
-    0,
-    sizeof (IR::DefinitionKind)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_DefinitionKind,
-    &_tc_TAO_tc_IR_DefinitionKind
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_Identifier[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f49), 
-  ACE_NTOHL (0x64656e74), 
-  ACE_NTOHL (0x69666965), 
-  ACE_NTOHL (0x723a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
-  11,
-  ACE_NTOHL (0x4964656e), 
-  ACE_NTOHL (0x74696669), 
-  ACE_NTOHL (0x65720000),  // name = Identifier
-  CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_Identifier (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_Identifier),
-    (char *) &_oc_IR_Identifier,
-    0,
-    sizeof (IR::Identifier)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Identifier,
-    &_tc_TAO_tc_IR_Identifier
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_ScopedName[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f53), 
-  ACE_NTOHL (0x636f7065), 
-  ACE_NTOHL (0x644e616d), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ScopedName:1.0
-  11,
-  ACE_NTOHL (0x53636f70), 
-  ACE_NTOHL (0x65644e61), 
-  ACE_NTOHL (0x6d650000),  // name = ScopedName
-  CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_ScopedName (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_ScopedName),
-    (char *) &_oc_IR_ScopedName,
-    0,
-    sizeof (IR::ScopedName)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ScopedName,
-    &_tc_TAO_tc_IR_ScopedName
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_RepositoryId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f52), 
-  ACE_NTOHL (0x65706f73), 
-  ACE_NTOHL (0x69746f72), 
-  ACE_NTOHL (0x7949643a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
-  13,
-  ACE_NTOHL (0x5265706f), 
-  ACE_NTOHL (0x7369746f), 
-  ACE_NTOHL (0x72794964), 
-  ACE_NTOHL (0x0),  // name = RepositoryId
-  CORBA::tk_string, 
-  0U, // string length
-};
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-static CORBA::TypeCode _tc_TAO_tc_IR_RepositoryId (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_RepositoryId),
-    (char *) &_oc_IR_RepositoryId,
-    0,
-    sizeof (IR::RepositoryId)
-  );
+int CORBA::ComponentIR::EventDef::_tao_class_id = 0;
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_RepositoryId,
-    &_tc_TAO_tc_IR_RepositoryId
+CORBA::ComponentIR::EventDef_ptr
+tao_CORBA_ComponentIR_EventDef_duplicate (
+    CORBA::ComponentIR::EventDef_ptr p
   )
-TAO_NAMESPACE_END
-
-#if !defined (_IR_REPOSITORYIDSEQ_CS_)
-#define _IR_REPOSITORYIDSEQ_CS_
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// IR::RepositoryIdSeq
-// *************************************************************
-
-IR::RepositoryIdSeq::RepositoryIdSeq (void)
-{}
-
-IR::RepositoryIdSeq::RepositoryIdSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-IR::RepositoryIdSeq::RepositoryIdSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    char * *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-IR::RepositoryIdSeq::RepositoryIdSeq (const RepositoryIdSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-IR::RepositoryIdSeq::~RepositoryIdSeq (void) // dtor
-{}
-
-void IR::RepositoryIdSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RepositoryIdSeq *tmp = ACE_static_cast (RepositoryIdSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_RepositoryIdSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f52), 
-  ACE_NTOHL (0x65706f73), 
-  ACE_NTOHL (0x69746f72), 
-  ACE_NTOHL (0x79496453), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/RepositoryIdSeq:1.0
-  16,
-  ACE_NTOHL (0x5265706f), 
-  ACE_NTOHL (0x7369746f), 
-  ACE_NTOHL (0x72794964), 
-  ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-  CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      32,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f52), 
-      ACE_NTOHL (0x65706f73), 
-      ACE_NTOHL (0x69746f72), 
-      ACE_NTOHL (0x7949643a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
-      13,
-      ACE_NTOHL (0x5265706f), 
-      ACE_NTOHL (0x7369746f), 
-      ACE_NTOHL (0x72794964), 
-      ACE_NTOHL (0x0),  // name = RepositoryId
-      CORBA::tk_string, 
-      0U, // string length
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_RepositoryIdSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_RepositoryIdSeq),
-    (char *) &_oc_IR_RepositoryIdSeq,
-    0,
-    sizeof (IR::RepositoryIdSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_RepositoryIdSeq,
-    &_tc_TAO_tc_IR_RepositoryIdSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_VersionSpec[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f56), 
-  ACE_NTOHL (0x65727369), 
-  ACE_NTOHL (0x6f6e5370), 
-  ACE_NTOHL (0x65633a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
-  12,
-  ACE_NTOHL (0x56657273), 
-  ACE_NTOHL (0x696f6e53), 
-  ACE_NTOHL (0x70656300),  // name = VersionSpec
-  CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_VersionSpec (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_VersionSpec),
-    (char *) &_oc_IR_VersionSpec,
-    0,
-    sizeof (IR::VersionSpec)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_VersionSpec,
-    &_tc_TAO_tc_IR_VersionSpec
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_allocate_buffer (CORBA::ULong length)
 {
-  IR::ComponentDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      IR::ComponentDef **old = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::ComponentDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
+  return CORBA::ComponentIR::EventDef::_duplicate (p);
 }
 
 void
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::ComponentDef::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
+tao_CORBA_ComponentIR_EventDef_release (
+    CORBA::ComponentIR::EventDef_ptr p
+  )
 {
-  this->_deallocate_buffer ();
+  CORBA::release (p);
 }
 
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+CORBA::ComponentIR::EventDef_ptr
+tao_CORBA_ComponentIR_EventDef_nil (
+    void
+  )
 {
-  IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::ComponentDef::_nil ();
-    }
+  return CORBA::ComponentIR::EventDef::_nil ();
 }
 
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
+CORBA::ComponentIR::EventDef_ptr
+tao_CORBA_ComponentIR_EventDef_narrow (
+    CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, target);
-  *tmp = IR::ComponentDef::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  return CORBA::ComponentIR::EventDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::Object*
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_upcast (void *src) const
+CORBA::Object *
+tao_CORBA_ComponentIR_EventDef_upcast (
+    void *src
+  )
 {
-  IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, src);
+  CORBA::ComponentIR::EventDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::EventDef **, src);
   return *tmp;
 }
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_COMPONENTDEFSEQ_CS_)
-#define _IR_COMPONENTDEFSEQ_CS_
+CORBA::Boolean
+tao_CORBA_ComponentIR_EventDef_marshal (
+    CORBA::ComponentIR::EventDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
-// IR::ComponentDefSeq
+// CORBA::ComponentIR::EventDef_var
 // *************************************************************
 
-IR::ComponentDefSeq::ComponentDefSeq (void)
-{}
-
-IR::ComponentDefSeq::ComponentDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-IR::ComponentDefSeq::ComponentDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IR::ComponentDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-IR::ComponentDefSeq::ComponentDefSeq (const ComponentDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-IR::ComponentDefSeq::~ComponentDefSeq (void) // dtor
+CORBA::ComponentIR::EventDef_var::EventDef_var (void)
+  : ptr_ (EventDef::_nil ())
 {}
 
-void IR::ComponentDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+::CORBA::ComponentIR::EventDef_ptr
+CORBA::ComponentIR::EventDef_var::ptr (void) const
 {
-  ComponentDefSeq *tmp = ACE_static_cast (ComponentDefSeq*, _tao_void_pointer);
-  delete tmp;
+  return this->ptr_;
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+CORBA::ComponentIR::EventDef_var::EventDef_var (const ::CORBA::ComponentIR::EventDef_var &p)
+  : TAO_Base_var (),
+    ptr_ (EventDef::_duplicate (p.ptr ()))
+{}
 
-static const CORBA::Long _oc_IR_ComponentDefSeq[] =
+CORBA::ComponentIR::EventDef_var::~EventDef_var (void)
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f43), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ComponentDefSeq:1.0
-  16,
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x74446566), 
-  ACE_NTOHL (0x53657100),  // name = ComponentDefSeq
-  CORBA::tk_sequence, // typecode kind
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      32,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f43), 
-      ACE_NTOHL (0x6f6d706f), 
-      ACE_NTOHL (0x6e656e74), 
-      ACE_NTOHL (0x4465663a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ComponentDef:1.0
-      13,
-      ACE_NTOHL (0x436f6d70), 
-      ACE_NTOHL (0x6f6e656e), 
-      ACE_NTOHL (0x74446566), 
-      ACE_NTOHL (0x0),  // name = ComponentDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_ComponentDefSeq),
-    (char *) &_oc_IR_ComponentDefSeq,
-    0,
-    sizeof (IR::ComponentDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ComponentDefSeq,
-    &_tc_TAO_tc_IR_ComponentDefSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CS_
+  CORBA::release (this->ptr_);
+}
 
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_allocate_buffer (CORBA::ULong length)
+CORBA::ComponentIR::EventDef_var &
+CORBA::ComponentIR::EventDef_var::operator= (EventDef_ptr p)
 {
-  IR::ProvidesDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      IR::ProvidesDef **old = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::ProvidesDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
 }
 
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_deallocate_buffer (void)
+CORBA::ComponentIR::EventDef_var &
+CORBA::ComponentIR::EventDef_var::operator= (const ::CORBA::ComponentIR::EventDef_var &p)
 {
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::ProvidesDef::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA::ComponentIR::EventDef::_duplicate (p.ptr ());
+  }
+  return *this;
 }
 
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
+CORBA::ComponentIR::EventDef_var::operator const ::CORBA::ComponentIR::EventDef_ptr &() const // cast
 {
-  this->_deallocate_buffer ();
+  return this->ptr_;
 }
 
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+CORBA::ComponentIR::EventDef_var::operator ::CORBA::ComponentIR::EventDef_ptr &() // cast 
 {
-  IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::ProvidesDef::_nil ();
-    }
+  return this->ptr_;
 }
 
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
+::CORBA::ComponentIR::EventDef_ptr
+CORBA::ComponentIR::EventDef_var::operator-> (void) const
 {
-  IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, target);
-  *tmp = IR::ProvidesDef::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  return this->ptr_;
 }
 
-CORBA::Object*
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_upcast (void *src) const
+::CORBA::ComponentIR::EventDef_ptr
+CORBA::ComponentIR::EventDef_var::in (void) const
 {
-  IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, src);
-  return *tmp;
+  return this->ptr_;
 }
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_PROVIDESDEFSEQ_CS_)
-#define _IR_PROVIDESDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// IR::ProvidesDefSeq
-// *************************************************************
-
-IR::ProvidesDefSeq::ProvidesDefSeq (void)
-{}
-
-IR::ProvidesDefSeq::ProvidesDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-IR::ProvidesDefSeq::ProvidesDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IR::ProvidesDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-IR::ProvidesDefSeq::ProvidesDefSeq (const ProvidesDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-IR::ProvidesDefSeq::~ProvidesDefSeq (void) // dtor
-{}
-
-void IR::ProvidesDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+::CORBA::ComponentIR::EventDef_ptr &
+CORBA::ComponentIR::EventDef_var::inout (void)
 {
-  ProvidesDefSeq *tmp = ACE_static_cast (ProvidesDefSeq*, _tao_void_pointer);
-  delete tmp;
+  return this->ptr_;
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_ProvidesDefSeq[] =
+::CORBA::ComponentIR::EventDef_ptr &
+CORBA::ComponentIR::EventDef_var::out (void)
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x726f7669), 
-  ACE_NTOHL (0x64657344), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ProvidesDefSeq:1.0
-  15,
-  ACE_NTOHL (0x50726f76), 
-  ACE_NTOHL (0x69646573), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65710000),  // name = ProvidesDefSeq
-  CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f50), 
-      ACE_NTOHL (0x726f7669), 
-      ACE_NTOHL (0x64657344), 
-      ACE_NTOHL (0x65663a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDef:1.0
-      12,
-      ACE_NTOHL (0x50726f76), 
-      ACE_NTOHL (0x69646573), 
-      ACE_NTOHL (0x44656600),  // name = ProvidesDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_ProvidesDefSeq),
-    (char *) &_oc_IR_ProvidesDefSeq,
-    0,
-    sizeof (IR::ProvidesDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ProvidesDefSeq,
-    &_tc_TAO_tc_IR_ProvidesDefSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CS_
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ComponentIR::EventDef::_nil ();
+  return this->ptr_;
+}
 
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_allocate_buffer (CORBA::ULong length)
+::CORBA::ComponentIR::EventDef_ptr
+CORBA::ComponentIR::EventDef_var::_retn (void)
 {
-  IR::UsesDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      IR::UsesDef **old = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::UsesDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
+  // yield ownership of managed obj reference
+  ::CORBA::ComponentIR::EventDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::EventDef::_nil ();
+  return val;
 }
 
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_deallocate_buffer (void)
+::CORBA::ComponentIR::EventDef_ptr
+CORBA::ComponentIR::EventDef_var::tao_duplicate (EventDef_ptr p)
 {
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::UsesDef::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
+  return ::CORBA::ComponentIR::EventDef::_duplicate (p);
 }
 
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
+void
+CORBA::ComponentIR::EventDef_var::tao_release (EventDef_ptr p)
 {
-  this->_deallocate_buffer ();
+  CORBA::release (p);
 }
 
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+::CORBA::ComponentIR::EventDef_ptr
+CORBA::ComponentIR::EventDef_var::tao_nil (void)
 {
-  IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::UsesDef::_nil ();
-    }
+  return ::CORBA::ComponentIR::EventDef::_nil ();
 }
 
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
+::CORBA::ComponentIR::EventDef_ptr
+CORBA::ComponentIR::EventDef_var::tao_narrow (
+    CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, target);
-  *tmp = IR::UsesDef::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  return ::CORBA::ComponentIR::EventDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::Object*
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_upcast (void *src) const
+CORBA::Object *
+CORBA::ComponentIR::EventDef_var::tao_upcast (void *src)
 {
-  IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, src);
+  EventDef **tmp =
+    ACE_static_cast (EventDef **, src);
   return *tmp;
 }
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_USESDEFSEQ_CS_)
-#define _IR_USESDEFSEQ_CS_
-
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
-// IR::UsesDefSeq
+// CORBA::ComponentIR::EventDef_out
 // *************************************************************
 
-IR::UsesDefSeq::UsesDefSeq (void)
-{}
-
-IR::UsesDefSeq::UsesDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-IR::UsesDefSeq::UsesDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IR::UsesDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-IR::UsesDefSeq::UsesDefSeq (const UsesDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-IR::UsesDefSeq::~UsesDefSeq (void) // dtor
-{}
-
-void IR::UsesDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ComponentIR::EventDef_out::EventDef_out (EventDef_ptr &p)
+  : ptr_ (p)
 {
-  UsesDefSeq *tmp = ACE_static_cast (UsesDefSeq*, _tao_void_pointer);
-  delete tmp;
+  this->ptr_ = ::CORBA::ComponentIR::EventDef::_nil ();
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_UsesDefSeq[] =
+CORBA::ComponentIR::EventDef_out::EventDef_out (EventDef_var &p)
+  : ptr_ (p.out ())
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f55), 
-  ACE_NTOHL (0x73657344), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/UsesDefSeq:1.0
-  11,
-  ACE_NTOHL (0x55736573), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65710000),  // name = UsesDefSeq
-  CORBA::tk_sequence, // typecode kind
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    48, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      27,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f55), 
-      ACE_NTOHL (0x73657344), 
-      ACE_NTOHL (0x65663a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDef:1.0
-      8,
-      ACE_NTOHL (0x55736573), 
-      ACE_NTOHL (0x44656600),  // name = UsesDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_UsesDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_UsesDefSeq),
-    (char *) &_oc_IR_UsesDefSeq,
-    0,
-    sizeof (IR::UsesDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_UsesDefSeq,
-    &_tc_TAO_tc_IR_UsesDefSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ComponentIR::EventDef::_nil ();
+}
 
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CS_
+CORBA::ComponentIR::EventDef_out::EventDef_out (const ::CORBA::ComponentIR::EventDef_out &p)
+  : ptr_ (ACE_const_cast (EventDef_out &, p).ptr_)
+{}
 
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_allocate_buffer (CORBA::ULong length)
+::CORBA::ComponentIR::EventDef_out &
+CORBA::ComponentIR::EventDef_out::operator= (const ::CORBA::ComponentIR::EventDef_out &p)
 {
-  IR::HomeDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      IR::HomeDef **old = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::HomeDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
+  this->ptr_ = ACE_const_cast (EventDef_out&, p).ptr_;
+  return *this;
 }
 
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_deallocate_buffer (void)
+CORBA::ComponentIR::EventDef_out &
+CORBA::ComponentIR::EventDef_out::operator= (const ::CORBA::ComponentIR::EventDef_var &p)
 {
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::HomeDef::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
+  this->ptr_ = ::CORBA::ComponentIR::EventDef::_duplicate (p.ptr ());
+  return *this;
 }
 
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
+CORBA::ComponentIR::EventDef_out &
+CORBA::ComponentIR::EventDef_out::operator= (EventDef_ptr p)
 {
-  this->_deallocate_buffer ();
+  this->ptr_ = p;
+  return *this;
 }
 
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+CORBA::ComponentIR::EventDef_out::operator ::CORBA::ComponentIR::EventDef_ptr &() // cast
 {
-  IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::HomeDef::_nil ();
-    }
+  return this->ptr_;
 }
 
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
+::CORBA::ComponentIR::EventDef_ptr &
+CORBA::ComponentIR::EventDef_out::ptr (void)
 {
-  IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, target);
-  *tmp = IR::HomeDef::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  return this->ptr_;
 }
 
-CORBA::Object*
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_upcast (void *src) const
+::CORBA::ComponentIR::EventDef_ptr
+CORBA::ComponentIR::EventDef_out::operator-> (void)
 {
-  IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, src);
-  return *tmp;
+  return this->ptr_;
 }
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_HOMEDEFSEQ_CS_)
-#define _IR_HOMEDEFSEQ_CS_
-
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// IR::HomeDefSeq
-// *************************************************************
-
-IR::HomeDefSeq::HomeDefSeq (void)
-{}
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
-IR::HomeDefSeq::HomeDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-IR::HomeDefSeq::HomeDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IR::HomeDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
+#if (TAO_HAS_INTERCEPTORS == 1)
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
+#endif /* TAO_HAS_INTERCEPTORS */
 
-IR::HomeDefSeq::HomeDefSeq (const HomeDefSeq &seq)
-  : 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
+///////////////////////////////////////////////////////////////////////
+//                Base & Remote Proxy  Implementation. 
+//
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+CORBA::ComponentIR::_TAO_EventDef_Proxy_Impl::_TAO_EventDef_Proxy_Impl (void)
 {}
 
-IR::HomeDefSeq::~HomeDefSeq (void) // dtor
+CORBA::ComponentIR::_TAO_EventDef_Remote_Proxy_Impl::_TAO_EventDef_Remote_Proxy_Impl (void)
 {}
 
-void IR::HomeDefSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  HomeDefSeq *tmp = ACE_static_cast (HomeDefSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_HomeDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f48), 
-  ACE_NTOHL (0x6f6d6544), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/HomeDefSeq:1.0
-  11,
-  ACE_NTOHL (0x486f6d65), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65710000),  // name = HomeDefSeq
-  CORBA::tk_sequence, // typecode kind
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    48, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      27,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f48), 
-      ACE_NTOHL (0x6f6d6544), 
-      ACE_NTOHL (0x65663a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDef:1.0
-      8,
-      ACE_NTOHL (0x486f6d65), 
-      ACE_NTOHL (0x44656600),  // name = HomeDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_HomeDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_HomeDefSeq),
-    (char *) &_oc_IR_HomeDefSeq,
-    0,
-    sizeof (IR::HomeDefSeq)
-  );
+// Remote Implementation of the IDL interface methods
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_HomeDefSeq,
-    &_tc_TAO_tc_IR_HomeDefSeq
-  )
-TAO_NAMESPACE_END
+//
+//            End  Base & Remote  Proxy Implemeentation. 
+///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CS_
+///////////////////////////////////////////////////////////////////////
+//           Remote & Base  Proxy Broker Implementation
+//
 
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_allocate_buffer (CORBA::ULong length)
+CORBA::ComponentIR::_TAO_EventDef_Proxy_Broker::_TAO_EventDef_Proxy_Broker (void)
 {
-  IR::EmitsDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      IR::EmitsDef **old = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::EmitsDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
 }
 
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_deallocate_buffer (void)
+CORBA::ComponentIR::_TAO_EventDef_Proxy_Broker::~_TAO_EventDef_Proxy_Broker (void)
 {
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::EmitsDef::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
 }
 
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
-{
-  this->_deallocate_buffer ();
-}
+CORBA::ComponentIR::_TAO_EventDef_Proxy_Broker * (*CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+// Factory Member function Implementation.
+CORBA::ComponentIR::_TAO_EventDef_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker (void)
 {
-  IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::EmitsDef::_nil ();
-    }
+  static ::CORBA::ComponentIR::_TAO_EventDef_Remote_Proxy_Broker remote_proxy_broker;
+  return &remote_proxy_broker;
 }
 
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
+CORBA::ComponentIR::_TAO_EventDef_Remote_Proxy_Broker::_TAO_EventDef_Remote_Proxy_Broker (void)
 {
-  IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, target);
-  *tmp = IR::EmitsDef::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
-CORBA::Object*
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_upcast (void *src) const
+CORBA::ComponentIR::_TAO_EventDef_Remote_Proxy_Broker::~_TAO_EventDef_Remote_Proxy_Broker (void)
 {
-  IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, src);
-  return *tmp;
 }
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_EMITSDEFSEQ_CS_)
-#define _IR_EMITSDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// IR::EmitsDefSeq
-// *************************************************************
-
-IR::EmitsDefSeq::EmitsDefSeq (void)
-{}
-
-IR::EmitsDefSeq::EmitsDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-IR::EmitsDefSeq::EmitsDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IR::EmitsDef_ptr *buffer,
-    CORBA::Boolean release
+CORBA::ComponentIR::_TAO_EventDef_Proxy_Impl&
+CORBA::ComponentIR::_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::EventDef *
+    ACE_ENV_ARG_DECL_NOT_USED
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-IR::EmitsDefSeq::EmitsDefSeq (const EmitsDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-IR::EmitsDefSeq::~EmitsDefSeq (void) // dtor
-{}
-
-void IR::EmitsDefSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  EmitsDefSeq *tmp = ACE_static_cast (EmitsDefSeq*, _tao_void_pointer);
-  delete tmp;
+  return this->remote_proxy_impl_;
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_EmitsDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f45), 
-  ACE_NTOHL (0x6d697473), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/EmitsDefSeq:1.0
-  12,
-  ACE_NTOHL (0x456d6974), 
-  ACE_NTOHL (0x73446566), 
-  ACE_NTOHL (0x53657100),  // name = EmitsDefSeq
-  CORBA::tk_sequence, // typecode kind
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    52, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      28,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f45), 
-      ACE_NTOHL (0x6d697473), 
-      ACE_NTOHL (0x4465663a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EmitsDef:1.0
-      9,
-      ACE_NTOHL (0x456d6974), 
-      ACE_NTOHL (0x73446566), 
-      ACE_NTOHL (0x0),  // name = EmitsDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_EmitsDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_EmitsDefSeq),
-    (char *) &_oc_IR_EmitsDefSeq,
-    0,
-    sizeof (IR::EmitsDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_EmitsDefSeq,
-    &_tc_TAO_tc_IR_EmitsDefSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_allocate_buffer (CORBA::ULong length)
-{
-  IR::PublishesDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      IR::PublishesDef **old = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::PublishesDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+//
+//           End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
 
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::PublishesDef::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
+CORBA::ComponentIR::EventDef::EventDef (int collocated)
 {
-  this->_deallocate_buffer ();
+  this->CORBA_ComponentIR_EventDef_setup_collocation (collocated);
 }
 
 void
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+CORBA::ComponentIR::EventDef::CORBA_ComponentIR_EventDef_setup_collocation (int collocated)
 {
-  IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
+  if (collocated)
+    this->the_TAO_EventDef_Proxy_Broker_ =
+      ::CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
+  else
+    this->the_TAO_EventDef_Proxy_Broker_ =
+      ::CORBA::ComponentIR::_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker ();
   
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::PublishesDef::_nil ();
-    }
-}
-
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, target);
-  *tmp = IR::PublishesDef::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_upcast (void *src) const
-{
-  IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, src);
-  return *tmp;
+  this->CORBA_ExtValueDef_setup_collocation (collocated);
 }
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_PUBLISHESDEFSEQ_CS_)
-#define _IR_PUBLISHESDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// IR::PublishesDefSeq
-// *************************************************************
-
-IR::PublishesDefSeq::PublishesDefSeq (void)
-{}
-
-IR::PublishesDefSeq::PublishesDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-IR::PublishesDefSeq::PublishesDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IR::PublishesDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-IR::PublishesDefSeq::PublishesDefSeq (const PublishesDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+CORBA::ComponentIR::EventDef::~EventDef (void)
 {}
 
-IR::PublishesDefSeq::~PublishesDefSeq (void) // dtor
-{}
-
-void IR::PublishesDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+void 
+CORBA::ComponentIR::EventDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  PublishesDefSeq *tmp = ACE_static_cast (PublishesDefSeq*, _tao_void_pointer);
-  delete tmp;
+  EventDef *tmp = ACE_static_cast (EventDef *, _tao_void_pointer);
+  CORBA::release (tmp);
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_PublishesDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x75626c69), 
-  ACE_NTOHL (0x73686573), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/PublishesDefSeq:1.0
-  16,
-  ACE_NTOHL (0x5075626c), 
-  ACE_NTOHL (0x69736865), 
-  ACE_NTOHL (0x73446566), 
-  ACE_NTOHL (0x53657100),  // name = PublishesDefSeq
-  CORBA::tk_sequence, // typecode kind
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      32,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f50), 
-      ACE_NTOHL (0x75626c69), 
-      ACE_NTOHL (0x73686573), 
-      ACE_NTOHL (0x4465663a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PublishesDef:1.0
-      13,
-      ACE_NTOHL (0x5075626c), 
-      ACE_NTOHL (0x69736865), 
-      ACE_NTOHL (0x73446566), 
-      ACE_NTOHL (0x0),  // name = PublishesDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_PublishesDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_PublishesDefSeq),
-    (char *) &_oc_IR_PublishesDefSeq,
-    0,
-    sizeof (IR::PublishesDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_PublishesDefSeq,
-    &_tc_TAO_tc_IR_PublishesDefSeq
+CORBA::ComponentIR::EventDef_ptr
+CORBA::ComponentIR::EventDef::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
   )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_allocate_buffer (CORBA::ULong length)
 {
-  IR::ConsumesDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (length);
+  if (CORBA::is_nil (obj))
+    {
+      return EventDef::_nil ();
+    }
   
-  if (this->buffer_ != 0)
+  if (! obj->_is_local ())
     {
-      IR::ConsumesDef **old = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::ConsumesDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
+      ACE_CHECK_RETURN (EventDef::_nil ());
       
-      if (this->release_)
+      if (is_a == 0)
         {
-          delete [] old;
+          return EventDef::_nil ();
         }
     }
   
-  this->buffer_ = tmp;
+  return EventDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_deallocate_buffer (void)
+CORBA::ComponentIR::EventDef_ptr 
+CORBA::ComponentIR::EventDef::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  if (this->buffer_ == 0 || this->release_ == 0)
+  if (CORBA::is_nil (obj))
     {
-      return;
+      return EventDef::_nil ();
     }
   
-  IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
+  if (! obj->_is_local ())
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::ConsumesDef::_nil ();
+      TAO_Stub* stub = obj->_stubobj ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
+      EventDef_ptr default_proxy = EventDef::_nil ();
+      
+      if (
+          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+          obj->_is_collocated () &&
+          CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer != 0
+        )
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ComponentIR::EventDef (
+                  stub,
+                  1,
+                  obj->_servant ()
+                ),
+              EventDef::_nil ()
+            );
+        }
+      
+      if (CORBA::is_nil (default_proxy))
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ComponentIR::EventDef (
+                  stub,
+                  0,
+                  obj->_servant ()
+                ),
+              EventDef::_nil ()
+            );
+        }
+      
+      return default_proxy;
     }
-  
-  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
-{
-  this->_deallocate_buffer ();
+  else 
+    return
+      ACE_reinterpret_cast (
+          EventDef_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &EventDef::_tao_class_id
+                )
+            )
+        );
 }
 
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+CORBA::ComponentIR::EventDef_ptr
+CORBA::ComponentIR::EventDef::_duplicate (EventDef_ptr obj)
 {
-  IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
+  if (! CORBA::is_nil (obj))
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::ConsumesDef::_nil ();
+      obj->_add_ref ();
     }
+  
+  return obj;
 }
 
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
+CORBA::Boolean
+CORBA::ComponentIR::EventDef::_is_a (
+    const char *value
     ACE_ENV_ARG_DECL
   )
 {
-  IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, target);
-  *tmp = IR::ConsumesDef::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_upcast (void *src) const
-{
-  IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, src);
-  return *tmp;
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ExtValueDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ValueDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Container:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Contained:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/IDLType:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/IRObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
 }
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_CONSUMESDEFSEQ_CS_)
-#define _IR_CONSUMESDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// IR::ConsumesDefSeq
-// *************************************************************
-
-IR::ConsumesDefSeq::ConsumesDefSeq (void)
-{}
-
-IR::ConsumesDefSeq::ConsumesDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-IR::ConsumesDefSeq::ConsumesDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IR::ConsumesDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-IR::ConsumesDefSeq::ConsumesDefSeq (const ConsumesDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-IR::ConsumesDefSeq::~ConsumesDefSeq (void) // dtor
-{}
-
-void IR::ConsumesDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+void *CORBA::ComponentIR::EventDef::_tao_QueryInterface (ptr_arith_t type)
 {
-  ConsumesDefSeq *tmp = ACE_static_cast (ConsumesDefSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_ConsumesDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f43), 
-  ACE_NTOHL (0x6f6e7375), 
-  ACE_NTOHL (0x6d657344), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ConsumesDefSeq:1.0
-  15,
-  ACE_NTOHL (0x436f6e73), 
-  ACE_NTOHL (0x756d6573), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65710000),  // name = ConsumesDefSeq
-  CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f43), 
-      ACE_NTOHL (0x6f6e7375), 
-      ACE_NTOHL (0x6d657344), 
-      ACE_NTOHL (0x65663a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ConsumesDef:1.0
-      12,
-      ACE_NTOHL (0x436f6e73), 
-      ACE_NTOHL (0x756d6573), 
-      ACE_NTOHL (0x44656600),  // name = ConsumesDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_ConsumesDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_ConsumesDefSeq),
-    (char *) &_oc_IR_ConsumesDefSeq,
-    0,
-    sizeof (IR::ConsumesDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ConsumesDefSeq,
-    &_tc_TAO_tc_IR_ConsumesDefSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_allocate_buffer (CORBA::ULong length)
-{
-  IR::FactoryDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (length);
+  void *retv = 0;
   
-  if (this->buffer_ != 0)
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, EventDef)::_tao_class_id)
+            )
     {
-      IR::FactoryDef **old = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::FactoryDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
+      retv = ACE_reinterpret_cast (void*, this);
     }
-  
-  this->buffer_ = tmp;
-}
-
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::ExtValueDef::_tao_class_id)
+            )
     {
-      return;
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::ExtValueDef_ptr,
+                this
+              )
+          );
     }
-  
-  IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::ValueDef::_tao_class_id)
+            )
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::FactoryDef::_nil ();
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::ValueDef_ptr,
+                this
+              )
+          );
     }
-  
-  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Container::_tao_class_id)
+            )
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::FactoryDef::_nil ();
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Container_ptr,
+                this
+              )
+          );
     }
-}
-
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, target);
-  *tmp = IR::FactoryDef::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_upcast (void *src) const
-{
-  IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, src);
-  return *tmp;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_FACTORYDEFSEQ_CS_)
-#define _IR_FACTORYDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// IR::FactoryDefSeq
-// *************************************************************
-
-IR::FactoryDefSeq::FactoryDefSeq (void)
-{}
-
-IR::FactoryDefSeq::FactoryDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-IR::FactoryDefSeq::FactoryDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IR::FactoryDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-IR::FactoryDefSeq::FactoryDefSeq (const FactoryDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-IR::FactoryDefSeq::~FactoryDefSeq (void) // dtor
-{}
-
-void IR::FactoryDefSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  FactoryDefSeq *tmp = ACE_static_cast (FactoryDefSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_FactoryDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f46), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72794465), 
-  ACE_NTOHL (0x66536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FactoryDefSeq:1.0
-  14,
-  ACE_NTOHL (0x46616374), 
-  ACE_NTOHL (0x6f727944), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x71000000),  // name = FactoryDefSeq
-  CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      30,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f46), 
-      ACE_NTOHL (0x6163746f), 
-      ACE_NTOHL (0x72794465), 
-      ACE_NTOHL (0x663a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/FactoryDef:1.0
-      11,
-      ACE_NTOHL (0x46616374), 
-      ACE_NTOHL (0x6f727944), 
-      ACE_NTOHL (0x65660000),  // name = FactoryDef
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_FactoryDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_FactoryDefSeq),
-    (char *) &_oc_IR_FactoryDefSeq,
-    0,
-    sizeof (IR::FactoryDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_FactoryDefSeq,
-    &_tc_TAO_tc_IR_FactoryDefSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_allocate_buffer (CORBA::ULong length)
-{
-  IR::FinderDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Contained::_tao_class_id)
+            )
     {
-      IR::FinderDef **old = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = IR::FinderDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Contained_ptr,
+                this
+              )
+          );
     }
-  
-  this->buffer_ = tmp;
-}
-
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::IDLType::_tao_class_id)
+            )
     {
-      return;
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::IDLType_ptr,
+                this
+              )
+          );
     }
-  
-  IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::IRObject::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::IRObject_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::FinderDef::_nil ();
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
     }
   
-  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
+  if (retv != 0)
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::FinderDef::_nil ();
+      this->_add_ref ();
     }
+  
+  return retv;
 }
 
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, target);
-  *tmp = IR::FinderDef::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_upcast (void *src) const
-{
-  IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, src);
-  return *tmp;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_FINDERDEFSEQ_CS_)
-#define _IR_FINDERDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// IR::FinderDefSeq
-// *************************************************************
-
-IR::FinderDefSeq::FinderDefSeq (void)
-{}
-
-IR::FinderDefSeq::FinderDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-IR::FinderDefSeq::FinderDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IR::FinderDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-IR::FinderDefSeq::FinderDefSeq (const FinderDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-IR::FinderDefSeq::~FinderDefSeq (void) // dtor
-{}
-
-void IR::FinderDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+const char* CORBA::ComponentIR::EventDef::_interface_repository_id (void) const
 {
-  FinderDefSeq *tmp = ACE_static_cast (FinderDefSeq*, _tao_void_pointer);
-  delete tmp;
+  return "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0";
 }
 
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_FinderDefSeq[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_EventDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
+  43,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f46), 
-  ACE_NTOHL (0x696e6465), 
-  ACE_NTOHL (0x72446566), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/FinderDefSeq:1.0
-  13,
-  ACE_NTOHL (0x46696e64), 
-  ACE_NTOHL (0x65724465), 
-  ACE_NTOHL (0x66536571), 
-  ACE_NTOHL (0x0),  // name = FinderDefSeq
-  CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      29,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f46), 
-      ACE_NTOHL (0x696e6465), 
-      ACE_NTOHL (0x72446566), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FinderDef:1.0
-      10,
-      ACE_NTOHL (0x46696e64), 
-      ACE_NTOHL (0x65724465), 
-      ACE_NTOHL (0x66000000),  // name = FinderDef
-
-    0U,
-
-};
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4576), 
+  ACE_NTOHL (0x656e7444), 
+  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventDef:1.0
+    9,
+  ACE_NTOHL (0x4576656e), 
+  ACE_NTOHL (0x74446566), 
+  ACE_NTOHL (0x0),  // name = EventDef
+  };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_FinderDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_FinderDefSeq),
-    (char *) &_oc_IR_FinderDefSeq,
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_EventDef (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_ComponentIR_EventDef),
+    (char *) &_oc_CORBA_ComponentIR_EventDef,
     0,
-    sizeof (IR::FinderDefSeq)
+    sizeof (CORBA::ComponentIR::EventDef)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
-    _tc_FinderDefSeq,
-    &_tc_TAO_tc_IR_FinderDefSeq
+    _tc_EventDef,
+    &_tc_TAO_tc_CORBA_ComponentIR_EventDef
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-int IR::ComponentRepository::_tao_class_id = 0;
+int CORBA::ComponentIR::Container::_tao_class_id = 0;
 
-IR::ComponentRepository_ptr
-tao_IR_ComponentRepository_duplicate (
-    IR::ComponentRepository_ptr p
+CORBA::ComponentIR::Container_ptr
+tao_CORBA_ComponentIR_Container_duplicate (
+    CORBA::ComponentIR::Container_ptr p
   )
 {
-  return IR::ComponentRepository::_duplicate (p);
+  return CORBA::ComponentIR::Container::_duplicate (p);
 }
 
 void
-tao_IR_ComponentRepository_release (
-    IR::ComponentRepository_ptr p
+tao_CORBA_ComponentIR_Container_release (
+    CORBA::ComponentIR::Container_ptr p
   )
 {
   CORBA::release (p);
 }
 
-IR::ComponentRepository_ptr
-tao_IR_ComponentRepository_nil (
+CORBA::ComponentIR::Container_ptr
+tao_CORBA_ComponentIR_Container_nil (
     void
   )
 {
-  return IR::ComponentRepository::_nil ();
+  return CORBA::ComponentIR::Container::_nil ();
 }
 
-IR::ComponentRepository_ptr
-tao_IR_ComponentRepository_narrow (
+CORBA::ComponentIR::Container_ptr
+tao_CORBA_ComponentIR_Container_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return IR::ComponentRepository::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::Container::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-tao_IR_ComponentRepository_upcast (
+tao_CORBA_ComponentIR_Container_upcast (
     void *src
   )
 {
-  IR::ComponentRepository **tmp =
-    ACE_static_cast (IR::ComponentRepository **, src);
+  CORBA::ComponentIR::Container **tmp =
+    ACE_static_cast (CORBA::ComponentIR::Container **, src);
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ComponentIR_Container_marshal (
+    CORBA::ComponentIR::Container_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
-// IR::ComponentRepository_var
+// CORBA::ComponentIR::Container_var
 // *************************************************************
 
-IR::ComponentRepository_var::ComponentRepository_var (void)
-  : ptr_ (ComponentRepository::_nil ())
+CORBA::ComponentIR::Container_var::Container_var (void)
+  : ptr_ (Container::_nil ())
 {}
 
-::IR::ComponentRepository_ptr
-IR::ComponentRepository_var::ptr (void) const
+::CORBA::ComponentIR::Container_ptr
+CORBA::ComponentIR::Container_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-IR::ComponentRepository_var::ComponentRepository_var (const ::IR::ComponentRepository_var &p)
+CORBA::ComponentIR::Container_var::Container_var (const ::CORBA::ComponentIR::Container_var &p)
   : TAO_Base_var (),
-    ptr_ (ComponentRepository::_duplicate (p.ptr ()))
+    ptr_ (Container::_duplicate (p.ptr ()))
 {}
 
-IR::ComponentRepository_var::~ComponentRepository_var (void)
+CORBA::ComponentIR::Container_var::~Container_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
-IR::ComponentRepository_var &
-IR::ComponentRepository_var::operator= (ComponentRepository_ptr p)
+CORBA::ComponentIR::Container_var &
+CORBA::ComponentIR::Container_var::operator= (Container_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-IR::ComponentRepository_var &
-IR::ComponentRepository_var::operator= (const ::IR::ComponentRepository_var &p)
+CORBA::ComponentIR::Container_var &
+CORBA::ComponentIR::Container_var::operator= (const ::CORBA::ComponentIR::Container_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::ComponentRepository::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::ComponentIR::Container::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-IR::ComponentRepository_var::operator const ::IR::ComponentRepository_ptr &() const // cast
+CORBA::ComponentIR::Container_var::operator const ::CORBA::ComponentIR::Container_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-IR::ComponentRepository_var::operator ::IR::ComponentRepository_ptr &() // cast 
+CORBA::ComponentIR::Container_var::operator ::CORBA::ComponentIR::Container_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::IR::ComponentRepository_ptr
-IR::ComponentRepository_var::operator-> (void) const
+::CORBA::ComponentIR::Container_ptr
+CORBA::ComponentIR::Container_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::IR::ComponentRepository_ptr
-IR::ComponentRepository_var::in (void) const
+::CORBA::ComponentIR::Container_ptr
+CORBA::ComponentIR::Container_var::in (void) const
 {
   return this->ptr_;
 }
 
-::IR::ComponentRepository_ptr &
-IR::ComponentRepository_var::inout (void)
+::CORBA::ComponentIR::Container_ptr &
+CORBA::ComponentIR::Container_var::inout (void)
 {
   return this->ptr_;
 }
 
-::IR::ComponentRepository_ptr &
-IR::ComponentRepository_var::out (void)
+::CORBA::ComponentIR::Container_ptr &
+CORBA::ComponentIR::Container_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::ComponentRepository::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::Container::_nil ();
   return this->ptr_;
 }
 
-::IR::ComponentRepository_ptr
-IR::ComponentRepository_var::_retn (void)
+::CORBA::ComponentIR::Container_ptr
+CORBA::ComponentIR::Container_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::IR::ComponentRepository_ptr val = this->ptr_;
-  this->ptr_ = ::IR::ComponentRepository::_nil ();
+  ::CORBA::ComponentIR::Container_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::Container::_nil ();
   return val;
 }
 
-::IR::ComponentRepository_ptr
-IR::ComponentRepository_var::tao_duplicate (ComponentRepository_ptr p)
+::CORBA::ComponentIR::Container_ptr
+CORBA::ComponentIR::Container_var::tao_duplicate (Container_ptr p)
 {
-  return ::IR::ComponentRepository::_duplicate (p);
+  return ::CORBA::ComponentIR::Container::_duplicate (p);
 }
 
 void
-IR::ComponentRepository_var::tao_release (ComponentRepository_ptr p)
+CORBA::ComponentIR::Container_var::tao_release (Container_ptr p)
 {
   CORBA::release (p);
 }
 
-::IR::ComponentRepository_ptr
-IR::ComponentRepository_var::tao_nil (void)
+::CORBA::ComponentIR::Container_ptr
+CORBA::ComponentIR::Container_var::tao_nil (void)
 {
-  return ::IR::ComponentRepository::_nil ();
+  return ::CORBA::ComponentIR::Container::_nil ();
 }
 
-::IR::ComponentRepository_ptr
-IR::ComponentRepository_var::tao_narrow (
+::CORBA::ComponentIR::Container_ptr
+CORBA::ComponentIR::Container_var::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::ComponentRepository::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::CORBA::ComponentIR::Container::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IR::ComponentRepository_var::tao_upcast (void *src)
+CORBA::ComponentIR::Container_var::tao_upcast (void *src)
 {
-  ComponentRepository **tmp =
-    ACE_static_cast (ComponentRepository **, src);
+  Container **tmp =
+    ACE_static_cast (Container **, src);
   return *tmp;
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
-// IR::ComponentRepository_out
+// CORBA::ComponentIR::Container_out
 // *************************************************************
 
-IR::ComponentRepository_out::ComponentRepository_out (ComponentRepository_ptr &p)
+CORBA::ComponentIR::Container_out::Container_out (Container_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::IR::ComponentRepository::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::Container::_nil ();
 }
 
-IR::ComponentRepository_out::ComponentRepository_out (ComponentRepository_var &p)
+CORBA::ComponentIR::Container_out::Container_out (Container_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::ComponentRepository::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::Container::_nil ();
 }
 
-IR::ComponentRepository_out::ComponentRepository_out (const ::IR::ComponentRepository_out &p)
-  : ptr_ (ACE_const_cast (ComponentRepository_out &, p).ptr_)
+CORBA::ComponentIR::Container_out::Container_out (const ::CORBA::ComponentIR::Container_out &p)
+  : ptr_ (ACE_const_cast (Container_out &, p).ptr_)
 {}
 
-::IR::ComponentRepository_out &
-IR::ComponentRepository_out::operator= (const ::IR::ComponentRepository_out &p)
+::CORBA::ComponentIR::Container_out &
+CORBA::ComponentIR::Container_out::operator= (const ::CORBA::ComponentIR::Container_out &p)
 {
-  this->ptr_ = ACE_const_cast (ComponentRepository_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (Container_out&, p).ptr_;
   return *this;
 }
 
-IR::ComponentRepository_out &
-IR::ComponentRepository_out::operator= (const ::IR::ComponentRepository_var &p)
+CORBA::ComponentIR::Container_out &
+CORBA::ComponentIR::Container_out::operator= (const ::CORBA::ComponentIR::Container_var &p)
 {
-  this->ptr_ = ::IR::ComponentRepository::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::ComponentIR::Container::_duplicate (p.ptr ());
   return *this;
 }
 
-IR::ComponentRepository_out &
-IR::ComponentRepository_out::operator= (ComponentRepository_ptr p)
+CORBA::ComponentIR::Container_out &
+CORBA::ComponentIR::Container_out::operator= (Container_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-IR::ComponentRepository_out::operator ::IR::ComponentRepository_ptr &() // cast
+CORBA::ComponentIR::Container_out::operator ::CORBA::ComponentIR::Container_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::IR::ComponentRepository_ptr &
-IR::ComponentRepository_out::ptr (void)
+::CORBA::ComponentIR::Container_ptr &
+CORBA::ComponentIR::Container_out::ptr (void)
 {
   return this->ptr_;
 }
 
-::IR::ComponentRepository_ptr
-IR::ComponentRepository_out::operator-> (void)
+::CORBA::ComponentIR::Container_ptr
+CORBA::ComponentIR::Container_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_ComponentRepository_create_component : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_ComponentRepository_create_component (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
       const char * name,
       const char * version,
-      IR::ComponentDef_ptr base_component,
+      CORBA::ComponentIR::ComponentDef_ptr base_component,
       const CORBA::InterfaceDefSeq & supports_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
@@ -2815,30 +992,30 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::ComponentDef_ptr result);
+    void result (::CORBA::ComponentIR::ComponentDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_ComponentRepository_create_component (const TAO_ClientRequestInfo_IR_ComponentRepository_create_component &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentRepository_create_component &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component (const TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component &);
     const char * id_;
     const char * name_;
     const char * version_;
-    IR::ComponentDef_ptr base_component_;
+    CORBA::ComponentIR::ComponentDef_ptr base_component_;
     const CORBA::InterfaceDefSeq & supports_interfaces_;
     
-    ::IR::ComponentDef_ptr _result;
+    ::CORBA::ComponentIR::ComponentDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequestInfo_IR_ComponentRepository_create_component (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component::TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
       const char * name,
       const char * version,
-      IR::ComponentDef_ptr base_component,
+      CORBA::ComponentIR::ComponentDef_ptr base_component,
       const CORBA::InterfaceDefSeq & supports_interfaces
       ACE_ENV_ARG_DECL_NOT_USED      
     )
@@ -2851,7 +1028,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -2887,7 +1064,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (ACE_EN
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -2899,7 +1076,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (ACE_E
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -2915,26 +1092,27 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (ACE_ENV_S
 }
 
 void 
-TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (::IR::ComponentDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component::result (::CORBA::ComponentIR::ComponentDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_ComponentRepository_create_home : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_ComponentRepository_create_home (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
       const char * name,
       const char * version,
-      IR::HomeDef_ptr base_home,
-      IR::ComponentDef_ptr managed_component,
+      CORBA::ComponentIR::HomeDef_ptr base_home,
+      CORBA::ComponentIR::ComponentDef_ptr managed_component,
+      const CORBA::InterfaceDefSeq & supports_interfaces,
       CORBA::ValueDef_ptr primary_key
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
@@ -2947,32 +1125,34 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::HomeDef_ptr result);
+    void result (::CORBA::ComponentIR::HomeDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_ComponentRepository_create_home (const TAO_ClientRequestInfo_IR_ComponentRepository_create_home &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentRepository_create_home &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home (const TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home &);
     const char * id_;
     const char * name_;
     const char * version_;
-    IR::HomeDef_ptr base_home_;
-    IR::ComponentDef_ptr managed_component_;
+    CORBA::ComponentIR::HomeDef_ptr base_home_;
+    CORBA::ComponentIR::ComponentDef_ptr managed_component_;
+    const CORBA::InterfaceDefSeq & supports_interfaces_;
     CORBA::ValueDef_ptr primary_key_;
     
-    ::IR::HomeDef_ptr _result;
+    ::CORBA::ComponentIR::HomeDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_IR_ComponentRepository_create_home (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home::TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
       const char * name,
       const char * version,
-      IR::HomeDef_ptr base_home,
-      IR::ComponentDef_ptr managed_component,
+      CORBA::ComponentIR::HomeDef_ptr base_home,
+      CORBA::ComponentIR::ComponentDef_ptr managed_component,
+      const CORBA::InterfaceDefSeq & supports_interfaces,
       CORBA::ValueDef_ptr primary_key
       ACE_ENV_ARG_DECL_NOT_USED      
     )
@@ -2982,11 +1162,12 @@ public:
       version_ (version),
       base_home_ (base_home),
       managed_component_ (managed_component),
+      supports_interfaces_ (supports_interfaces),
       primary_key_ (primary_key)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -2996,7 +1177,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (ACE_ENV_SIN
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   
-  parameter_list->length (6);
+  parameter_list->length (7);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
@@ -3018,6 +1199,10 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (ACE_ENV_SIN
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
+  (*parameter_list)[len].argument <<=  this->supports_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
   (*parameter_list)[len].argument <<=  this->primary_key_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -3026,7 +1211,178 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (ACE_ENV_SIN
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
+void 
+TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home::result (::CORBA::ComponentIR::HomeDef_ptr result)
+{
+  // Update the result. 
+  this->_result = result;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA::Boolean & is_custom,
+      const CORBA::Boolean & is_abstract,
+      CORBA::ValueDef_ptr base_value,
+      const CORBA::Boolean & is_truncatable,
+      const CORBA::ValueDefSeq & abstract_base_values,
+      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA::ExtInitializerSeq & initializers
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::ComponentIR::EventDef_ptr result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event (const TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event &);
+    const char * id_;
+    const char * name_;
+    const char * version_;
+    const CORBA::Boolean & is_custom_;
+    const CORBA::Boolean & is_abstract_;
+    CORBA::ValueDef_ptr base_value_;
+    const CORBA::Boolean & is_truncatable_;
+    const CORBA::ValueDefSeq & abstract_base_values_;
+    const CORBA::InterfaceDefSeq & supported_interfaces_;
+    const CORBA::ExtInitializerSeq & initializers_;
+    
+    ::CORBA::ComponentIR::EventDef_ptr _result;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event::TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA::Boolean & is_custom,
+      const CORBA::Boolean & is_abstract,
+      CORBA::ValueDef_ptr base_value,
+      const CORBA::Boolean & is_truncatable,
+      const CORBA::ValueDefSeq & abstract_base_values,
+      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA::ExtInitializerSeq & initializers
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      id_ (id),
+      name_ (name),
+      version_ (version),
+      is_custom_ (is_custom),
+      is_abstract_ (is_abstract),
+      base_value_ (base_value),
+      is_truncatable_ (is_truncatable),
+      abstract_base_values_ (abstract_base_values),
+      supported_interfaces_ (supported_interfaces),
+      initializers_ (initializers)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (10);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_custom_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->base_value_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->abstract_base_values_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->supported_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->initializers_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -3038,7 +1394,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (ACE_ENV_SI
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -3054,7 +1410,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (ACE_ENV_SINGLE
 }
 
 void 
-TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (::IR::HomeDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event::result (::CORBA::ComponentIR::EventDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
@@ -3063,29 +1419,29 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (::IR::HomeDef_
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
 
-IR::_TAO_ComponentRepository_Proxy_Impl::_TAO_ComponentRepository_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_Container_Proxy_Impl::_TAO_Container_Proxy_Impl (void)
 {}
 
-IR::_TAO_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_Remote_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_component (
+::CORBA::ComponentIR::ComponentDef_ptr CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::create_component (
     CORBA::Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    IR::ComponentDef_ptr base_component,
+    CORBA::ComponentIR::ComponentDef_ptr base_component,
     const CORBA::InterfaceDefSeq & supports_interfaces
     ACE_ENV_ARG_DECL
   )
@@ -3093,7 +1449,7 @@ IR::_TAO_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_Remote_
     CORBA::SystemException
   ))
 {
-  IR::ComponentDef_var _tao_retval (IR::ComponentDef::_nil ());
+  CORBA::ComponentIR::ComponentDef_var _tao_retval (CORBA::ComponentIR::ComponentDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
@@ -3125,7 +1481,7 @@ IR::_TAO_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_Remote_
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentRepository_create_component _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           id,
@@ -3155,99 +1511,91 @@ IR::_TAO_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_Remote_
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << base_component) &&
+              (_tao_out << supports_interfaces)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << base_component) &&
-                  (_tao_out << supports_interfaces)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::ComponentDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::ComponentDef_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
         {
@@ -3258,7 +1606,7 @@ IR::_TAO_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_Remote_
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3282,7 +1630,7 @@ IR::_TAO_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_Remote_
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3294,32 +1642,35 @@ IR::_TAO_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_Remote_
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
+::CORBA::ComponentIR::HomeDef_ptr CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::create_home (
     CORBA::Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    IR::HomeDef_ptr base_home,
-    IR::ComponentDef_ptr managed_component,
+    CORBA::ComponentIR::HomeDef_ptr base_home,
+    CORBA::ComponentIR::ComponentDef_ptr managed_component,
+    const CORBA::InterfaceDefSeq & supports_interfaces,
     CORBA::ValueDef_ptr primary_key
     ACE_ENV_ARG_DECL
   )
@@ -3327,7 +1678,7 @@ return _tao_retval._retn ();
     CORBA::SystemException
   ))
 {
-  IR::HomeDef_var _tao_retval (IR::HomeDef::_nil ());
+  CORBA::ComponentIR::HomeDef_var _tao_retval (CORBA::ComponentIR::HomeDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
@@ -3339,7 +1690,7 @@ return _tao_retval._retn ();
       istub,
       "create_home",
       11,
-      6,
+      7,
       istub->orb_core ()
     );
   
@@ -3359,7 +1710,7 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentRepository_create_home _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           id,
@@ -3367,6 +1718,7 @@ return _tao_retval._retn ();
           version,
           base_home,
           managed_component,
+          supports_interfaces,
           primary_key
           ACE_ENV_ARG_PARAMETER
         );
@@ -3390,100 +1742,335 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << base_home) &&
+              (_tao_out << managed_component) &&
+              (_tao_out << supports_interfaces) &&
+              (_tao_out << primary_key)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << base_home) &&
-                  (_tao_out << managed_component) &&
-                  (_tao_out << primary_key)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
+          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_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
                     );
-                }
+                  ACE_TRY_CHECK;
+                )
               
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
+              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
+                );
+            }
+          
 #if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::HomeDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          ::CORBA::ComponentIR::HomeDef_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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+::CORBA::ComponentIR::EventDef_ptr CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::create_event (
+    CORBA::Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA::Boolean is_custom,
+    CORBA::Boolean is_abstract,
+    CORBA::ValueDef_ptr base_value,
+    CORBA::Boolean is_truncatable,
+    const CORBA::ValueDefSeq & abstract_base_values,
+    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA::ExtInitializerSeq & initializers
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::ComponentIR::EventDef_var _tao_retval (CORBA::ComponentIR::EventDef::_nil ());
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+    
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_event",
+      12,
+      10,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_,
+          id,
+          name,
+          version,
+          is_custom,
+          is_abstract,
+          base_value,
+          is_truncatable,
+          abstract_base_values,
+          supported_interfaces,
+          initializers
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
+              (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
+              (_tao_out << base_value) &&
+              (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
+              (_tao_out << abstract_base_values) &&
+              (_tao_out << supported_interfaces) &&
+              (_tao_out << initializers)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
+                );
+            }
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::EventDef_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
         {
@@ -3494,7 +2081,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3518,7 +2105,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -3530,64 +2117,733 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
+  
+  return _tao_retval._retn ();
+}
+
+//
+//            End  Base & Remote  Proxy Implemeentation. 
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//           Remote & Base  Proxy Broker Implementation
+//
+
+CORBA::ComponentIR::_TAO_Container_Proxy_Broker::_TAO_Container_Proxy_Broker (void)
+{
+}
+
+CORBA::ComponentIR::_TAO_Container_Proxy_Broker::~_TAO_Container_Proxy_Broker (void)
+{
+}
+
+CORBA::ComponentIR::_TAO_Container_Proxy_Broker * (*CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+// Factory Member function Implementation.
+CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker (void)
+{
+  static ::CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Broker remote_proxy_broker;
+  return &remote_proxy_broker;
+}
+
+CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Broker::_TAO_Container_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Broker::~_TAO_Container_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::ComponentIR::_TAO_Container_Proxy_Impl&
+CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::Container *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  return this->remote_proxy_impl_;
+}
+
+//
+//           End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+
+CORBA::ComponentIR::Container::Container (int collocated)
+{
+  this->CORBA_ComponentIR_Container_setup_collocation (collocated);
+}
+
+void
+CORBA::ComponentIR::Container::CORBA_ComponentIR_Container_setup_collocation (int collocated)
+{
+  if (collocated)
+    this->the_TAO_Container_Proxy_Broker_ =
+      ::CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer (this);
+  else
+    this->the_TAO_Container_Proxy_Broker_ =
+      ::CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker ();
+}
+
+CORBA::ComponentIR::Container::~Container (void)
+{}
+
+void 
+CORBA::ComponentIR::Container::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Container *tmp = ACE_static_cast (Container *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+CORBA::ComponentIR::Container_ptr
+CORBA::ComponentIR::Container::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return Container::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
+      ACE_CHECK_RETURN (Container::_nil ());
+      
+      if (is_a == 0)
+        {
+          return Container::_nil ();
+        }
+    }
+  
+  return Container::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::ComponentIR::Container_ptr 
+CORBA::ComponentIR::Container::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return Container::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      TAO_Stub* stub = obj->_stubobj ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
+      Container_ptr default_proxy = Container::_nil ();
+      
+      if (
+          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+          obj->_is_collocated () &&
+          CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer != 0
+        )
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ComponentIR::Container (
+                  stub,
+                  1,
+                  obj->_servant ()
+                ),
+              Container::_nil ()
+            );
+        }
+      
+      if (CORBA::is_nil (default_proxy))
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ComponentIR::Container (
+                  stub,
+                  0,
+                  obj->_servant ()
+                ),
+              Container::_nil ()
+            );
+        }
+      
+      return default_proxy;
+    }
+  else 
+    return
+      ACE_reinterpret_cast (
+          Container_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Container::_tao_class_id
+                )
+            )
+        );
+}
+
+CORBA::ComponentIR::Container_ptr
+CORBA::ComponentIR::Container::_duplicate (Container_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+CORBA::ComponentIR::Container::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
+}
+
+void *CORBA::ComponentIR::Container::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, Container)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
+  return retv;
+}
+
+const char* CORBA::ComponentIR::Container::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/CORBA/ComponentIR/Container:1.0";
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::ComponentIR::ComponentDef_ptr CORBA::ComponentIR::Container::create_component (
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA::ComponentIR::ComponentDef_ptr base_component,
+    const CORBA::InterfaceDefSeq & supports_interfaces
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_Container_Proxy_Impl &proxy = 
+    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return proxy.create_component (
+      this,
+      id,
+      name,
+      version,
+      base_component,
+      supports_interfaces
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::ComponentIR::HomeDef_ptr CORBA::ComponentIR::Container::create_home (
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA::ComponentIR::HomeDef_ptr base_home,
+    CORBA::ComponentIR::ComponentDef_ptr managed_component,
+    const CORBA::InterfaceDefSeq & supports_interfaces,
+    CORBA::ValueDef_ptr primary_key
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_Container_Proxy_Impl &proxy = 
+    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return proxy.create_home (
+      this,
+      id,
+      name,
+      version,
+      base_home,
+      managed_component,
+      supports_interfaces,
+      primary_key
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::ComponentIR::EventDef_ptr CORBA::ComponentIR::Container::create_event (
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA::Boolean is_custom,
+    CORBA::Boolean is_abstract,
+    CORBA::ValueDef_ptr base_value,
+    CORBA::Boolean is_truncatable,
+    const CORBA::ValueDefSeq & abstract_base_values,
+    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA::ExtInitializerSeq & initializers
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_Container_Proxy_Impl &proxy = 
+    this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return proxy.create_event (
+      this,
+      id,
+      name,
+      version,
+      is_custom,
+      is_abstract,
+      base_value,
+      is_truncatable,
+      abstract_base_values,
+      supported_interfaces,
+      initializers
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ComponentIR_Container[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f436f), 
+  ACE_NTOHL (0x6e746169), 
+  ACE_NTOHL (0x6e65723a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/Container:1.0
+    10,
+  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x61696e65), 
+  ACE_NTOHL (0x72000000),  // name = Container
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_Container (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_ComponentIR_Container),
+    (char *) &_oc_CORBA_ComponentIR_Container,
+    0,
+    sizeof (CORBA::ComponentIR::Container)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Container,
+    &_tc_TAO_tc_CORBA_ComponentIR_Container
+  )
+TAO_NAMESPACE_END
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
+int CORBA::ComponentIR::ModuleDef::_tao_class_id = 0;
+
+CORBA::ComponentIR::ModuleDef_ptr
+tao_CORBA_ComponentIR_ModuleDef_duplicate (
+    CORBA::ComponentIR::ModuleDef_ptr p
+  )
+{
+  return CORBA::ComponentIR::ModuleDef::_duplicate (p);
+}
+
+void
+tao_CORBA_ComponentIR_ModuleDef_release (
+    CORBA::ComponentIR::ModuleDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA::ComponentIR::ModuleDef_ptr
+tao_CORBA_ComponentIR_ModuleDef_nil (
+    void
+  )
+{
+  return CORBA::ComponentIR::ModuleDef::_nil ();
+}
+
+CORBA::ComponentIR::ModuleDef_ptr
+tao_CORBA_ComponentIR_ModuleDef_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return CORBA::ComponentIR::ModuleDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+tao_CORBA_ComponentIR_ModuleDef_upcast (
+    void *src
+  )
+{
+  CORBA::ComponentIR::ModuleDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::ModuleDef **, src);
+  return *tmp;
+}
+
+CORBA::Boolean
+tao_CORBA_ComponentIR_ModuleDef_marshal (
+    CORBA::ComponentIR::ModuleDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
+// *************************************************************
+// CORBA::ComponentIR::ModuleDef_var
+// *************************************************************
+
+CORBA::ComponentIR::ModuleDef_var::ModuleDef_var (void)
+  : ptr_ (ModuleDef::_nil ())
+{}
+
+::CORBA::ComponentIR::ModuleDef_ptr
+CORBA::ComponentIR::ModuleDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA::ComponentIR::ModuleDef_var::ModuleDef_var (const ::CORBA::ComponentIR::ModuleDef_var &p)
+  : TAO_Base_var (),
+    ptr_ (ModuleDef::_duplicate (p.ptr ()))
+{}
+
+CORBA::ComponentIR::ModuleDef_var::~ModuleDef_var (void)
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA::ComponentIR::ModuleDef_var &
+CORBA::ComponentIR::ModuleDef_var::operator= (ModuleDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ComponentIR::ModuleDef_var &
+CORBA::ComponentIR::ModuleDef_var::operator= (const ::CORBA::ComponentIR::ModuleDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA::ComponentIR::ModuleDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA::ComponentIR::ModuleDef_var::operator const ::CORBA::ComponentIR::ModuleDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA::ComponentIR::ModuleDef_var::operator ::CORBA::ComponentIR::ModuleDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::ModuleDef_ptr
+CORBA::ComponentIR::ModuleDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::ModuleDef_ptr
+CORBA::ComponentIR::ModuleDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::ModuleDef_ptr &
+CORBA::ComponentIR::ModuleDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::ModuleDef_ptr &
+CORBA::ComponentIR::ModuleDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ComponentIR::ModuleDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::ModuleDef_ptr
+CORBA::ComponentIR::ModuleDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA::ComponentIR::ModuleDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::ModuleDef::_nil ();
+  return val;
+}
+
+::CORBA::ComponentIR::ModuleDef_ptr
+CORBA::ComponentIR::ModuleDef_var::tao_duplicate (ModuleDef_ptr p)
+{
+  return ::CORBA::ComponentIR::ModuleDef::_duplicate (p);
+}
+
+void
+CORBA::ComponentIR::ModuleDef_var::tao_release (ModuleDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA::ComponentIR::ModuleDef_ptr
+CORBA::ComponentIR::ModuleDef_var::tao_nil (void)
+{
+  return ::CORBA::ComponentIR::ModuleDef::_nil ();
+}
+
+::CORBA::ComponentIR::ModuleDef_ptr
+CORBA::ComponentIR::ModuleDef_var::tao_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return ::CORBA::ComponentIR::ModuleDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+CORBA::ComponentIR::ModuleDef_var::tao_upcast (void *src)
+{
+  ModuleDef **tmp =
+    ACE_static_cast (ModuleDef **, src);
+  return *tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
+// *************************************************************
+// CORBA::ComponentIR::ModuleDef_out
+// *************************************************************
+
+CORBA::ComponentIR::ModuleDef_out::ModuleDef_out (ModuleDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA::ComponentIR::ModuleDef::_nil ();
+}
+
+CORBA::ComponentIR::ModuleDef_out::ModuleDef_out (ModuleDef_var &p)
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ComponentIR::ModuleDef::_nil ();
+}
+
+CORBA::ComponentIR::ModuleDef_out::ModuleDef_out (const ::CORBA::ComponentIR::ModuleDef_out &p)
+  : ptr_ (ACE_const_cast (ModuleDef_out &, p).ptr_)
+{}
+
+::CORBA::ComponentIR::ModuleDef_out &
+CORBA::ComponentIR::ModuleDef_out::operator= (const ::CORBA::ComponentIR::ModuleDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (ModuleDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA::ComponentIR::ModuleDef_out &
+CORBA::ComponentIR::ModuleDef_out::operator= (const ::CORBA::ComponentIR::ModuleDef_var &p)
+{
+  this->ptr_ = ::CORBA::ComponentIR::ModuleDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA::ComponentIR::ModuleDef_out &
+CORBA::ComponentIR::ModuleDef_out::operator= (ModuleDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
 
-return _tao_retval._retn ();
+CORBA::ComponentIR::ModuleDef_out::operator ::CORBA::ComponentIR::ModuleDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::ModuleDef_ptr &
+CORBA::ComponentIR::ModuleDef_out::ptr (void)
+{
+  return this->ptr_;
 }
 
+::CORBA::ComponentIR::ModuleDef_ptr
+CORBA::ComponentIR::ModuleDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//                Base & Remote Proxy  Implementation. 
+//
+
+CORBA::ComponentIR::_TAO_ModuleDef_Proxy_Impl::_TAO_ModuleDef_Proxy_Impl (void)
+{}
+
+CORBA::ComponentIR::_TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
 //
 //            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
 //
 
-IR::_TAO_ComponentRepository_Proxy_Broker::_TAO_ComponentRepository_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ModuleDef_Proxy_Broker::_TAO_ModuleDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ComponentRepository_Proxy_Broker::~_TAO_ComponentRepository_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ModuleDef_Proxy_Broker::~_TAO_ModuleDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ComponentRepository_Proxy_Broker * (*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_ModuleDef_Proxy_Broker * (*CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-IR::_TAO_ComponentRepository_Remote_Proxy_Broker *
-IR::_TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ModuleDef_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker (void)
 {
-  static ::IR::_TAO_ComponentRepository_Remote_Proxy_Broker remote_proxy_broker;
+  static ::CORBA::ComponentIR::_TAO_ModuleDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-IR::_TAO_ComponentRepository_Remote_Proxy_Broker::_TAO_ComponentRepository_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ModuleDef_Remote_Proxy_Broker::_TAO_ModuleDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ComponentRepository_Remote_Proxy_Broker::~_TAO_ComponentRepository_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ModuleDef_Remote_Proxy_Broker::~_TAO_ModuleDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ComponentRepository_Proxy_Impl&
-IR::_TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy (
-    ::IR::ComponentRepository *
+CORBA::ComponentIR::_TAO_ModuleDef_Proxy_Impl&
+CORBA::ComponentIR::_TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::ModuleDef *
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -3599,74 +2855,75 @@ IR::_TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
-IR::ComponentRepository::ComponentRepository (int collocated)
+CORBA::ComponentIR::ModuleDef::ModuleDef (int collocated)
 {
-  this->IR_ComponentRepository_setup_collocation (collocated);
+  this->CORBA_ComponentIR_ModuleDef_setup_collocation (collocated);
 }
 
 void
-IR::ComponentRepository::IR_ComponentRepository_setup_collocation (int collocated)
+CORBA::ComponentIR::ModuleDef::CORBA_ComponentIR_ModuleDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_ComponentRepository_Proxy_Broker_ =
-      ::IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_ModuleDef_Proxy_Broker_ =
+      ::CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_ComponentRepository_Proxy_Broker_ =
-      ::IR::_TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker ();
+    this->the_TAO_ModuleDef_Proxy_Broker_ =
+      ::CORBA::ComponentIR::_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker ();
   
-  this->CORBA_Repository_setup_collocation (collocated);
+  this->CORBA_ModuleDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_Container_setup_collocation (collocated);
 }
 
-IR::ComponentRepository::~ComponentRepository (void)
+CORBA::ComponentIR::ModuleDef::~ModuleDef (void)
 {}
 
 void 
-IR::ComponentRepository::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ComponentIR::ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ComponentRepository *tmp = ACE_static_cast (ComponentRepository *, _tao_void_pointer);
+  ModuleDef *tmp = ACE_static_cast (ModuleDef *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IR::ComponentRepository_ptr
-IR::ComponentRepository::_narrow (
+CORBA::ComponentIR::ModuleDef_ptr
+CORBA::ComponentIR::ModuleDef::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     {
-      return ComponentRepository::_nil ();
+      return ModuleDef::_nil ();
     }
   
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
         obj->_is_a (
-            "IDL:omg.org/IR/ComponentRepository:1.0"
+            "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0"
             ACE_ENV_ARG_PARAMETER
           );
-      ACE_CHECK_RETURN (ComponentRepository::_nil ());
+      ACE_CHECK_RETURN (ModuleDef::_nil ());
       
       if (is_a == 0)
         {
-          return ComponentRepository::_nil ();
+          return ModuleDef::_nil ();
         }
     }
   
-  return ComponentRepository::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+  return ModuleDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IR::ComponentRepository_ptr 
-IR::ComponentRepository::_unchecked_narrow (
+CORBA::ComponentIR::ModuleDef_ptr 
+CORBA::ComponentIR::ModuleDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
     {
-      return ComponentRepository::_nil ();
+      return ModuleDef::_nil ();
     }
   
   if (! obj->_is_local ())
@@ -3678,23 +2935,23 @@ IR::ComponentRepository::_unchecked_narrow (
           stub->_incr_refcnt ();
         }
       
-      ComponentRepository_ptr default_proxy = ComponentRepository::_nil ();
+      ModuleDef_ptr default_proxy = ModuleDef::_nil ();
       
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&
-          IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer != 0
+          CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer != 0
         )
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::ComponentRepository (
+              ::CORBA::ComponentIR::ModuleDef (
                   stub,
                   1,
                   obj->_servant ()
                 ),
-              ComponentRepository::_nil ()
+              ModuleDef::_nil ()
             );
         }
       
@@ -3702,12 +2959,12 @@ IR::ComponentRepository::_unchecked_narrow (
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::ComponentRepository (
+              ::CORBA::ComponentIR::ModuleDef (
                   stub,
                   0,
                   obj->_servant ()
                 ),
-              ComponentRepository::_nil ()
+              ModuleDef::_nil ()
             );
         }
       
@@ -3716,18 +2973,18 @@ IR::ComponentRepository::_unchecked_narrow (
   else 
     return
       ACE_reinterpret_cast (
-          ComponentRepository_ptr,
+          ModuleDef_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
                   ptr_arith_t,
-                  &ComponentRepository::_tao_class_id
+                  &ModuleDef::_tao_class_id
                 )
             )
         );
 }
 
-IR::ComponentRepository_ptr
-IR::ComponentRepository::_duplicate (ComponentRepository_ptr obj)
+CORBA::ComponentIR::ModuleDef_ptr
+CORBA::ComponentIR::ModuleDef::_duplicate (ModuleDef_ptr obj)
 {
   if (! CORBA::is_nil (obj))
     {
@@ -3738,7 +2995,7 @@ IR::ComponentRepository::_duplicate (ComponentRepository_ptr obj)
 }
 
 CORBA::Boolean
-IR::ComponentRepository::_is_a (
+CORBA::ComponentIR::ModuleDef::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
   )
@@ -3746,11 +3003,15 @@ IR::ComponentRepository::_is_a (
   if (
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/ComponentRepository:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/CORBA/Repository:1.0"
+          "IDL:omg.org/CORBA/ModuleDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
@@ -3758,6 +3019,10 @@ IR::ComponentRepository::_is_a (
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
+          "IDL:omg.org/CORBA/Contained:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -3777,27 +3042,41 @@ IR::ComponentRepository::_is_a (
     }
 }
 
-void *IR::ComponentRepository::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::ComponentIR::ModuleDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, ComponentRepository)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, ModuleDef)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &::CORBA::Repository::_tao_class_id)
+              &::CORBA::ModuleDef::_tao_class_id)
             )
     {
       retv =
         ACE_reinterpret_cast (
             void *,
             ACE_static_cast (
-                CORBA::Repository_ptr,
+                CORBA::ModuleDef_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, Container)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::ComponentIR::Container_ptr,
                 this
               )
           );
@@ -3818,6 +3097,20 @@ void *IR::ComponentRepository::_tao_QueryInterface (ptr_arith_t type)
     }
   else if (type == ACE_reinterpret_cast (
               ptr_arith_t,
+              &::CORBA::Contained::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Contained_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
               &::CORBA::IRObject::_tao_class_id)
             )
     {
@@ -3850,283 +3143,870 @@ void *IR::ComponentRepository::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* IR::ComponentRepository::_interface_repository_id (void) const
+const char* CORBA::ComponentIR::ModuleDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/IR/ComponentRepository:1.0";
+  return "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-::IR::ComponentDef_ptr IR::ComponentRepository::create_component (
-    const char * id,
-    const char * name,
-    const char * version,
-    IR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces
+static const CORBA::Long _oc_CORBA_ComponentIR_ModuleDef[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4d6f), 
+  ACE_NTOHL (0x64756c65), 
+  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0
+    10,
+  ACE_NTOHL (0x4d6f6475), 
+  ACE_NTOHL (0x6c654465), 
+  ACE_NTOHL (0x66000000),  // name = ModuleDef
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ModuleDef (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_ComponentIR_ModuleDef),
+    (char *) &_oc_CORBA_ComponentIR_ModuleDef,
+    0,
+    sizeof (CORBA::ComponentIR::ModuleDef)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ModuleDef,
+    &_tc_TAO_tc_CORBA_ComponentIR_ModuleDef
+  )
+TAO_NAMESPACE_END
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
+int CORBA::ComponentIR::Repository::_tao_class_id = 0;
+
+CORBA::ComponentIR::Repository_ptr
+tao_CORBA_ComponentIR_Repository_duplicate (
+    CORBA::ComponentIR::Repository_ptr p
+  )
+{
+  return CORBA::ComponentIR::Repository::_duplicate (p);
+}
+
+void
+tao_CORBA_ComponentIR_Repository_release (
+    CORBA::ComponentIR::Repository_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA::ComponentIR::Repository_ptr
+tao_CORBA_ComponentIR_Repository_nil (
+    void
+  )
+{
+  return CORBA::ComponentIR::Repository::_nil ();
+}
+
+CORBA::ComponentIR::Repository_ptr
+tao_CORBA_ComponentIR_Repository_narrow (
+    CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
-  _TAO_ComponentRepository_Proxy_Impl &proxy = 
-    this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.create_component (
-      this,
-      id,
-      name,
-      version,
-      base_component,
-      supports_interfaces
-      ACE_ENV_ARG_PARAMETER
-    );
+  return CORBA::ComponentIR::Repository::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+tao_CORBA_ComponentIR_Repository_upcast (
+    void *src
+  )
+{
+  CORBA::ComponentIR::Repository **tmp =
+    ACE_static_cast (CORBA::ComponentIR::Repository **, src);
+  return *tmp;
+}
+
+CORBA::Boolean
+tao_CORBA_ComponentIR_Repository_marshal (
+    CORBA::ComponentIR::Repository_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
-::IR::HomeDef_ptr IR::ComponentRepository::create_home (
-    const char * id,
-    const char * name,
-    const char * version,
-    IR::HomeDef_ptr base_home,
-    IR::ComponentDef_ptr managed_component,
-    CORBA::ValueDef_ptr primary_key
+// *************************************************************
+// CORBA::ComponentIR::Repository_var
+// *************************************************************
+
+CORBA::ComponentIR::Repository_var::Repository_var (void)
+  : ptr_ (Repository::_nil ())
+{}
+
+::CORBA::ComponentIR::Repository_ptr
+CORBA::ComponentIR::Repository_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA::ComponentIR::Repository_var::Repository_var (const ::CORBA::ComponentIR::Repository_var &p)
+  : TAO_Base_var (),
+    ptr_ (Repository::_duplicate (p.ptr ()))
+{}
+
+CORBA::ComponentIR::Repository_var::~Repository_var (void)
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA::ComponentIR::Repository_var &
+CORBA::ComponentIR::Repository_var::operator= (Repository_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ComponentIR::Repository_var &
+CORBA::ComponentIR::Repository_var::operator= (const ::CORBA::ComponentIR::Repository_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA::ComponentIR::Repository::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA::ComponentIR::Repository_var::operator const ::CORBA::ComponentIR::Repository_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA::ComponentIR::Repository_var::operator ::CORBA::ComponentIR::Repository_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::Repository_ptr
+CORBA::ComponentIR::Repository_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::Repository_ptr
+CORBA::ComponentIR::Repository_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::Repository_ptr &
+CORBA::ComponentIR::Repository_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::Repository_ptr &
+CORBA::ComponentIR::Repository_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ComponentIR::Repository::_nil ();
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::Repository_ptr
+CORBA::ComponentIR::Repository_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA::ComponentIR::Repository_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::Repository::_nil ();
+  return val;
+}
+
+::CORBA::ComponentIR::Repository_ptr
+CORBA::ComponentIR::Repository_var::tao_duplicate (Repository_ptr p)
+{
+  return ::CORBA::ComponentIR::Repository::_duplicate (p);
+}
+
+void
+CORBA::ComponentIR::Repository_var::tao_release (Repository_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA::ComponentIR::Repository_ptr
+CORBA::ComponentIR::Repository_var::tao_nil (void)
+{
+  return ::CORBA::ComponentIR::Repository::_nil ();
+}
+
+::CORBA::ComponentIR::Repository_ptr
+CORBA::ComponentIR::Repository_var::tao_narrow (
+    CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
-  _TAO_ComponentRepository_Proxy_Impl &proxy = 
-    this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  return ::CORBA::ComponentIR::Repository::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+CORBA::ComponentIR::Repository_var::tao_upcast (void *src)
+{
+  Repository **tmp =
+    ACE_static_cast (Repository **, src);
+  return *tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
+// *************************************************************
+// CORBA::ComponentIR::Repository_out
+// *************************************************************
+
+CORBA::ComponentIR::Repository_out::Repository_out (Repository_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA::ComponentIR::Repository::_nil ();
+}
+
+CORBA::ComponentIR::Repository_out::Repository_out (Repository_var &p)
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ComponentIR::Repository::_nil ();
+}
+
+CORBA::ComponentIR::Repository_out::Repository_out (const ::CORBA::ComponentIR::Repository_out &p)
+  : ptr_ (ACE_const_cast (Repository_out &, p).ptr_)
+{}
+
+::CORBA::ComponentIR::Repository_out &
+CORBA::ComponentIR::Repository_out::operator= (const ::CORBA::ComponentIR::Repository_out &p)
+{
+  this->ptr_ = ACE_const_cast (Repository_out&, p).ptr_;
+  return *this;
+}
+
+CORBA::ComponentIR::Repository_out &
+CORBA::ComponentIR::Repository_out::operator= (const ::CORBA::ComponentIR::Repository_var &p)
+{
+  this->ptr_ = ::CORBA::ComponentIR::Repository::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA::ComponentIR::Repository_out &
+CORBA::ComponentIR::Repository_out::operator= (Repository_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ComponentIR::Repository_out::operator ::CORBA::ComponentIR::Repository_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::Repository_ptr &
+CORBA::ComponentIR::Repository_out::ptr (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ComponentIR::Repository_ptr
+CORBA::ComponentIR::Repository_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//                Base & Remote Proxy  Implementation. 
+//
+
+CORBA::ComponentIR::_TAO_Repository_Proxy_Impl::_TAO_Repository_Proxy_Impl (void)
+{}
+
+CORBA::ComponentIR::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+//
+//            End  Base & Remote  Proxy Implemeentation. 
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//           Remote & Base  Proxy Broker Implementation
+//
+
+CORBA::ComponentIR::_TAO_Repository_Proxy_Broker::_TAO_Repository_Proxy_Broker (void)
+{
+}
+
+CORBA::ComponentIR::_TAO_Repository_Proxy_Broker::~_TAO_Repository_Proxy_Broker (void)
+{
+}
+
+CORBA::ComponentIR::_TAO_Repository_Proxy_Broker * (*CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+// Factory Member function Implementation.
+CORBA::ComponentIR::_TAO_Repository_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker (void)
+{
+  static ::CORBA::ComponentIR::_TAO_Repository_Remote_Proxy_Broker remote_proxy_broker;
+  return &remote_proxy_broker;
+}
+
+CORBA::ComponentIR::_TAO_Repository_Remote_Proxy_Broker::_TAO_Repository_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::ComponentIR::_TAO_Repository_Remote_Proxy_Broker::~_TAO_Repository_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::ComponentIR::_TAO_Repository_Proxy_Impl&
+CORBA::ComponentIR::_TAO_Repository_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::Repository *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  return this->remote_proxy_impl_;
+}
+
+//
+//           End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+
+CORBA::ComponentIR::Repository::Repository (int collocated)
+{
+  this->CORBA_ComponentIR_Repository_setup_collocation (collocated);
+}
+
+void
+CORBA::ComponentIR::Repository::CORBA_ComponentIR_Repository_setup_collocation (int collocated)
+{
+  if (collocated)
+    this->the_TAO_Repository_Proxy_Broker_ =
+      ::CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
+  else
+    this->the_TAO_Repository_Proxy_Broker_ =
+      ::CORBA::ComponentIR::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker ();
   
-  return proxy.create_home (
-      this,
-      id,
-      name,
-      version,
-      base_home,
-      managed_component,
-      primary_key
-      ACE_ENV_ARG_PARAMETER
-    );
+  this->CORBA_Repository_setup_collocation (collocated);
+  this->CORBA_ComponentIR_Container_setup_collocation (collocated);
+}
+
+CORBA::ComponentIR::Repository::~Repository (void)
+{}
+
+void 
+CORBA::ComponentIR::Repository::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Repository *tmp = ACE_static_cast (Repository *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+CORBA::ComponentIR::Repository_ptr
+CORBA::ComponentIR::Repository::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return Repository::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/ComponentIR/Repository:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
+      ACE_CHECK_RETURN (Repository::_nil ());
+      
+      if (is_a == 0)
+        {
+          return Repository::_nil ();
+        }
+    }
+  
+  return Repository::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::ComponentIR::Repository_ptr 
+CORBA::ComponentIR::Repository::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return Repository::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      TAO_Stub* stub = obj->_stubobj ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
+      Repository_ptr default_proxy = Repository::_nil ();
+      
+      if (
+          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+          obj->_is_collocated () &&
+          CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer != 0
+        )
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ComponentIR::Repository (
+                  stub,
+                  1,
+                  obj->_servant ()
+                ),
+              Repository::_nil ()
+            );
+        }
+      
+      if (CORBA::is_nil (default_proxy))
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ComponentIR::Repository (
+                  stub,
+                  0,
+                  obj->_servant ()
+                ),
+              Repository::_nil ()
+            );
+        }
+      
+      return default_proxy;
+    }
+  else 
+    return
+      ACE_reinterpret_cast (
+          Repository_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Repository::_tao_class_id
+                )
+            )
+        );
+}
+
+CORBA::ComponentIR::Repository_ptr
+CORBA::ComponentIR::Repository::_duplicate (Repository_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+CORBA::ComponentIR::Repository::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ComponentIR/Repository:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Repository:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Container:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/IRObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
+}
+
+void *CORBA::ComponentIR::Repository::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, Repository)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Repository::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Repository_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, Container)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::ComponentIR::Container_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Container::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Container_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::IRObject::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::IRObject_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
+  return retv;
+}
+
+const char* CORBA::ComponentIR::Repository::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/CORBA/ComponentIR/Repository:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_ComponentRepository[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_Repository[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
+  45,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f43), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/Repository:1.0
+    11,
   ACE_NTOHL (0x5265706f), 
   ACE_NTOHL (0x7369746f), 
-  ACE_NTOHL (0x72793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ComponentRepository:1.0
-  20,
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x74526570), 
-  ACE_NTOHL (0x6f736974), 
-  ACE_NTOHL (0x6f727900),  // name = ComponentRepository
-};
+  ACE_NTOHL (0x72790000),  // name = Repository
+  };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_ComponentRepository (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_Repository (
     CORBA::tk_objref,
-    sizeof (_oc_IR_ComponentRepository),
-    (char *) &_oc_IR_ComponentRepository,
+    sizeof (_oc_CORBA_ComponentIR_Repository),
+    (char *) &_oc_CORBA_ComponentIR_Repository,
     0,
-    sizeof (IR::ComponentRepository)
+    sizeof (CORBA::ComponentIR::Repository)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
-    _tc_ComponentRepository,
-    &_tc_TAO_tc_IR_ComponentRepository
+    _tc_Repository,
+    &_tc_TAO_tc_CORBA_ComponentIR_Repository
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-int IR::ProvidesDef::_tao_class_id = 0;
+int CORBA::ComponentIR::ProvidesDef::_tao_class_id = 0;
 
-IR::ProvidesDef_ptr
-tao_IR_ProvidesDef_duplicate (
-    IR::ProvidesDef_ptr p
+CORBA::ComponentIR::ProvidesDef_ptr
+tao_CORBA_ComponentIR_ProvidesDef_duplicate (
+    CORBA::ComponentIR::ProvidesDef_ptr p
   )
 {
-  return IR::ProvidesDef::_duplicate (p);
+  return CORBA::ComponentIR::ProvidesDef::_duplicate (p);
 }
 
 void
-tao_IR_ProvidesDef_release (
-    IR::ProvidesDef_ptr p
+tao_CORBA_ComponentIR_ProvidesDef_release (
+    CORBA::ComponentIR::ProvidesDef_ptr p
   )
 {
   CORBA::release (p);
 }
 
-IR::ProvidesDef_ptr
-tao_IR_ProvidesDef_nil (
+CORBA::ComponentIR::ProvidesDef_ptr
+tao_CORBA_ComponentIR_ProvidesDef_nil (
     void
   )
 {
-  return IR::ProvidesDef::_nil ();
+  return CORBA::ComponentIR::ProvidesDef::_nil ();
 }
 
-IR::ProvidesDef_ptr
-tao_IR_ProvidesDef_narrow (
+CORBA::ComponentIR::ProvidesDef_ptr
+tao_CORBA_ComponentIR_ProvidesDef_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return IR::ProvidesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ProvidesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-tao_IR_ProvidesDef_upcast (
+tao_CORBA_ComponentIR_ProvidesDef_upcast (
     void *src
   )
 {
-  IR::ProvidesDef **tmp =
-    ACE_static_cast (IR::ProvidesDef **, src);
+  CORBA::ComponentIR::ProvidesDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::ProvidesDef **, src);
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ComponentIR_ProvidesDef_marshal (
+    CORBA::ComponentIR::ProvidesDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
-// IR::ProvidesDef_var
+// CORBA::ComponentIR::ProvidesDef_var
 // *************************************************************
 
-IR::ProvidesDef_var::ProvidesDef_var (void)
+CORBA::ComponentIR::ProvidesDef_var::ProvidesDef_var (void)
   : ptr_ (ProvidesDef::_nil ())
 {}
 
-::IR::ProvidesDef_ptr
-IR::ProvidesDef_var::ptr (void) const
+::CORBA::ComponentIR::ProvidesDef_ptr
+CORBA::ComponentIR::ProvidesDef_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-IR::ProvidesDef_var::ProvidesDef_var (const ::IR::ProvidesDef_var &p)
+CORBA::ComponentIR::ProvidesDef_var::ProvidesDef_var (const ::CORBA::ComponentIR::ProvidesDef_var &p)
   : TAO_Base_var (),
     ptr_ (ProvidesDef::_duplicate (p.ptr ()))
 {}
 
-IR::ProvidesDef_var::~ProvidesDef_var (void)
+CORBA::ComponentIR::ProvidesDef_var::~ProvidesDef_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
-IR::ProvidesDef_var &
-IR::ProvidesDef_var::operator= (ProvidesDef_ptr p)
+CORBA::ComponentIR::ProvidesDef_var &
+CORBA::ComponentIR::ProvidesDef_var::operator= (ProvidesDef_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-IR::ProvidesDef_var &
-IR::ProvidesDef_var::operator= (const ::IR::ProvidesDef_var &p)
+CORBA::ComponentIR::ProvidesDef_var &
+CORBA::ComponentIR::ProvidesDef_var::operator= (const ::CORBA::ComponentIR::ProvidesDef_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::ProvidesDef::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::ComponentIR::ProvidesDef::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-IR::ProvidesDef_var::operator const ::IR::ProvidesDef_ptr &() const // cast
+CORBA::ComponentIR::ProvidesDef_var::operator const ::CORBA::ComponentIR::ProvidesDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-IR::ProvidesDef_var::operator ::IR::ProvidesDef_ptr &() // cast 
+CORBA::ComponentIR::ProvidesDef_var::operator ::CORBA::ComponentIR::ProvidesDef_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::IR::ProvidesDef_ptr
-IR::ProvidesDef_var::operator-> (void) const
+::CORBA::ComponentIR::ProvidesDef_ptr
+CORBA::ComponentIR::ProvidesDef_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::IR::ProvidesDef_ptr
-IR::ProvidesDef_var::in (void) const
+::CORBA::ComponentIR::ProvidesDef_ptr
+CORBA::ComponentIR::ProvidesDef_var::in (void) const
 {
   return this->ptr_;
 }
 
-::IR::ProvidesDef_ptr &
-IR::ProvidesDef_var::inout (void)
+::CORBA::ComponentIR::ProvidesDef_ptr &
+CORBA::ComponentIR::ProvidesDef_var::inout (void)
 {
   return this->ptr_;
 }
 
-::IR::ProvidesDef_ptr &
-IR::ProvidesDef_var::out (void)
+::CORBA::ComponentIR::ProvidesDef_ptr &
+CORBA::ComponentIR::ProvidesDef_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::ProvidesDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::ProvidesDef::_nil ();
   return this->ptr_;
 }
 
-::IR::ProvidesDef_ptr
-IR::ProvidesDef_var::_retn (void)
+::CORBA::ComponentIR::ProvidesDef_ptr
+CORBA::ComponentIR::ProvidesDef_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::IR::ProvidesDef_ptr val = this->ptr_;
-  this->ptr_ = ::IR::ProvidesDef::_nil ();
+  ::CORBA::ComponentIR::ProvidesDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::ProvidesDef::_nil ();
   return val;
 }
 
-::IR::ProvidesDef_ptr
-IR::ProvidesDef_var::tao_duplicate (ProvidesDef_ptr p)
+::CORBA::ComponentIR::ProvidesDef_ptr
+CORBA::ComponentIR::ProvidesDef_var::tao_duplicate (ProvidesDef_ptr p)
 {
-  return ::IR::ProvidesDef::_duplicate (p);
+  return ::CORBA::ComponentIR::ProvidesDef::_duplicate (p);
 }
 
 void
-IR::ProvidesDef_var::tao_release (ProvidesDef_ptr p)
+CORBA::ComponentIR::ProvidesDef_var::tao_release (ProvidesDef_ptr p)
 {
   CORBA::release (p);
 }
 
-::IR::ProvidesDef_ptr
-IR::ProvidesDef_var::tao_nil (void)
+::CORBA::ComponentIR::ProvidesDef_ptr
+CORBA::ComponentIR::ProvidesDef_var::tao_nil (void)
 {
-  return ::IR::ProvidesDef::_nil ();
+  return ::CORBA::ComponentIR::ProvidesDef::_nil ();
 }
 
-::IR::ProvidesDef_ptr
-IR::ProvidesDef_var::tao_narrow (
+::CORBA::ComponentIR::ProvidesDef_ptr
+CORBA::ComponentIR::ProvidesDef_var::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::ProvidesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::CORBA::ComponentIR::ProvidesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IR::ProvidesDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::ProvidesDef_var::tao_upcast (void *src)
 {
   ProvidesDef **tmp =
     ACE_static_cast (ProvidesDef **, src);
@@ -4134,79 +4014,79 @@ IR::ProvidesDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
-// IR::ProvidesDef_out
+// CORBA::ComponentIR::ProvidesDef_out
 // *************************************************************
 
-IR::ProvidesDef_out::ProvidesDef_out (ProvidesDef_ptr &p)
+CORBA::ComponentIR::ProvidesDef_out::ProvidesDef_out (ProvidesDef_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::IR::ProvidesDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::ProvidesDef::_nil ();
 }
 
-IR::ProvidesDef_out::ProvidesDef_out (ProvidesDef_var &p)
+CORBA::ComponentIR::ProvidesDef_out::ProvidesDef_out (ProvidesDef_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::ProvidesDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::ProvidesDef::_nil ();
 }
 
-IR::ProvidesDef_out::ProvidesDef_out (const ::IR::ProvidesDef_out &p)
+CORBA::ComponentIR::ProvidesDef_out::ProvidesDef_out (const ::CORBA::ComponentIR::ProvidesDef_out &p)
   : ptr_ (ACE_const_cast (ProvidesDef_out &, p).ptr_)
 {}
 
-::IR::ProvidesDef_out &
-IR::ProvidesDef_out::operator= (const ::IR::ProvidesDef_out &p)
+::CORBA::ComponentIR::ProvidesDef_out &
+CORBA::ComponentIR::ProvidesDef_out::operator= (const ::CORBA::ComponentIR::ProvidesDef_out &p)
 {
   this->ptr_ = ACE_const_cast (ProvidesDef_out&, p).ptr_;
   return *this;
 }
 
-IR::ProvidesDef_out &
-IR::ProvidesDef_out::operator= (const ::IR::ProvidesDef_var &p)
+CORBA::ComponentIR::ProvidesDef_out &
+CORBA::ComponentIR::ProvidesDef_out::operator= (const ::CORBA::ComponentIR::ProvidesDef_var &p)
 {
-  this->ptr_ = ::IR::ProvidesDef::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::ComponentIR::ProvidesDef::_duplicate (p.ptr ());
   return *this;
 }
 
-IR::ProvidesDef_out &
-IR::ProvidesDef_out::operator= (ProvidesDef_ptr p)
+CORBA::ComponentIR::ProvidesDef_out &
+CORBA::ComponentIR::ProvidesDef_out::operator= (ProvidesDef_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-IR::ProvidesDef_out::operator ::IR::ProvidesDef_ptr &() // cast
+CORBA::ComponentIR::ProvidesDef_out::operator ::CORBA::ComponentIR::ProvidesDef_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::IR::ProvidesDef_ptr &
-IR::ProvidesDef_out::ptr (void)
+::CORBA::ComponentIR::ProvidesDef_ptr &
+CORBA::ComponentIR::ProvidesDef_out::ptr (void)
 {
   return this->ptr_;
 }
 
-::IR::ProvidesDef_ptr
-IR::ProvidesDef_out::operator-> (void)
+::CORBA::ComponentIR::ProvidesDef_ptr
+CORBA::ComponentIR::ProvidesDef_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -4223,16 +4103,16 @@ public:
     void result (::CORBA::InterfaceDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (const TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get &);
     
     ::CORBA::InterfaceDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_NOT_USED      
@@ -4241,7 +4121,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -4253,7 +4133,7 @@ TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (ACE_ENV_SING
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -4265,7 +4145,7 @@ TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (ACE_ENV_SIN
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -4281,33 +4161,120 @@ TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (ACE_ENV_SINGLE_
 }
 
 void 
-TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (::CORBA::InterfaceDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::result (::CORBA::InterfaceDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      CORBA::InterfaceDef_ptr interface_type
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set (const TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set &);
+    CORBA::InterfaceDef_ptr interface_type_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      CORBA::InterfaceDef_ptr interface_type
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      interface_type_ (interface_type)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<=  this->interface_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+
+
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
 
-IR::_TAO_ProvidesDef_Proxy_Impl::_TAO_ProvidesDef_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_ProvidesDef_Proxy_Impl::_TAO_ProvidesDef_Proxy_Impl (void)
 {}
 
-IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::CORBA::InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
+::CORBA::InterfaceDef_ptr CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
   )
@@ -4347,7 +4314,7 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get _tao_ri (
           &_tao_call,
           _collocated_tao_target_
           ACE_ENV_ARG_PARAMETER
@@ -4372,82 +4339,267 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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 ());
+
+          
+          _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
+          else if (_invoke_status == TAO_INVOKE_RESTART)
             {
+              TAO_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::InterfaceDef_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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+void CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
+    CORBA::Object *_collocated_tao_target_,
+    CORBA::InterfaceDef_ptr interface_type
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "_set_interface_type",
+      19,
+      1,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_,
+          interface_type
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK;
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << interface_type)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-                  
-                  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
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::InterfaceDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -4458,7 +4610,7 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -4482,7 +4634,7 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -4492,22 +4644,22 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
       
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      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 */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
 }
 
 //
@@ -4515,43 +4667,43 @@ return _tao_retval._retn ();
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
 //
 
-IR::_TAO_ProvidesDef_Proxy_Broker::_TAO_ProvidesDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ProvidesDef_Proxy_Broker::_TAO_ProvidesDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ProvidesDef_Proxy_Broker::~_TAO_ProvidesDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ProvidesDef_Proxy_Broker::~_TAO_ProvidesDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ProvidesDef_Proxy_Broker * (*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_ProvidesDef_Proxy_Broker * (*CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-IR::_TAO_ProvidesDef_Remote_Proxy_Broker *
-IR::_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker (void)
 {
-  static ::IR::_TAO_ProvidesDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-IR::_TAO_ProvidesDef_Remote_Proxy_Broker::_TAO_ProvidesDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Broker::_TAO_ProvidesDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ProvidesDef_Remote_Proxy_Broker::~_TAO_ProvidesDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Broker::~_TAO_ProvidesDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ProvidesDef_Proxy_Impl&
-IR::_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
-    ::IR::ProvidesDef *
+CORBA::ComponentIR::_TAO_ProvidesDef_Proxy_Impl&
+CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::ProvidesDef *
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -4563,38 +4715,38 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
-IR::ProvidesDef::ProvidesDef (int collocated)
+CORBA::ComponentIR::ProvidesDef::ProvidesDef (int collocated)
 {
-  this->IR_ProvidesDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_ProvidesDef_setup_collocation (collocated);
 }
 
 void
-IR::ProvidesDef::IR_ProvidesDef_setup_collocation (int collocated)
+CORBA::ComponentIR::ProvidesDef::CORBA_ComponentIR_ProvidesDef_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ProvidesDef_Proxy_Broker_ =
-      ::IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
+      ::CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ProvidesDef_Proxy_Broker_ =
-      ::IR::_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
+      ::CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
   
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-IR::ProvidesDef::~ProvidesDef (void)
+CORBA::ComponentIR::ProvidesDef::~ProvidesDef (void)
 {}
 
 void 
-IR::ProvidesDef::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ComponentIR::ProvidesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ProvidesDef *tmp = ACE_static_cast (ProvidesDef *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IR::ProvidesDef_ptr
-IR::ProvidesDef::_narrow (
+CORBA::ComponentIR::ProvidesDef_ptr
+CORBA::ComponentIR::ProvidesDef::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4608,7 +4760,7 @@ IR::ProvidesDef::_narrow (
     {
       CORBA::Boolean is_a =
         obj->_is_a (
-            "IDL:omg.org/IR/ProvidesDef:1.0"
+            "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0"
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ProvidesDef::_nil ());
@@ -4622,8 +4774,8 @@ IR::ProvidesDef::_narrow (
   return ProvidesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IR::ProvidesDef_ptr 
-IR::ProvidesDef::_unchecked_narrow (
+CORBA::ComponentIR::ProvidesDef_ptr 
+CORBA::ComponentIR::ProvidesDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -4648,12 +4800,12 @@ IR::ProvidesDef::_unchecked_narrow (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&
-          IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer != 0
+          CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer != 0
         )
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::ProvidesDef (
+              ::CORBA::ComponentIR::ProvidesDef (
                   stub,
                   1,
                   obj->_servant ()
@@ -4666,7 +4818,7 @@ IR::ProvidesDef::_unchecked_narrow (
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::ProvidesDef (
+              ::CORBA::ComponentIR::ProvidesDef (
                   stub,
                   0,
                   obj->_servant ()
@@ -4690,8 +4842,8 @@ IR::ProvidesDef::_unchecked_narrow (
         );
 }
 
-IR::ProvidesDef_ptr
-IR::ProvidesDef::_duplicate (ProvidesDef_ptr obj)
+CORBA::ComponentIR::ProvidesDef_ptr
+CORBA::ComponentIR::ProvidesDef::_duplicate (ProvidesDef_ptr obj)
 {
   if (! CORBA::is_nil (obj))
     {
@@ -4702,7 +4854,7 @@ IR::ProvidesDef::_duplicate (ProvidesDef_ptr obj)
 }
 
 CORBA::Boolean
-IR::ProvidesDef::_is_a (
+CORBA::ComponentIR::ProvidesDef::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
   )
@@ -4710,7 +4862,7 @@ IR::ProvidesDef::_is_a (
   if (
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/ProvidesDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
@@ -4737,13 +4889,13 @@ IR::ProvidesDef::_is_a (
     }
 }
 
-void *IR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::ComponentIR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, ProvidesDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, ProvidesDef)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
@@ -4796,15 +4948,15 @@ void *IR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* IR::ProvidesDef::_interface_repository_id (void) const
+const char* CORBA::ComponentIR::ProvidesDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/IR/ProvidesDef:1.0";
+  return "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::CORBA::InterfaceDef_ptr IR::ProvidesDef::interface_type (
+::CORBA::InterfaceDef_ptr CORBA::ComponentIR::ProvidesDef::interface_type (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -4822,137 +4974,172 @@ const char* IR::ProvidesDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-static const CORBA::Long _oc_IR_ProvidesDef[] =
+void CORBA::ComponentIR::ProvidesDef::interface_type (
+    CORBA::InterfaceDef_ptr interface_type
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_ProvidesDef_Proxy_Impl &proxy = 
+    this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  proxy.interface_type (
+      this,
+      interface_type
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
+  46,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x726f7669), 
-  ACE_NTOHL (0x64657344), 
-  ACE_NTOHL (0x65663a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDef:1.0
-  12,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5072), 
+  ACE_NTOHL (0x6f766964), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0
+    12,
   ACE_NTOHL (0x50726f76), 
   ACE_NTOHL (0x69646573), 
   ACE_NTOHL (0x44656600),  // name = ProvidesDef
-};
+  };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDef (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ProvidesDef (
     CORBA::tk_objref,
-    sizeof (_oc_IR_ProvidesDef),
-    (char *) &_oc_IR_ProvidesDef,
+    sizeof (_oc_CORBA_ComponentIR_ProvidesDef),
+    (char *) &_oc_CORBA_ComponentIR_ProvidesDef,
     0,
-    sizeof (IR::ProvidesDef)
+    sizeof (CORBA::ComponentIR::ProvidesDef)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
     _tc_ProvidesDef,
-    &_tc_TAO_tc_IR_ProvidesDef
+    &_tc_TAO_tc_CORBA_ComponentIR_ProvidesDef
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_ProvidesDescription[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
+  54,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x726f7669), 
-  ACE_NTOHL (0x64657344), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDescription:1.0
-  20,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5072), 
+  ACE_NTOHL (0x6f766964), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0
+    20,
   ACE_NTOHL (0x50726f76), 
   ACE_NTOHL (0x69646573), 
   ACE_NTOHL (0x44657363), 
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = ProvidesDescription
   5, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
+    33,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f49), 
-    ACE_NTOHL (0x64656e74), 
-    ACE_NTOHL (0x69666965), 
-    ACE_NTOHL (0x723a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
-    11,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
+    35,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
-    13,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+        13,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x64656669), 
   ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
-  0xffffffa0, // negative offset (-96)
+    0xffffffff, // indirection
+  0xffffff9c, // negative offset (-100)
   8,
   ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
+    34,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f56), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5370), 
-    ACE_NTOHL (0x65633a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
-    12,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+        12,
     ACE_NTOHL (0x56657273), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   15,
@@ -4960,221 +5147,215 @@ static const CORBA::Long _oc_IR_ProvidesDescription[] =
   ACE_NTOHL (0x72666163), 
   ACE_NTOHL (0x655f7479), 
   ACE_NTOHL (0x70650000),  // name = interface_type
-  CORBA::tk_objref, // typecode kind
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f496e), 
-    ACE_NTOHL (0x74657266), 
-    ACE_NTOHL (0x61636544), 
-    ACE_NTOHL (0x65663a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-    13,
-    ACE_NTOHL (0x496e7465), 
-    ACE_NTOHL (0x72666163), 
-    ACE_NTOHL (0x65446566), 
-    ACE_NTOHL (0x0),  // name = InterfaceDef
-
+    0xffffffff, // indirection
+  0xffffff28, // negative offset (-216)
 };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDescription (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ProvidesDescription (
     CORBA::tk_struct,
-    sizeof (_oc_IR_ProvidesDescription),
-    (char *) &_oc_IR_ProvidesDescription,
+    sizeof (_oc_CORBA_ComponentIR_ProvidesDescription),
+    (char *) &_oc_CORBA_ComponentIR_ProvidesDescription,
     0,
-    sizeof (IR::ProvidesDescription)
+    sizeof (CORBA::ComponentIR::ProvidesDescription)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
     _tc_ProvidesDescription,
-    &_tc_TAO_tc_IR_ProvidesDescription
+    &_tc_TAO_tc_CORBA_ComponentIR_ProvidesDescription
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void IR::ProvidesDescription::_tao_any_destructor (void *_tao_void_pointer)
+void CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
   ProvidesDescription *tmp = ACE_static_cast (ProvidesDescription*, _tao_void_pointer);
   delete tmp;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-int IR::UsesDef::_tao_class_id = 0;
+int CORBA::ComponentIR::UsesDef::_tao_class_id = 0;
 
-IR::UsesDef_ptr
-tao_IR_UsesDef_duplicate (
-    IR::UsesDef_ptr p
+CORBA::ComponentIR::UsesDef_ptr
+tao_CORBA_ComponentIR_UsesDef_duplicate (
+    CORBA::ComponentIR::UsesDef_ptr p
   )
 {
-  return IR::UsesDef::_duplicate (p);
+  return CORBA::ComponentIR::UsesDef::_duplicate (p);
 }
 
 void
-tao_IR_UsesDef_release (
-    IR::UsesDef_ptr p
+tao_CORBA_ComponentIR_UsesDef_release (
+    CORBA::ComponentIR::UsesDef_ptr p
   )
 {
   CORBA::release (p);
 }
 
-IR::UsesDef_ptr
-tao_IR_UsesDef_nil (
+CORBA::ComponentIR::UsesDef_ptr
+tao_CORBA_ComponentIR_UsesDef_nil (
     void
   )
 {
-  return IR::UsesDef::_nil ();
+  return CORBA::ComponentIR::UsesDef::_nil ();
 }
 
-IR::UsesDef_ptr
-tao_IR_UsesDef_narrow (
+CORBA::ComponentIR::UsesDef_ptr
+tao_CORBA_ComponentIR_UsesDef_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return IR::UsesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::UsesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-tao_IR_UsesDef_upcast (
+tao_CORBA_ComponentIR_UsesDef_upcast (
     void *src
   )
 {
-  IR::UsesDef **tmp =
-    ACE_static_cast (IR::UsesDef **, src);
+  CORBA::ComponentIR::UsesDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::UsesDef **, src);
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ComponentIR_UsesDef_marshal (
+    CORBA::ComponentIR::UsesDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
-// IR::UsesDef_var
+// CORBA::ComponentIR::UsesDef_var
 // *************************************************************
 
-IR::UsesDef_var::UsesDef_var (void)
+CORBA::ComponentIR::UsesDef_var::UsesDef_var (void)
   : ptr_ (UsesDef::_nil ())
 {}
 
-::IR::UsesDef_ptr
-IR::UsesDef_var::ptr (void) const
+::CORBA::ComponentIR::UsesDef_ptr
+CORBA::ComponentIR::UsesDef_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-IR::UsesDef_var::UsesDef_var (const ::IR::UsesDef_var &p)
+CORBA::ComponentIR::UsesDef_var::UsesDef_var (const ::CORBA::ComponentIR::UsesDef_var &p)
   : TAO_Base_var (),
     ptr_ (UsesDef::_duplicate (p.ptr ()))
 {}
 
-IR::UsesDef_var::~UsesDef_var (void)
+CORBA::ComponentIR::UsesDef_var::~UsesDef_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
-IR::UsesDef_var &
-IR::UsesDef_var::operator= (UsesDef_ptr p)
+CORBA::ComponentIR::UsesDef_var &
+CORBA::ComponentIR::UsesDef_var::operator= (UsesDef_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-IR::UsesDef_var &
-IR::UsesDef_var::operator= (const ::IR::UsesDef_var &p)
+CORBA::ComponentIR::UsesDef_var &
+CORBA::ComponentIR::UsesDef_var::operator= (const ::CORBA::ComponentIR::UsesDef_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::UsesDef::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::ComponentIR::UsesDef::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-IR::UsesDef_var::operator const ::IR::UsesDef_ptr &() const // cast
+CORBA::ComponentIR::UsesDef_var::operator const ::CORBA::ComponentIR::UsesDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-IR::UsesDef_var::operator ::IR::UsesDef_ptr &() // cast 
+CORBA::ComponentIR::UsesDef_var::operator ::CORBA::ComponentIR::UsesDef_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::IR::UsesDef_ptr
-IR::UsesDef_var::operator-> (void) const
+::CORBA::ComponentIR::UsesDef_ptr
+CORBA::ComponentIR::UsesDef_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::IR::UsesDef_ptr
-IR::UsesDef_var::in (void) const
+::CORBA::ComponentIR::UsesDef_ptr
+CORBA::ComponentIR::UsesDef_var::in (void) const
 {
   return this->ptr_;
 }
 
-::IR::UsesDef_ptr &
-IR::UsesDef_var::inout (void)
+::CORBA::ComponentIR::UsesDef_ptr &
+CORBA::ComponentIR::UsesDef_var::inout (void)
 {
   return this->ptr_;
 }
 
-::IR::UsesDef_ptr &
-IR::UsesDef_var::out (void)
+::CORBA::ComponentIR::UsesDef_ptr &
+CORBA::ComponentIR::UsesDef_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::UsesDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::UsesDef::_nil ();
   return this->ptr_;
 }
 
-::IR::UsesDef_ptr
-IR::UsesDef_var::_retn (void)
+::CORBA::ComponentIR::UsesDef_ptr
+CORBA::ComponentIR::UsesDef_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::IR::UsesDef_ptr val = this->ptr_;
-  this->ptr_ = ::IR::UsesDef::_nil ();
+  ::CORBA::ComponentIR::UsesDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::UsesDef::_nil ();
   return val;
 }
 
-::IR::UsesDef_ptr
-IR::UsesDef_var::tao_duplicate (UsesDef_ptr p)
+::CORBA::ComponentIR::UsesDef_ptr
+CORBA::ComponentIR::UsesDef_var::tao_duplicate (UsesDef_ptr p)
 {
-  return ::IR::UsesDef::_duplicate (p);
+  return ::CORBA::ComponentIR::UsesDef::_duplicate (p);
 }
 
 void
-IR::UsesDef_var::tao_release (UsesDef_ptr p)
+CORBA::ComponentIR::UsesDef_var::tao_release (UsesDef_ptr p)
 {
   CORBA::release (p);
 }
 
-::IR::UsesDef_ptr
-IR::UsesDef_var::tao_nil (void)
+::CORBA::ComponentIR::UsesDef_ptr
+CORBA::ComponentIR::UsesDef_var::tao_nil (void)
 {
-  return ::IR::UsesDef::_nil ();
+  return ::CORBA::ComponentIR::UsesDef::_nil ();
 }
 
-::IR::UsesDef_ptr
-IR::UsesDef_var::tao_narrow (
+::CORBA::ComponentIR::UsesDef_ptr
+CORBA::ComponentIR::UsesDef_var::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::UsesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::CORBA::ComponentIR::UsesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IR::UsesDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::UsesDef_var::tao_upcast (void *src)
 {
   UsesDef **tmp =
     ACE_static_cast (UsesDef **, src);
@@ -5182,79 +5363,79 @@ IR::UsesDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
-// IR::UsesDef_out
+// CORBA::ComponentIR::UsesDef_out
 // *************************************************************
 
-IR::UsesDef_out::UsesDef_out (UsesDef_ptr &p)
+CORBA::ComponentIR::UsesDef_out::UsesDef_out (UsesDef_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::IR::UsesDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::UsesDef::_nil ();
 }
 
-IR::UsesDef_out::UsesDef_out (UsesDef_var &p)
+CORBA::ComponentIR::UsesDef_out::UsesDef_out (UsesDef_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::UsesDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::UsesDef::_nil ();
 }
 
-IR::UsesDef_out::UsesDef_out (const ::IR::UsesDef_out &p)
+CORBA::ComponentIR::UsesDef_out::UsesDef_out (const ::CORBA::ComponentIR::UsesDef_out &p)
   : ptr_ (ACE_const_cast (UsesDef_out &, p).ptr_)
 {}
 
-::IR::UsesDef_out &
-IR::UsesDef_out::operator= (const ::IR::UsesDef_out &p)
+::CORBA::ComponentIR::UsesDef_out &
+CORBA::ComponentIR::UsesDef_out::operator= (const ::CORBA::ComponentIR::UsesDef_out &p)
 {
   this->ptr_ = ACE_const_cast (UsesDef_out&, p).ptr_;
   return *this;
 }
 
-IR::UsesDef_out &
-IR::UsesDef_out::operator= (const ::IR::UsesDef_var &p)
+CORBA::ComponentIR::UsesDef_out &
+CORBA::ComponentIR::UsesDef_out::operator= (const ::CORBA::ComponentIR::UsesDef_var &p)
 {
-  this->ptr_ = ::IR::UsesDef::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::ComponentIR::UsesDef::_duplicate (p.ptr ());
   return *this;
 }
 
-IR::UsesDef_out &
-IR::UsesDef_out::operator= (UsesDef_ptr p)
+CORBA::ComponentIR::UsesDef_out &
+CORBA::ComponentIR::UsesDef_out::operator= (UsesDef_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-IR::UsesDef_out::operator ::IR::UsesDef_ptr &() // cast
+CORBA::ComponentIR::UsesDef_out::operator ::CORBA::ComponentIR::UsesDef_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::IR::UsesDef_ptr &
-IR::UsesDef_out::ptr (void)
+::CORBA::ComponentIR::UsesDef_ptr &
+CORBA::ComponentIR::UsesDef_out::ptr (void)
 {
   return this->ptr_;
 }
 
-::IR::UsesDef_ptr
-IR::UsesDef_out::operator-> (void)
+::CORBA::ComponentIR::UsesDef_ptr
+CORBA::ComponentIR::UsesDef_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_UsesDef_interface_type_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -5271,16 +5452,16 @@ public:
     void result (::CORBA::InterfaceDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (const TAO_ClientRequestInfo_IR_UsesDef_interface_type_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_UsesDef_interface_type_get &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get &);
     
     ::CORBA::InterfaceDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_NOT_USED      
@@ -5289,7 +5470,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -5301,7 +5482,7 @@ TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (ACE_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -5313,7 +5494,7 @@ TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -5329,19 +5510,106 @@ TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_
 }
 
 void 
-TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (::CORBA::InterfaceDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::result (::CORBA::InterfaceDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      CORBA::InterfaceDef_ptr interface_type
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set &);
+    CORBA::InterfaceDef_ptr interface_type_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      CORBA::InterfaceDef_ptr interface_type
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      interface_type_ (interface_type)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<=  this->interface_type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -5358,16 +5626,16 @@ public:
     void result (::CORBA::Boolean result);
     
   private:
-    TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (const TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get &);
     
     ::CORBA::Boolean _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_NOT_USED      
@@ -5376,7 +5644,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -5388,7 +5656,7 @@ TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (ACE_ENV_SINGLE_ARG_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -5400,7 +5668,7 @@ TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (ACE_ENV_SINGLE_ARG
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -5416,33 +5684,120 @@ TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (ACE_ENV_SINGLE_ARG_DEC
 }
 
 void 
-TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Boolean result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::result (CORBA::Boolean result)
 {
   // Update the result. 
   this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const CORBA::Boolean & is_multiple
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set &);
+    const CORBA::Boolean & is_multiple_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const CORBA::Boolean & is_multiple
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      is_multiple_ (is_multiple)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_multiple_);
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+
+
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
 
-IR::_TAO_UsesDef_Proxy_Impl::_TAO_UsesDef_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_UsesDef_Proxy_Impl::_TAO_UsesDef_Proxy_Impl (void)
 {}
 
-IR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::CORBA::InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
+::CORBA::InterfaceDef_ptr CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
   )
@@ -5482,7 +5837,7 @@ IR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_UsesDef_interface_type_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get _tao_ri (
           &_tao_call,
           _collocated_tao_target_
           ACE_ENV_ARG_PARAMETER
@@ -5507,82 +5862,267 @@ IR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
           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 ());
+
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::InterfaceDef_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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+void CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
+    CORBA::Object *_collocated_tao_target_,
+    CORBA::InterfaceDef_ptr interface_type
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "_set_interface_type",
+      19,
+      1,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_,
+          interface_type
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK;
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << interface_type)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-                  
-                  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
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::InterfaceDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -5593,7 +6133,7 @@ IR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5617,7 +6157,7 @@ IR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5627,28 +6167,28 @@ IR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
       
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      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 */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
+CORBA::Boolean CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
   )
@@ -5688,7 +6228,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get _tao_ri (
           &_tao_call,
           _collocated_tao_target_
           ACE_ENV_ARG_PARAMETER
@@ -5713,81 +6253,266 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
           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);
+
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
               
+              continue;
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::Boolean _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval);
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (_tao_retval);
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+void CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
+    CORBA::Object *_collocated_tao_target_,
+    CORBA::Boolean is_multiple
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "_set_is_multiple",
+      16,
+      1,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_,
+          is_multiple
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK;
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << CORBA::Any::from_boolean (is_multiple))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-                  
-                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-                  
-                  if (!(
-                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Boolean _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -5798,7 +6523,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5822,7 +6547,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -5832,22 +6557,22 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
       
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval);
+      ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval);
+      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 */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
 }
 
 //
@@ -5855,43 +6580,43 @@ return _tao_retval;
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
 //
 
-IR::_TAO_UsesDef_Proxy_Broker::_TAO_UsesDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_UsesDef_Proxy_Broker::_TAO_UsesDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_UsesDef_Proxy_Broker::~_TAO_UsesDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_UsesDef_Proxy_Broker::~_TAO_UsesDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_UsesDef_Proxy_Broker * (*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_UsesDef_Proxy_Broker * (*CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-IR::_TAO_UsesDef_Remote_Proxy_Broker *
-IR::_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker (void)
 {
-  static ::IR::_TAO_UsesDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-IR::_TAO_UsesDef_Remote_Proxy_Broker::_TAO_UsesDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Broker::_TAO_UsesDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_UsesDef_Remote_Proxy_Broker::~_TAO_UsesDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Broker::~_TAO_UsesDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_UsesDef_Proxy_Impl&
-IR::_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
-    ::IR::UsesDef *
+CORBA::ComponentIR::_TAO_UsesDef_Proxy_Impl&
+CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::UsesDef *
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -5903,38 +6628,38 @@ IR::_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
-IR::UsesDef::UsesDef (int collocated)
+CORBA::ComponentIR::UsesDef::UsesDef (int collocated)
 {
-  this->IR_UsesDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_UsesDef_setup_collocation (collocated);
 }
 
 void
-IR::UsesDef::IR_UsesDef_setup_collocation (int collocated)
+CORBA::ComponentIR::UsesDef::CORBA_ComponentIR_UsesDef_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_UsesDef_Proxy_Broker_ =
-      ::IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this);
+      ::CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_UsesDef_Proxy_Broker_ =
-      ::IR::_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker ();
+      ::CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker ();
   
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-IR::UsesDef::~UsesDef (void)
+CORBA::ComponentIR::UsesDef::~UsesDef (void)
 {}
 
 void 
-IR::UsesDef::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ComponentIR::UsesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   UsesDef *tmp = ACE_static_cast (UsesDef *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IR::UsesDef_ptr
-IR::UsesDef::_narrow (
+CORBA::ComponentIR::UsesDef_ptr
+CORBA::ComponentIR::UsesDef::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -5948,7 +6673,7 @@ IR::UsesDef::_narrow (
     {
       CORBA::Boolean is_a =
         obj->_is_a (
-            "IDL:omg.org/IR/UsesDef:1.0"
+            "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0"
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (UsesDef::_nil ());
@@ -5962,8 +6687,8 @@ IR::UsesDef::_narrow (
   return UsesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IR::UsesDef_ptr 
-IR::UsesDef::_unchecked_narrow (
+CORBA::ComponentIR::UsesDef_ptr 
+CORBA::ComponentIR::UsesDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -5988,12 +6713,12 @@ IR::UsesDef::_unchecked_narrow (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&
-          IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer != 0
+          CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer != 0
         )
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::UsesDef (
+              ::CORBA::ComponentIR::UsesDef (
                   stub,
                   1,
                   obj->_servant ()
@@ -6006,7 +6731,7 @@ IR::UsesDef::_unchecked_narrow (
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::UsesDef (
+              ::CORBA::ComponentIR::UsesDef (
                   stub,
                   0,
                   obj->_servant ()
@@ -6030,8 +6755,8 @@ IR::UsesDef::_unchecked_narrow (
         );
 }
 
-IR::UsesDef_ptr
-IR::UsesDef::_duplicate (UsesDef_ptr obj)
+CORBA::ComponentIR::UsesDef_ptr
+CORBA::ComponentIR::UsesDef::_duplicate (UsesDef_ptr obj)
 {
   if (! CORBA::is_nil (obj))
     {
@@ -6042,7 +6767,7 @@ IR::UsesDef::_duplicate (UsesDef_ptr obj)
 }
 
 CORBA::Boolean
-IR::UsesDef::_is_a (
+CORBA::ComponentIR::UsesDef::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
   )
@@ -6050,7 +6775,7 @@ IR::UsesDef::_is_a (
   if (
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/UsesDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
@@ -6077,13 +6802,13 @@ IR::UsesDef::_is_a (
     }
 }
 
-void *IR::UsesDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::ComponentIR::UsesDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, UsesDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, UsesDef)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
@@ -6136,15 +6861,15 @@ void *IR::UsesDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* IR::UsesDef::_interface_repository_id (void) const
+const char* CORBA::ComponentIR::UsesDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/IR/UsesDef:1.0";
+  return "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::CORBA::InterfaceDef_ptr IR::UsesDef::interface_type (
+::CORBA::InterfaceDef_ptr CORBA::ComponentIR::UsesDef::interface_type (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6162,9 +6887,31 @@ const char* IR::UsesDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+void CORBA::ComponentIR::UsesDef::interface_type (
+    CORBA::InterfaceDef_ptr interface_type
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_UsesDef_Proxy_Impl &proxy = 
+    this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  proxy.interface_type (
+      this,
+      interface_type
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-CORBA::Boolean IR::UsesDef::is_multiple (
+CORBA::Boolean CORBA::ComponentIR::UsesDef::is_multiple (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6182,133 +6929,168 @@ CORBA::Boolean IR::UsesDef::is_multiple (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+void CORBA::ComponentIR::UsesDef::is_multiple (
+    CORBA::Boolean is_multiple
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_UsesDef_Proxy_Impl &proxy = 
+    this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  proxy.is_multiple (
+      this,
+      is_multiple
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_UsesDef[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_UsesDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  27,
+  42,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f55), 
-  ACE_NTOHL (0x73657344), 
-  ACE_NTOHL (0x65663a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDef:1.0
-  8,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5573), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0
+    8,
   ACE_NTOHL (0x55736573), 
   ACE_NTOHL (0x44656600),  // name = UsesDef
-};
+  };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_UsesDef (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_UsesDef (
     CORBA::tk_objref,
-    sizeof (_oc_IR_UsesDef),
-    (char *) &_oc_IR_UsesDef,
+    sizeof (_oc_CORBA_ComponentIR_UsesDef),
+    (char *) &_oc_CORBA_ComponentIR_UsesDef,
     0,
-    sizeof (IR::UsesDef)
+    sizeof (CORBA::ComponentIR::UsesDef)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
     _tc_UsesDef,
-    &_tc_TAO_tc_IR_UsesDef
+    &_tc_TAO_tc_CORBA_ComponentIR_UsesDef
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_UsesDescription[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_UsesDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
+  50,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f55), 
-  ACE_NTOHL (0x73657344), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDescription:1.0
-  16,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5573), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0
+    16,
   ACE_NTOHL (0x55736573), 
   ACE_NTOHL (0x44657363), 
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = UsesDescription
   6, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
+    33,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f49), 
-    ACE_NTOHL (0x64656e74), 
-    ACE_NTOHL (0x69666965), 
-    ACE_NTOHL (0x723a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
-    11,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
+    35,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
-    13,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+        13,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x64656669), 
   ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
-  0xffffffa0, // negative offset (-96)
+    0xffffffff, // indirection
+  0xffffff9c, // negative offset (-100)
   8,
   ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
+    34,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f56), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5370), 
-    ACE_NTOHL (0x65633a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
-    12,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+        12,
     ACE_NTOHL (0x56657273), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   15,
@@ -6316,880 +7098,303 @@ static const CORBA::Long _oc_IR_UsesDescription[] =
   ACE_NTOHL (0x72666163), 
   ACE_NTOHL (0x655f7479), 
   ACE_NTOHL (0x70650000),  // name = interface_type
-  CORBA::tk_objref, // typecode kind
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f496e), 
-    ACE_NTOHL (0x74657266), 
-    ACE_NTOHL (0x61636544), 
-    ACE_NTOHL (0x65663a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-    13,
-    ACE_NTOHL (0x496e7465), 
-    ACE_NTOHL (0x72666163), 
-    ACE_NTOHL (0x65446566), 
-    ACE_NTOHL (0x0),  // name = InterfaceDef
-
+    0xffffffff, // indirection
+  0xffffff28, // negative offset (-216)
   12,
   ACE_NTOHL (0x69735f6d), 
   ACE_NTOHL (0x756c7469), 
   ACE_NTOHL (0x706c6500),  // name = is_multiple
-  CORBA::tk_boolean,
+    CORBA::tk_boolean,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_UsesDescription (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_UsesDescription (
     CORBA::tk_struct,
-    sizeof (_oc_IR_UsesDescription),
-    (char *) &_oc_IR_UsesDescription,
+    sizeof (_oc_CORBA_ComponentIR_UsesDescription),
+    (char *) &_oc_CORBA_ComponentIR_UsesDescription,
     0,
-    sizeof (IR::UsesDescription)
+    sizeof (CORBA::ComponentIR::UsesDescription)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
     _tc_UsesDescription,
-    &_tc_TAO_tc_IR_UsesDescription
+    &_tc_TAO_tc_CORBA_ComponentIR_UsesDescription
   )
 TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
-
-void IR::UsesDescription::_tao_any_destructor (void *_tao_void_pointer)
-{
-  UsesDescription *tmp = ACE_static_cast (UsesDescription*, _tao_void_pointer);
-  delete tmp;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CS_
-
-void
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_allocate_buffer (CORBA::ULong length)
-{
-  IR::ProvidesDescription* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      IR::ProvidesDescription *old =
-        ACE_reinterpret_cast (IR::ProvidesDescription *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  IR::ProvidesDescription *tmp =
-    ACE_reinterpret_cast (IR::ProvidesDescription *, this->buffer_);
-  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_PROVIDESDESCSEQ_CS_)
-#define _IR_PROVIDESDESCSEQ_CS_
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// IR::ProvidesDescSeq
-// *************************************************************
-
-IR::ProvidesDescSeq::ProvidesDescSeq (void)
-{}
-
-IR::ProvidesDescSeq::ProvidesDescSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_IR_ProvidesDescSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<IR::ProvidesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-IR::ProvidesDescSeq::ProvidesDescSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IR::ProvidesDescription *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_IR_ProvidesDescSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<IR::ProvidesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-IR::ProvidesDescSeq::ProvidesDescSeq (const ProvidesDescSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_IR_ProvidesDescSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<IR::ProvidesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-IR::ProvidesDescSeq::~ProvidesDescSeq (void) // dtor
-{}
-
-void IR::ProvidesDescSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ProvidesDescSeq *tmp = ACE_static_cast (ProvidesDescSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_ProvidesDescSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x726f7669), 
-  ACE_NTOHL (0x64657344), 
-  ACE_NTOHL (0x65736353), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDescSeq:1.0
-  16,
-  ACE_NTOHL (0x50726f76), 
-  ACE_NTOHL (0x69646573), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x53657100),  // name = ProvidesDescSeq
-  CORBA::tk_sequence, // typecode kind
-  460, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    444, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      39,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f50), 
-      ACE_NTOHL (0x726f7669), 
-      ACE_NTOHL (0x64657344), 
-      ACE_NTOHL (0x65736372), 
-      ACE_NTOHL (0x69707469), 
-      ACE_NTOHL (0x6f6e3a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDescription:1.0
-      20,
-      ACE_NTOHL (0x50726f76), 
-      ACE_NTOHL (0x69646573), 
-      ACE_NTOHL (0x44657363), 
-      ACE_NTOHL (0x72697074), 
-      ACE_NTOHL (0x696f6e00),  // name = ProvidesDescription
-      5, // member count
-      5,
-      ACE_NTOHL (0x6e616d65), 
-      ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f49), 
-        ACE_NTOHL (0x64656e74), 
-        ACE_NTOHL (0x69666965), 
-        ACE_NTOHL (0x723a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
-        ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-        0U, // string length
-
-      3,
-      ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f52), 
-        ACE_NTOHL (0x65706f73), 
-        ACE_NTOHL (0x69746f72), 
-        ACE_NTOHL (0x7949643a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
-      ACE_NTOHL (0x696e0000),  // name = defined_in
-      0xffffffff, // indirection
-      0xffffffa0, // negative offset (-96)
-      8,
-      ACE_NTOHL (0x76657273), 
-      ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f56), 
-        ACE_NTOHL (0x65727369), 
-        ACE_NTOHL (0x6f6e5370), 
-        ACE_NTOHL (0x65633a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
-        12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
-        ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
-        0U, // string length
-
-      15,
-      ACE_NTOHL (0x696e7465), 
-      ACE_NTOHL (0x72666163), 
-      ACE_NTOHL (0x655f7479), 
-      ACE_NTOHL (0x70650000),  // name = interface_type
-      CORBA::tk_objref, // typecode kind
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f496e), 
-        ACE_NTOHL (0x74657266), 
-        ACE_NTOHL (0x61636544), 
-        ACE_NTOHL (0x65663a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-        13,
-        ACE_NTOHL (0x496e7465), 
-        ACE_NTOHL (0x72666163), 
-        ACE_NTOHL (0x65446566), 
-        ACE_NTOHL (0x0),  // name = InterfaceDef
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDescSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_ProvidesDescSeq),
-    (char *) &_oc_IR_ProvidesDescSeq,
-    0,
-    sizeof (IR::ProvidesDescSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ProvidesDescSeq,
-    &_tc_TAO_tc_IR_ProvidesDescSeq
-  )
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CS_
-
-void
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_allocate_buffer (CORBA::ULong length)
-{
-  IR::UsesDescription* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      IR::UsesDescription *old =
-        ACE_reinterpret_cast (IR::UsesDescription *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_deallocate_buffer (void)
+void CORBA::ComponentIR::UsesDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  IR::UsesDescription *tmp =
-    ACE_reinterpret_cast (IR::UsesDescription *, this->buffer_);
-  _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_USESDESCSEQ_CS_)
-#define _IR_USESDESCSEQ_CS_
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// IR::UsesDescSeq
-// *************************************************************
-
-IR::UsesDescSeq::UsesDescSeq (void)
-{}
-
-IR::UsesDescSeq::UsesDescSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_IR_UsesDescSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<IR::UsesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-IR::UsesDescSeq::UsesDescSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IR::UsesDescription *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_IR_UsesDescSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<IR::UsesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-IR::UsesDescSeq::UsesDescSeq (const UsesDescSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_IR_UsesDescSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<IR::UsesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-IR::UsesDescSeq::~UsesDescSeq (void) // dtor
-{}
-
-void IR::UsesDescSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  UsesDescSeq *tmp = ACE_static_cast (UsesDescSeq*, _tao_void_pointer);
+  UsesDescription *tmp = ACE_static_cast (UsesDescription*, _tao_void_pointer);
   delete tmp;
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IR_UsesDescSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f55), 
-  ACE_NTOHL (0x73657344), 
-  ACE_NTOHL (0x65736353), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDescSeq:1.0
-  12,
-  ACE_NTOHL (0x55736573), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x53657100),  // name = UsesDescSeq
-  CORBA::tk_sequence, // typecode kind
-  472, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    456, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49522f55), 
-      ACE_NTOHL (0x73657344), 
-      ACE_NTOHL (0x65736372), 
-      ACE_NTOHL (0x69707469), 
-      ACE_NTOHL (0x6f6e3a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDescription:1.0
-      16,
-      ACE_NTOHL (0x55736573), 
-      ACE_NTOHL (0x44657363), 
-      ACE_NTOHL (0x72697074), 
-      ACE_NTOHL (0x696f6e00),  // name = UsesDescription
-      6, // member count
-      5,
-      ACE_NTOHL (0x6e616d65), 
-      ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f49), 
-        ACE_NTOHL (0x64656e74), 
-        ACE_NTOHL (0x69666965), 
-        ACE_NTOHL (0x723a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
-        ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-        0U, // string length
-
-      3,
-      ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f52), 
-        ACE_NTOHL (0x65706f73), 
-        ACE_NTOHL (0x69746f72), 
-        ACE_NTOHL (0x7949643a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
-        ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-        0U, // string length
-
-      11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
-      ACE_NTOHL (0x696e0000),  // name = defined_in
-      0xffffffff, // indirection
-      0xffffffa0, // negative offset (-96)
-      8,
-      ACE_NTOHL (0x76657273), 
-      ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f56), 
-        ACE_NTOHL (0x65727369), 
-        ACE_NTOHL (0x6f6e5370), 
-        ACE_NTOHL (0x65633a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
-        12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
-        ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
-        0U, // string length
-
-      15,
-      ACE_NTOHL (0x696e7465), 
-      ACE_NTOHL (0x72666163), 
-      ACE_NTOHL (0x655f7479), 
-      ACE_NTOHL (0x70650000),  // name = interface_type
-      CORBA::tk_objref, // typecode kind
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f496e), 
-        ACE_NTOHL (0x74657266), 
-        ACE_NTOHL (0x61636544), 
-        ACE_NTOHL (0x65663a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-        13,
-        ACE_NTOHL (0x496e7465), 
-        ACE_NTOHL (0x72666163), 
-        ACE_NTOHL (0x65446566), 
-        ACE_NTOHL (0x0),  // name = InterfaceDef
-
-      12,
-      ACE_NTOHL (0x69735f6d), 
-      ACE_NTOHL (0x756c7469), 
-      ACE_NTOHL (0x706c6500),  // name = is_multiple
-      CORBA::tk_boolean,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_UsesDescSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_IR_UsesDescSeq),
-    (char *) &_oc_IR_UsesDescSeq,
-    0,
-    sizeof (IR::UsesDescSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_UsesDescSeq,
-    &_tc_TAO_tc_IR_UsesDescSeq
-  )
-TAO_NAMESPACE_END
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-int IR::EventDef::_tao_class_id = 0;
+int CORBA::ComponentIR::EventPortDef::_tao_class_id = 0;
 
-IR::EventDef_ptr
-tao_IR_EventDef_duplicate (
-    IR::EventDef_ptr p
+CORBA::ComponentIR::EventPortDef_ptr
+tao_CORBA_ComponentIR_EventPortDef_duplicate (
+    CORBA::ComponentIR::EventPortDef_ptr p
   )
 {
-  return IR::EventDef::_duplicate (p);
+  return CORBA::ComponentIR::EventPortDef::_duplicate (p);
 }
 
 void
-tao_IR_EventDef_release (
-    IR::EventDef_ptr p
+tao_CORBA_ComponentIR_EventPortDef_release (
+    CORBA::ComponentIR::EventPortDef_ptr p
   )
 {
   CORBA::release (p);
 }
 
-IR::EventDef_ptr
-tao_IR_EventDef_nil (
+CORBA::ComponentIR::EventPortDef_ptr
+tao_CORBA_ComponentIR_EventPortDef_nil (
     void
   )
 {
-  return IR::EventDef::_nil ();
+  return CORBA::ComponentIR::EventPortDef::_nil ();
 }
 
-IR::EventDef_ptr
-tao_IR_EventDef_narrow (
+CORBA::ComponentIR::EventPortDef_ptr
+tao_CORBA_ComponentIR_EventPortDef_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return IR::EventDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::EventPortDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-tao_IR_EventDef_upcast (
+tao_CORBA_ComponentIR_EventPortDef_upcast (
     void *src
   )
 {
-  IR::EventDef **tmp =
-    ACE_static_cast (IR::EventDef **, src);
+  CORBA::ComponentIR::EventPortDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::EventPortDef **, src);
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ComponentIR_EventPortDef_marshal (
+    CORBA::ComponentIR::EventPortDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
-// IR::EventDef_var
+// CORBA::ComponentIR::EventPortDef_var
 // *************************************************************
 
-IR::EventDef_var::EventDef_var (void)
-  : ptr_ (EventDef::_nil ())
+CORBA::ComponentIR::EventPortDef_var::EventPortDef_var (void)
+  : ptr_ (EventPortDef::_nil ())
 {}
 
-::IR::EventDef_ptr
-IR::EventDef_var::ptr (void) const
+::CORBA::ComponentIR::EventPortDef_ptr
+CORBA::ComponentIR::EventPortDef_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-IR::EventDef_var::EventDef_var (const ::IR::EventDef_var &p)
+CORBA::ComponentIR::EventPortDef_var::EventPortDef_var (const ::CORBA::ComponentIR::EventPortDef_var &p)
   : TAO_Base_var (),
-    ptr_ (EventDef::_duplicate (p.ptr ()))
+    ptr_ (EventPortDef::_duplicate (p.ptr ()))
 {}
 
-IR::EventDef_var::~EventDef_var (void)
+CORBA::ComponentIR::EventPortDef_var::~EventPortDef_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
-IR::EventDef_var &
-IR::EventDef_var::operator= (EventDef_ptr p)
+CORBA::ComponentIR::EventPortDef_var &
+CORBA::ComponentIR::EventPortDef_var::operator= (EventPortDef_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-IR::EventDef_var &
-IR::EventDef_var::operator= (const ::IR::EventDef_var &p)
+CORBA::ComponentIR::EventPortDef_var &
+CORBA::ComponentIR::EventPortDef_var::operator= (const ::CORBA::ComponentIR::EventPortDef_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::EventDef::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::ComponentIR::EventPortDef::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-IR::EventDef_var::operator const ::IR::EventDef_ptr &() const // cast
+CORBA::ComponentIR::EventPortDef_var::operator const ::CORBA::ComponentIR::EventPortDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-IR::EventDef_var::operator ::IR::EventDef_ptr &() // cast 
+CORBA::ComponentIR::EventPortDef_var::operator ::CORBA::ComponentIR::EventPortDef_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::IR::EventDef_ptr
-IR::EventDef_var::operator-> (void) const
+::CORBA::ComponentIR::EventPortDef_ptr
+CORBA::ComponentIR::EventPortDef_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::IR::EventDef_ptr
-IR::EventDef_var::in (void) const
+::CORBA::ComponentIR::EventPortDef_ptr
+CORBA::ComponentIR::EventPortDef_var::in (void) const
 {
   return this->ptr_;
 }
 
-::IR::EventDef_ptr &
-IR::EventDef_var::inout (void)
+::CORBA::ComponentIR::EventPortDef_ptr &
+CORBA::ComponentIR::EventPortDef_var::inout (void)
 {
   return this->ptr_;
 }
 
-::IR::EventDef_ptr &
-IR::EventDef_var::out (void)
+::CORBA::ComponentIR::EventPortDef_ptr &
+CORBA::ComponentIR::EventPortDef_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::EventDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::EventPortDef::_nil ();
   return this->ptr_;
 }
 
-::IR::EventDef_ptr
-IR::EventDef_var::_retn (void)
+::CORBA::ComponentIR::EventPortDef_ptr
+CORBA::ComponentIR::EventPortDef_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::IR::EventDef_ptr val = this->ptr_;
-  this->ptr_ = ::IR::EventDef::_nil ();
+  ::CORBA::ComponentIR::EventPortDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::EventPortDef::_nil ();
   return val;
 }
 
-::IR::EventDef_ptr
-IR::EventDef_var::tao_duplicate (EventDef_ptr p)
+::CORBA::ComponentIR::EventPortDef_ptr
+CORBA::ComponentIR::EventPortDef_var::tao_duplicate (EventPortDef_ptr p)
 {
-  return ::IR::EventDef::_duplicate (p);
+  return ::CORBA::ComponentIR::EventPortDef::_duplicate (p);
 }
 
 void
-IR::EventDef_var::tao_release (EventDef_ptr p)
+CORBA::ComponentIR::EventPortDef_var::tao_release (EventPortDef_ptr p)
 {
   CORBA::release (p);
 }
 
-::IR::EventDef_ptr
-IR::EventDef_var::tao_nil (void)
+::CORBA::ComponentIR::EventPortDef_ptr
+CORBA::ComponentIR::EventPortDef_var::tao_nil (void)
 {
-  return ::IR::EventDef::_nil ();
+  return ::CORBA::ComponentIR::EventPortDef::_nil ();
 }
 
-::IR::EventDef_ptr
-IR::EventDef_var::tao_narrow (
+::CORBA::ComponentIR::EventPortDef_ptr
+CORBA::ComponentIR::EventPortDef_var::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::EventDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::CORBA::ComponentIR::EventPortDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IR::EventDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::EventPortDef_var::tao_upcast (void *src)
 {
-  EventDef **tmp =
-    ACE_static_cast (EventDef **, src);
+  EventPortDef **tmp =
+    ACE_static_cast (EventPortDef **, src);
   return *tmp;
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
-// IR::EventDef_out
+// CORBA::ComponentIR::EventPortDef_out
 // *************************************************************
 
-IR::EventDef_out::EventDef_out (EventDef_ptr &p)
+CORBA::ComponentIR::EventPortDef_out::EventPortDef_out (EventPortDef_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::IR::EventDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::EventPortDef::_nil ();
 }
 
-IR::EventDef_out::EventDef_out (EventDef_var &p)
+CORBA::ComponentIR::EventPortDef_out::EventPortDef_out (EventPortDef_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::EventDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::EventPortDef::_nil ();
 }
 
-IR::EventDef_out::EventDef_out (const ::IR::EventDef_out &p)
-  : ptr_ (ACE_const_cast (EventDef_out &, p).ptr_)
+CORBA::ComponentIR::EventPortDef_out::EventPortDef_out (const ::CORBA::ComponentIR::EventPortDef_out &p)
+  : ptr_ (ACE_const_cast (EventPortDef_out &, p).ptr_)
 {}
 
-::IR::EventDef_out &
-IR::EventDef_out::operator= (const ::IR::EventDef_out &p)
+::CORBA::ComponentIR::EventPortDef_out &
+CORBA::ComponentIR::EventPortDef_out::operator= (const ::CORBA::ComponentIR::EventPortDef_out &p)
 {
-  this->ptr_ = ACE_const_cast (EventDef_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (EventPortDef_out&, p).ptr_;
   return *this;
 }
 
-IR::EventDef_out &
-IR::EventDef_out::operator= (const ::IR::EventDef_var &p)
+CORBA::ComponentIR::EventPortDef_out &
+CORBA::ComponentIR::EventPortDef_out::operator= (const ::CORBA::ComponentIR::EventPortDef_var &p)
 {
-  this->ptr_ = ::IR::EventDef::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::ComponentIR::EventPortDef::_duplicate (p.ptr ());
   return *this;
 }
 
-IR::EventDef_out &
-IR::EventDef_out::operator= (EventDef_ptr p)
+CORBA::ComponentIR::EventPortDef_out &
+CORBA::ComponentIR::EventPortDef_out::operator= (EventPortDef_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-IR::EventDef_out::operator ::IR::EventDef_ptr &() // cast
+CORBA::ComponentIR::EventPortDef_out::operator ::CORBA::ComponentIR::EventPortDef_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::IR::EventDef_ptr &
-IR::EventDef_out::ptr (void)
+::CORBA::ComponentIR::EventPortDef_ptr &
+CORBA::ComponentIR::EventPortDef_out::ptr (void)
 {
   return this->ptr_;
 }
 
-::IR::EventDef_ptr
-IR::EventDef_out::operator-> (void)
+::CORBA::ComponentIR::EventPortDef_ptr
+CORBA::ComponentIR::EventPortDef_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_EventDef_is_a : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_EventDef_is_a (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * event_id
+      CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
@@ -7201,31 +7406,115 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::CORBA::Boolean result);
+    void result (::CORBA::ComponentIR::EventDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_EventDef_is_a (const TAO_ClientRequestInfo_IR_EventDef_is_a &);
-    void operator= (const TAO_ClientRequestInfo_IR_EventDef_is_a &);
-    const char * event_id_;
+    TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get &);
     
-    ::CORBA::Boolean _result;
+    ::CORBA::ComponentIR::EventDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_EventDef_is_a::TAO_ClientRequestInfo_IR_EventDef_is_a (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
+void 
+TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::result (::CORBA::ComponentIR::EventDef_ptr result)
+{
+  // Update the result. 
+  this->_result = result;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const char * event_id
+      CORBA::ComponentIR::EventDef_ptr event
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set (const TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set &);
+    CORBA::ComponentIR::EventDef_ptr event_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      CORBA::ComponentIR::EventDef_ptr event
       ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      event_id_ (event_id)
+      event_ (event)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -7237,7 +7526,7 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
   
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<= event_id_;
+  (*parameter_list)[len].argument <<=  this->event_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -7245,7 +7534,7 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -7257,37 +7546,30 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_EventDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
+  CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
+  return result_any;
 }
 
-void 
-TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Boolean result)
-{
-  // Update the result. 
-  this->_result = result;
-}
+
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_EventDef_event_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_EventDef_event_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
+      CORBA::Object_ptr _tao_target,
+      const char * event_id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
@@ -7299,28 +7581,31 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::CORBA::ValueDef_ptr result);
+    void result (::CORBA::Boolean result);
     
   private:
-    TAO_ClientRequestInfo_IR_EventDef_event_get (const TAO_ClientRequestInfo_IR_EventDef_event_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_EventDef_event_get &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a (const TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a &);
+    const char * event_id_;
     
-    ::CORBA::ValueDef_ptr _result;
+    ::CORBA::Boolean _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_EventDef_event_get::TAO_ClientRequestInfo_IR_EventDef_event_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
+      CORBA::Object_ptr _tao_target,
+      const char * event_id
       ACE_ENV_ARG_DECL_NOT_USED      
     )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      event_id_ (event_id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -7328,11 +7613,19 @@ TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  return parameter_list;
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<= event_id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -7344,7 +7637,7 @@ TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (ACE_ENV_SINGLE_ARG_DECL
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_EventDef_event_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -7355,12 +7648,12 @@ TAO_ClientRequestInfo_IR_EventDef_event_get::result (ACE_ENV_SINGLE_ARG_DECL)
   
   CORBA::Any_var safe_result_any = result_any;
   
-  (*result_any) <<= this->_result;
+  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
 void 
-TAO_ClientRequestInfo_IR_EventDef_event_get::result (::CORBA::ValueDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::result (CORBA::Boolean result)
 {
   // Update the result. 
   this->_result = result;
@@ -7369,44 +7662,243 @@ TAO_ClientRequestInfo_IR_EventDef_event_get::result (::CORBA::ValueDef_ptr resul
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
 
-IR::_TAO_EventDef_Proxy_Impl::_TAO_EventDef_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_EventPortDef_Proxy_Impl::_TAO_EventPortDef_Proxy_Impl (void)
 {}
 
-IR::_TAO_EventDef_Remote_Proxy_Impl::_TAO_EventDef_Remote_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::_TAO_EventPortDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+::CORBA::ComponentIR::EventDef_ptr CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::event (
+    CORBA::Object *_collocated_tao_target_
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::ComponentIR::EventDef_var _tao_retval (CORBA::ComponentIR::EventDef::_nil ());
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+    
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "_get_event",
+      10,
+      0,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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 ());
+
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::EventDef_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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
+void CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::event (
     CORBA::Object *_collocated_tao_target_,
-    const char * event_id
+    CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
+      ACE_THROW (CORBA::INTERNAL ());
     }
     
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "is_a",
-      4,
+      "_set_event",
+      10,
       1,
       istub->orb_core ()
     );
@@ -7427,13 +7919,13 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_EventDef_is_a _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
-          event_id
+          event
           ACE_ENV_ARG_PARAMETER
         );
-      ACE_CHECK_RETURN (_tao_retval);
+      ACE_CHECK;
       
 #endif /* TAO_HAS_INTERCEPTORS */
       
@@ -7453,94 +7945,66 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
           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);
+          
+          _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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << event)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << event_id)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      _tao_retval
-                    );
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-                  
-                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-                  
-                  if (!(
-                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Boolean _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -7551,7 +8015,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -7575,7 +8039,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -7585,48 +8049,49 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
       
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval);
+      ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval);
+      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 */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::CORBA::ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
-    CORBA::Object *_collocated_tao_target_
+CORBA::Boolean CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::is_a (
+    CORBA::Object *_collocated_tao_target_,
+    const char * event_id
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  CORBA::ValueDef_var _tao_retval (CORBA::ValueDef::_nil ());
+  CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
     
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "_get_event",
-      10,
-      0,
+      "is_a",
+      4,
+      1,
       istub->orb_core ()
     );
   
@@ -7646,12 +8111,13 @@ return _tao_retval;
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_EventDef_event_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a _tao_ri (
           &_tao_call,
-          _collocated_tao_target_
+          _collocated_tao_target_,
+          event_id
           ACE_ENV_ARG_PARAMETER
         );
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK_RETURN (_tao_retval);
       
 #endif /* TAO_HAS_INTERCEPTORS */
       
@@ -7671,82 +8137,86 @@ return _tao_retval;
           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.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << event_id)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  _tao_retval
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ValueDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::Boolean _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -7757,7 +8227,7 @@ return _tao_retval;
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -7781,7 +8251,7 @@ return _tao_retval;
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -7791,22 +8261,24 @@ return _tao_retval;
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
       
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK_RETURN (_tao_retval);
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK_RETURN (_tao_retval);
+      
+      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 */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval;
 }
 
 //
@@ -7814,43 +8286,43 @@ return _tao_retval._retn ();
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
 //
 
-IR::_TAO_EventDef_Proxy_Broker::_TAO_EventDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_EventPortDef_Proxy_Broker::_TAO_EventPortDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_EventDef_Proxy_Broker::~_TAO_EventDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_EventPortDef_Proxy_Broker::~_TAO_EventPortDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_EventDef_Proxy_Broker * (*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_EventPortDef_Proxy_Broker * (*CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-IR::_TAO_EventDef_Remote_Proxy_Broker *
-IR::_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Broker::the_TAO_EventPortDef_Remote_Proxy_Broker (void)
 {
-  static ::IR::_TAO_EventDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-IR::_TAO_EventDef_Remote_Proxy_Broker::_TAO_EventDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Broker::_TAO_EventPortDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_EventDef_Remote_Proxy_Broker::~_TAO_EventDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Broker::~_TAO_EventPortDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_EventDef_Proxy_Impl&
-IR::_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
-    ::IR::EventDef *
+CORBA::ComponentIR::_TAO_EventPortDef_Proxy_Impl&
+CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::EventPortDef *
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -7862,74 +8334,74 @@ IR::_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
-IR::EventDef::EventDef (int collocated)
+CORBA::ComponentIR::EventPortDef::EventPortDef (int collocated)
 {
-  this->IR_EventDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_EventPortDef_setup_collocation (collocated);
 }
 
 void
-IR::EventDef::IR_EventDef_setup_collocation (int collocated)
+CORBA::ComponentIR::EventPortDef::CORBA_ComponentIR_EventPortDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_EventDef_Proxy_Broker_ =
-      ::IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_EventPortDef_Proxy_Broker_ =
+      ::CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_EventDef_Proxy_Broker_ =
-      ::IR::_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker ();
+    this->the_TAO_EventPortDef_Proxy_Broker_ =
+      ::CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Broker::the_TAO_EventPortDef_Remote_Proxy_Broker ();
   
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-IR::EventDef::~EventDef (void)
+CORBA::ComponentIR::EventPortDef::~EventPortDef (void)
 {}
 
 void 
-IR::EventDef::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ComponentIR::EventPortDef::_tao_any_destructor (void *_tao_void_pointer)
 {
-  EventDef *tmp = ACE_static_cast (EventDef *, _tao_void_pointer);
+  EventPortDef *tmp = ACE_static_cast (EventPortDef *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IR::EventDef_ptr
-IR::EventDef::_narrow (
+CORBA::ComponentIR::EventPortDef_ptr
+CORBA::ComponentIR::EventPortDef::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     {
-      return EventDef::_nil ();
+      return EventPortDef::_nil ();
     }
   
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
         obj->_is_a (
-            "IDL:omg.org/IR/EventDef:1.0"
+            "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
             ACE_ENV_ARG_PARAMETER
           );
-      ACE_CHECK_RETURN (EventDef::_nil ());
+      ACE_CHECK_RETURN (EventPortDef::_nil ());
       
       if (is_a == 0)
         {
-          return EventDef::_nil ();
+          return EventPortDef::_nil ();
         }
     }
   
-  return EventDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+  return EventPortDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IR::EventDef_ptr 
-IR::EventDef::_unchecked_narrow (
+CORBA::ComponentIR::EventPortDef_ptr 
+CORBA::ComponentIR::EventPortDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
     {
-      return EventDef::_nil ();
+      return EventPortDef::_nil ();
     }
   
   if (! obj->_is_local ())
@@ -7941,23 +8413,23 @@ IR::EventDef::_unchecked_narrow (
           stub->_incr_refcnt ();
         }
       
-      EventDef_ptr default_proxy = EventDef::_nil ();
+      EventPortDef_ptr default_proxy = EventPortDef::_nil ();
       
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&
-          IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer != 0
+          CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer != 0
         )
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::EventDef (
+              ::CORBA::ComponentIR::EventPortDef (
                   stub,
                   1,
                   obj->_servant ()
                 ),
-              EventDef::_nil ()
+              EventPortDef::_nil ()
             );
         }
       
@@ -7965,12 +8437,12 @@ IR::EventDef::_unchecked_narrow (
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::EventDef (
+              ::CORBA::ComponentIR::EventPortDef (
                   stub,
                   0,
                   obj->_servant ()
                 ),
-              EventDef::_nil ()
+              EventPortDef::_nil ()
             );
         }
       
@@ -7979,18 +8451,18 @@ IR::EventDef::_unchecked_narrow (
   else 
     return
       ACE_reinterpret_cast (
-          EventDef_ptr,
+          EventPortDef_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
                   ptr_arith_t,
-                  &EventDef::_tao_class_id
+                  &EventPortDef::_tao_class_id
                 )
             )
         );
 }
 
-IR::EventDef_ptr
-IR::EventDef::_duplicate (EventDef_ptr obj)
+CORBA::ComponentIR::EventPortDef_ptr
+CORBA::ComponentIR::EventPortDef::_duplicate (EventPortDef_ptr obj)
 {
   if (! CORBA::is_nil (obj))
     {
@@ -8001,7 +8473,7 @@ IR::EventDef::_duplicate (EventDef_ptr obj)
 }
 
 CORBA::Boolean
-IR::EventDef::_is_a (
+CORBA::ComponentIR::EventPortDef::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
   )
@@ -8009,7 +8481,7 @@ IR::EventDef::_is_a (
   if (
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/EventDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
@@ -8036,13 +8508,13 @@ IR::EventDef::_is_a (
     }
 }
 
-void *IR::EventDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::ComponentIR::EventPortDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, EventDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, EventPortDef)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
@@ -8095,401 +8567,436 @@ void *IR::EventDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* IR::EventDef::_interface_repository_id (void) const
+const char* CORBA::ComponentIR::EventPortDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/IR/EventDef:1.0";
+  return "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-CORBA::Boolean IR::EventDef::is_a (
-    const char * event_id
-    ACE_ENV_ARG_DECL
+::CORBA::ComponentIR::EventDef_ptr CORBA::ComponentIR::EventPortDef::event (
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_EventDef_Proxy_Impl &proxy = 
-    this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  _TAO_EventPortDef_Proxy_Impl &proxy = 
+    this->the_TAO_EventPortDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  return proxy.is_a (
+  return proxy.event (
+      this
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+void CORBA::ComponentIR::EventPortDef::event (
+    CORBA::ComponentIR::EventDef_ptr event
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_EventPortDef_Proxy_Impl &proxy = 
+    this->the_TAO_EventPortDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  proxy.event (
       this,
-      event_id
+      event
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::CORBA::ValueDef_ptr IR::EventDef::event (
-    ACE_ENV_SINGLE_ARG_DECL
+CORBA::Boolean CORBA::ComponentIR::EventPortDef::is_a (
+    const char * event_id
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_EventDef_Proxy_Impl &proxy = 
-    this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  _TAO_EventPortDef_Proxy_Impl &proxy = 
+    this->the_TAO_EventPortDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  return proxy.event (
-      this
+  return proxy.is_a (
+      this,
+      event_id
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_EventDef[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  28,
+  47,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f45), 
-  ACE_NTOHL (0x76656e74), 
-  ACE_NTOHL (0x4465663a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EventDef:1.0
-  9,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4576), 
+  ACE_NTOHL (0x656e7450), 
+  ACE_NTOHL (0x6f727444), 
+  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0
+    13,
   ACE_NTOHL (0x4576656e), 
+  ACE_NTOHL (0x74506f72), 
   ACE_NTOHL (0x74446566), 
-  ACE_NTOHL (0x0),  // name = EventDef
-};
+  ACE_NTOHL (0x0),  // name = EventPortDef
+  };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_EventDef (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_EventPortDef (
     CORBA::tk_objref,
-    sizeof (_oc_IR_EventDef),
-    (char *) &_oc_IR_EventDef,
+    sizeof (_oc_CORBA_ComponentIR_EventPortDef),
+    (char *) &_oc_CORBA_ComponentIR_EventPortDef,
     0,
-    sizeof (IR::EventDef)
+    sizeof (CORBA::ComponentIR::EventPortDef)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
-    _tc_EventDef,
-    &_tc_TAO_tc_IR_EventDef
+    _tc_EventPortDef,
+    &_tc_TAO_tc_CORBA_ComponentIR_EventPortDef
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_EventDescription[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
+  55,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f45), 
-  ACE_NTOHL (0x76656e74), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EventDescription:1.0
-  17,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4576), 
+  ACE_NTOHL (0x656e7450), 
+  ACE_NTOHL (0x6f727444), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0
+    21,
   ACE_NTOHL (0x4576656e), 
+  ACE_NTOHL (0x74506f72), 
   ACE_NTOHL (0x74446573), 
   ACE_NTOHL (0x63726970), 
   ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = EventDescription
+  ACE_NTOHL (0x0),  // name = EventPortDescription
   5, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
+    33,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f49), 
-    ACE_NTOHL (0x64656e74), 
-    ACE_NTOHL (0x69666965), 
-    ACE_NTOHL (0x723a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
-    11,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
+    35,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
-    13,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+        13,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x64656669), 
   ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
-  0xffffffa0, // negative offset (-96)
+    0xffffffff, // indirection
+  0xffffff9c, // negative offset (-100)
   8,
   ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
+    34,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f56), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5370), 
-    ACE_NTOHL (0x65633a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
-    12,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+        12,
     ACE_NTOHL (0x56657273), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   6,
-  ACE_NTOHL (0x76616c75), 
-  ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_objref, // typecode kind
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5661), 
-    ACE_NTOHL (0x6c756544), 
-    ACE_NTOHL (0x65663a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-    9,
-    ACE_NTOHL (0x56616c75), 
-    ACE_NTOHL (0x65446566), 
-    ACE_NTOHL (0x0),  // name = ValueDef
-
+  ACE_NTOHL (0x6576656e), 
+  ACE_NTOHL (0x74000000),  // name = event
+    0xffffffff, // indirection
+  0xffffff30, // negative offset (-208)
 };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_EventDescription (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_EventPortDescription (
     CORBA::tk_struct,
-    sizeof (_oc_IR_EventDescription),
-    (char *) &_oc_IR_EventDescription,
+    sizeof (_oc_CORBA_ComponentIR_EventPortDescription),
+    (char *) &_oc_CORBA_ComponentIR_EventPortDescription,
     0,
-    sizeof (IR::EventDescription)
+    sizeof (CORBA::ComponentIR::EventPortDescription)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
-    _tc_EventDescription,
-    &_tc_TAO_tc_IR_EventDescription
+    _tc_EventPortDescription,
+    &_tc_TAO_tc_CORBA_ComponentIR_EventPortDescription
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void IR::EventDescription::_tao_any_destructor (void *_tao_void_pointer)
+void CORBA::ComponentIR::EventPortDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  EventDescription *tmp = ACE_static_cast (EventDescription*, _tao_void_pointer);
+  EventPortDescription *tmp = ACE_static_cast (EventPortDescription*, _tao_void_pointer);
   delete tmp;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-int IR::EmitsDef::_tao_class_id = 0;
+int CORBA::ComponentIR::EmitsDef::_tao_class_id = 0;
 
-IR::EmitsDef_ptr
-tao_IR_EmitsDef_duplicate (
-    IR::EmitsDef_ptr p
+CORBA::ComponentIR::EmitsDef_ptr
+tao_CORBA_ComponentIR_EmitsDef_duplicate (
+    CORBA::ComponentIR::EmitsDef_ptr p
   )
 {
-  return IR::EmitsDef::_duplicate (p);
+  return CORBA::ComponentIR::EmitsDef::_duplicate (p);
 }
 
 void
-tao_IR_EmitsDef_release (
-    IR::EmitsDef_ptr p
+tao_CORBA_ComponentIR_EmitsDef_release (
+    CORBA::ComponentIR::EmitsDef_ptr p
   )
 {
   CORBA::release (p);
 }
 
-IR::EmitsDef_ptr
-tao_IR_EmitsDef_nil (
+CORBA::ComponentIR::EmitsDef_ptr
+tao_CORBA_ComponentIR_EmitsDef_nil (
     void
   )
 {
-  return IR::EmitsDef::_nil ();
+  return CORBA::ComponentIR::EmitsDef::_nil ();
 }
 
-IR::EmitsDef_ptr
-tao_IR_EmitsDef_narrow (
+CORBA::ComponentIR::EmitsDef_ptr
+tao_CORBA_ComponentIR_EmitsDef_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return IR::EmitsDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::EmitsDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-tao_IR_EmitsDef_upcast (
+tao_CORBA_ComponentIR_EmitsDef_upcast (
     void *src
   )
 {
-  IR::EmitsDef **tmp =
-    ACE_static_cast (IR::EmitsDef **, src);
+  CORBA::ComponentIR::EmitsDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::EmitsDef **, src);
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ComponentIR_EmitsDef_marshal (
+    CORBA::ComponentIR::EmitsDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
-// IR::EmitsDef_var
+// CORBA::ComponentIR::EmitsDef_var
 // *************************************************************
 
-IR::EmitsDef_var::EmitsDef_var (void)
+CORBA::ComponentIR::EmitsDef_var::EmitsDef_var (void)
   : ptr_ (EmitsDef::_nil ())
 {}
 
-::IR::EmitsDef_ptr
-IR::EmitsDef_var::ptr (void) const
+::CORBA::ComponentIR::EmitsDef_ptr
+CORBA::ComponentIR::EmitsDef_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-IR::EmitsDef_var::EmitsDef_var (const ::IR::EmitsDef_var &p)
+CORBA::ComponentIR::EmitsDef_var::EmitsDef_var (const ::CORBA::ComponentIR::EmitsDef_var &p)
   : TAO_Base_var (),
     ptr_ (EmitsDef::_duplicate (p.ptr ()))
 {}
 
-IR::EmitsDef_var::~EmitsDef_var (void)
+CORBA::ComponentIR::EmitsDef_var::~EmitsDef_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
-IR::EmitsDef_var &
-IR::EmitsDef_var::operator= (EmitsDef_ptr p)
+CORBA::ComponentIR::EmitsDef_var &
+CORBA::ComponentIR::EmitsDef_var::operator= (EmitsDef_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-IR::EmitsDef_var &
-IR::EmitsDef_var::operator= (const ::IR::EmitsDef_var &p)
+CORBA::ComponentIR::EmitsDef_var &
+CORBA::ComponentIR::EmitsDef_var::operator= (const ::CORBA::ComponentIR::EmitsDef_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::EmitsDef::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::ComponentIR::EmitsDef::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-IR::EmitsDef_var::operator const ::IR::EmitsDef_ptr &() const // cast
+CORBA::ComponentIR::EmitsDef_var::operator const ::CORBA::ComponentIR::EmitsDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-IR::EmitsDef_var::operator ::IR::EmitsDef_ptr &() // cast 
+CORBA::ComponentIR::EmitsDef_var::operator ::CORBA::ComponentIR::EmitsDef_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::IR::EmitsDef_ptr
-IR::EmitsDef_var::operator-> (void) const
+::CORBA::ComponentIR::EmitsDef_ptr
+CORBA::ComponentIR::EmitsDef_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::IR::EmitsDef_ptr
-IR::EmitsDef_var::in (void) const
+::CORBA::ComponentIR::EmitsDef_ptr
+CORBA::ComponentIR::EmitsDef_var::in (void) const
 {
   return this->ptr_;
 }
 
-::IR::EmitsDef_ptr &
-IR::EmitsDef_var::inout (void)
+::CORBA::ComponentIR::EmitsDef_ptr &
+CORBA::ComponentIR::EmitsDef_var::inout (void)
 {
   return this->ptr_;
 }
 
-::IR::EmitsDef_ptr &
-IR::EmitsDef_var::out (void)
+::CORBA::ComponentIR::EmitsDef_ptr &
+CORBA::ComponentIR::EmitsDef_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::EmitsDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::EmitsDef::_nil ();
   return this->ptr_;
 }
 
-::IR::EmitsDef_ptr
-IR::EmitsDef_var::_retn (void)
+::CORBA::ComponentIR::EmitsDef_ptr
+CORBA::ComponentIR::EmitsDef_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::IR::EmitsDef_ptr val = this->ptr_;
-  this->ptr_ = ::IR::EmitsDef::_nil ();
+  ::CORBA::ComponentIR::EmitsDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::EmitsDef::_nil ();
   return val;
 }
 
-::IR::EmitsDef_ptr
-IR::EmitsDef_var::tao_duplicate (EmitsDef_ptr p)
+::CORBA::ComponentIR::EmitsDef_ptr
+CORBA::ComponentIR::EmitsDef_var::tao_duplicate (EmitsDef_ptr p)
 {
-  return ::IR::EmitsDef::_duplicate (p);
+  return ::CORBA::ComponentIR::EmitsDef::_duplicate (p);
 }
 
 void
-IR::EmitsDef_var::tao_release (EmitsDef_ptr p)
+CORBA::ComponentIR::EmitsDef_var::tao_release (EmitsDef_ptr p)
 {
   CORBA::release (p);
 }
 
-::IR::EmitsDef_ptr
-IR::EmitsDef_var::tao_nil (void)
+::CORBA::ComponentIR::EmitsDef_ptr
+CORBA::ComponentIR::EmitsDef_var::tao_nil (void)
 {
-  return ::IR::EmitsDef::_nil ();
+  return ::CORBA::ComponentIR::EmitsDef::_nil ();
 }
 
-::IR::EmitsDef_ptr
-IR::EmitsDef_var::tao_narrow (
+::CORBA::ComponentIR::EmitsDef_ptr
+CORBA::ComponentIR::EmitsDef_var::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::EmitsDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::CORBA::ComponentIR::EmitsDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IR::EmitsDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::EmitsDef_var::tao_upcast (void *src)
 {
   EmitsDef **tmp =
     ACE_static_cast (EmitsDef **, src);
@@ -8497,85 +9004,85 @@ IR::EmitsDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
-// IR::EmitsDef_out
+// CORBA::ComponentIR::EmitsDef_out
 // *************************************************************
 
-IR::EmitsDef_out::EmitsDef_out (EmitsDef_ptr &p)
+CORBA::ComponentIR::EmitsDef_out::EmitsDef_out (EmitsDef_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::IR::EmitsDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::EmitsDef::_nil ();
 }
 
-IR::EmitsDef_out::EmitsDef_out (EmitsDef_var &p)
+CORBA::ComponentIR::EmitsDef_out::EmitsDef_out (EmitsDef_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::EmitsDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::EmitsDef::_nil ();
 }
 
-IR::EmitsDef_out::EmitsDef_out (const ::IR::EmitsDef_out &p)
+CORBA::ComponentIR::EmitsDef_out::EmitsDef_out (const ::CORBA::ComponentIR::EmitsDef_out &p)
   : ptr_ (ACE_const_cast (EmitsDef_out &, p).ptr_)
 {}
 
-::IR::EmitsDef_out &
-IR::EmitsDef_out::operator= (const ::IR::EmitsDef_out &p)
+::CORBA::ComponentIR::EmitsDef_out &
+CORBA::ComponentIR::EmitsDef_out::operator= (const ::CORBA::ComponentIR::EmitsDef_out &p)
 {
   this->ptr_ = ACE_const_cast (EmitsDef_out&, p).ptr_;
   return *this;
 }
 
-IR::EmitsDef_out &
-IR::EmitsDef_out::operator= (const ::IR::EmitsDef_var &p)
+CORBA::ComponentIR::EmitsDef_out &
+CORBA::ComponentIR::EmitsDef_out::operator= (const ::CORBA::ComponentIR::EmitsDef_var &p)
 {
-  this->ptr_ = ::IR::EmitsDef::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::ComponentIR::EmitsDef::_duplicate (p.ptr ());
   return *this;
 }
 
-IR::EmitsDef_out &
-IR::EmitsDef_out::operator= (EmitsDef_ptr p)
+CORBA::ComponentIR::EmitsDef_out &
+CORBA::ComponentIR::EmitsDef_out::operator= (EmitsDef_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-IR::EmitsDef_out::operator ::IR::EmitsDef_ptr &() // cast
+CORBA::ComponentIR::EmitsDef_out::operator ::CORBA::ComponentIR::EmitsDef_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::IR::EmitsDef_ptr &
-IR::EmitsDef_out::ptr (void)
+::CORBA::ComponentIR::EmitsDef_ptr &
+CORBA::ComponentIR::EmitsDef_out::ptr (void)
 {
   return this->ptr_;
 }
 
-::IR::EmitsDef_ptr
-IR::EmitsDef_out::operator-> (void)
+::CORBA::ComponentIR::EmitsDef_ptr
+CORBA::ComponentIR::EmitsDef_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
 
-IR::_TAO_EmitsDef_Proxy_Impl::_TAO_EmitsDef_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_EmitsDef_Proxy_Impl::_TAO_EmitsDef_Proxy_Impl (void)
 {}
 
-IR::_TAO_EmitsDef_Remote_Proxy_Impl::_TAO_EmitsDef_Remote_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_EmitsDef_Remote_Proxy_Impl::_TAO_EmitsDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
@@ -8585,43 +9092,43 @@ IR::_TAO_EmitsDef_Remote_Proxy_Impl::_TAO_EmitsDef_Remote_Proxy_Impl (void)
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
 //
 
-IR::_TAO_EmitsDef_Proxy_Broker::_TAO_EmitsDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_EmitsDef_Proxy_Broker::_TAO_EmitsDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_EmitsDef_Proxy_Broker::~_TAO_EmitsDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_EmitsDef_Proxy_Broker::~_TAO_EmitsDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_EmitsDef_Proxy_Broker * (*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_EmitsDef_Proxy_Broker * (*CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-IR::_TAO_EmitsDef_Remote_Proxy_Broker *
-IR::_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_EmitsDef_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker (void)
 {
-  static ::IR::_TAO_EmitsDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::CORBA::ComponentIR::_TAO_EmitsDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-IR::_TAO_EmitsDef_Remote_Proxy_Broker::_TAO_EmitsDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_EmitsDef_Remote_Proxy_Broker::_TAO_EmitsDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_EmitsDef_Remote_Proxy_Broker::~_TAO_EmitsDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_EmitsDef_Remote_Proxy_Broker::~_TAO_EmitsDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_EmitsDef_Proxy_Impl&
-IR::_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
-    ::IR::EmitsDef *
+CORBA::ComponentIR::_TAO_EmitsDef_Proxy_Impl&
+CORBA::ComponentIR::_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::EmitsDef *
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -8633,38 +9140,38 @@ IR::_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
-IR::EmitsDef::EmitsDef (int collocated)
+CORBA::ComponentIR::EmitsDef::EmitsDef (int collocated)
 {
-  this->IR_EmitsDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_EmitsDef_setup_collocation (collocated);
 }
 
 void
-IR::EmitsDef::IR_EmitsDef_setup_collocation (int collocated)
+CORBA::ComponentIR::EmitsDef::CORBA_ComponentIR_EmitsDef_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_EmitsDef_Proxy_Broker_ =
-      ::IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this);
+      ::CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_EmitsDef_Proxy_Broker_ =
-      ::IR::_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker ();
+      ::CORBA::ComponentIR::_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker ();
   
-  this->IR_EventDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_EventPortDef_setup_collocation (collocated);
 }
 
-IR::EmitsDef::~EmitsDef (void)
+CORBA::ComponentIR::EmitsDef::~EmitsDef (void)
 {}
 
 void 
-IR::EmitsDef::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ComponentIR::EmitsDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EmitsDef *tmp = ACE_static_cast (EmitsDef *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IR::EmitsDef_ptr
-IR::EmitsDef::_narrow (
+CORBA::ComponentIR::EmitsDef_ptr
+CORBA::ComponentIR::EmitsDef::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -8678,7 +9185,7 @@ IR::EmitsDef::_narrow (
     {
       CORBA::Boolean is_a =
         obj->_is_a (
-            "IDL:omg.org/IR/EmitsDef:1.0"
+            "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0"
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (EmitsDef::_nil ());
@@ -8692,8 +9199,8 @@ IR::EmitsDef::_narrow (
   return EmitsDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IR::EmitsDef_ptr 
-IR::EmitsDef::_unchecked_narrow (
+CORBA::ComponentIR::EmitsDef_ptr 
+CORBA::ComponentIR::EmitsDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -8718,12 +9225,12 @@ IR::EmitsDef::_unchecked_narrow (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&
-          IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer != 0
+          CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer != 0
         )
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::EmitsDef (
+              ::CORBA::ComponentIR::EmitsDef (
                   stub,
                   1,
                   obj->_servant ()
@@ -8736,7 +9243,7 @@ IR::EmitsDef::_unchecked_narrow (
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::EmitsDef (
+              ::CORBA::ComponentIR::EmitsDef (
                   stub,
                   0,
                   obj->_servant ()
@@ -8760,8 +9267,8 @@ IR::EmitsDef::_unchecked_narrow (
         );
 }
 
-IR::EmitsDef_ptr
-IR::EmitsDef::_duplicate (EmitsDef_ptr obj)
+CORBA::ComponentIR::EmitsDef_ptr
+CORBA::ComponentIR::EmitsDef::_duplicate (EmitsDef_ptr obj)
 {
   if (! CORBA::is_nil (obj))
     {
@@ -8772,7 +9279,7 @@ IR::EmitsDef::_duplicate (EmitsDef_ptr obj)
 }
 
 CORBA::Boolean
-IR::EmitsDef::_is_a (
+CORBA::ComponentIR::EmitsDef::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
   )
@@ -8780,11 +9287,11 @@ IR::EmitsDef::_is_a (
   if (
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/EmitsDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/EventDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
@@ -8811,27 +9318,27 @@ IR::EmitsDef::_is_a (
     }
 }
 
-void *IR::EmitsDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::ComponentIR::EmitsDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, EmitsDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, EmitsDef)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, EventDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, EventPortDef)::_tao_class_id)
             )
     {
       retv =
         ACE_reinterpret_cast (
             void *,
             ACE_static_cast (
-                IR::EventDef_ptr,
+                CORBA::ComponentIR::EventPortDef_ptr,
                 this
               )
           );
@@ -8884,216 +9391,231 @@ void *IR::EmitsDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* IR::EmitsDef::_interface_repository_id (void) const
+const char* CORBA::ComponentIR::EmitsDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/IR/EmitsDef:1.0";
+  return "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_EmitsDef[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_EmitsDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  28,
+  43,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f45), 
-  ACE_NTOHL (0x6d697473), 
-  ACE_NTOHL (0x4465663a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EmitsDef:1.0
-  9,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f456d), 
+  ACE_NTOHL (0x69747344), 
+  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0
+    9,
   ACE_NTOHL (0x456d6974), 
   ACE_NTOHL (0x73446566), 
   ACE_NTOHL (0x0),  // name = EmitsDef
-};
+  };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_EmitsDef (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_EmitsDef (
     CORBA::tk_objref,
-    sizeof (_oc_IR_EmitsDef),
-    (char *) &_oc_IR_EmitsDef,
+    sizeof (_oc_CORBA_ComponentIR_EmitsDef),
+    (char *) &_oc_CORBA_ComponentIR_EmitsDef,
     0,
-    sizeof (IR::EmitsDef)
+    sizeof (CORBA::ComponentIR::EmitsDef)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
     _tc_EmitsDef,
-    &_tc_TAO_tc_IR_EmitsDef
+    &_tc_TAO_tc_CORBA_ComponentIR_EmitsDef
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-int IR::PublishesDef::_tao_class_id = 0;
+int CORBA::ComponentIR::PublishesDef::_tao_class_id = 0;
 
-IR::PublishesDef_ptr
-tao_IR_PublishesDef_duplicate (
-    IR::PublishesDef_ptr p
+CORBA::ComponentIR::PublishesDef_ptr
+tao_CORBA_ComponentIR_PublishesDef_duplicate (
+    CORBA::ComponentIR::PublishesDef_ptr p
   )
 {
-  return IR::PublishesDef::_duplicate (p);
+  return CORBA::ComponentIR::PublishesDef::_duplicate (p);
 }
 
 void
-tao_IR_PublishesDef_release (
-    IR::PublishesDef_ptr p
+tao_CORBA_ComponentIR_PublishesDef_release (
+    CORBA::ComponentIR::PublishesDef_ptr p
   )
 {
   CORBA::release (p);
 }
 
-IR::PublishesDef_ptr
-tao_IR_PublishesDef_nil (
+CORBA::ComponentIR::PublishesDef_ptr
+tao_CORBA_ComponentIR_PublishesDef_nil (
     void
   )
 {
-  return IR::PublishesDef::_nil ();
+  return CORBA::ComponentIR::PublishesDef::_nil ();
 }
 
-IR::PublishesDef_ptr
-tao_IR_PublishesDef_narrow (
+CORBA::ComponentIR::PublishesDef_ptr
+tao_CORBA_ComponentIR_PublishesDef_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return IR::PublishesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::PublishesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-tao_IR_PublishesDef_upcast (
+tao_CORBA_ComponentIR_PublishesDef_upcast (
     void *src
   )
 {
-  IR::PublishesDef **tmp =
-    ACE_static_cast (IR::PublishesDef **, src);
+  CORBA::ComponentIR::PublishesDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::PublishesDef **, src);
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ComponentIR_PublishesDef_marshal (
+    CORBA::ComponentIR::PublishesDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
-// IR::PublishesDef_var
+// CORBA::ComponentIR::PublishesDef_var
 // *************************************************************
 
-IR::PublishesDef_var::PublishesDef_var (void)
+CORBA::ComponentIR::PublishesDef_var::PublishesDef_var (void)
   : ptr_ (PublishesDef::_nil ())
 {}
 
-::IR::PublishesDef_ptr
-IR::PublishesDef_var::ptr (void) const
+::CORBA::ComponentIR::PublishesDef_ptr
+CORBA::ComponentIR::PublishesDef_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-IR::PublishesDef_var::PublishesDef_var (const ::IR::PublishesDef_var &p)
+CORBA::ComponentIR::PublishesDef_var::PublishesDef_var (const ::CORBA::ComponentIR::PublishesDef_var &p)
   : TAO_Base_var (),
     ptr_ (PublishesDef::_duplicate (p.ptr ()))
 {}
 
-IR::PublishesDef_var::~PublishesDef_var (void)
+CORBA::ComponentIR::PublishesDef_var::~PublishesDef_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
-IR::PublishesDef_var &
-IR::PublishesDef_var::operator= (PublishesDef_ptr p)
+CORBA::ComponentIR::PublishesDef_var &
+CORBA::ComponentIR::PublishesDef_var::operator= (PublishesDef_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-IR::PublishesDef_var &
-IR::PublishesDef_var::operator= (const ::IR::PublishesDef_var &p)
+CORBA::ComponentIR::PublishesDef_var &
+CORBA::ComponentIR::PublishesDef_var::operator= (const ::CORBA::ComponentIR::PublishesDef_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::PublishesDef::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::ComponentIR::PublishesDef::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-IR::PublishesDef_var::operator const ::IR::PublishesDef_ptr &() const // cast
+CORBA::ComponentIR::PublishesDef_var::operator const ::CORBA::ComponentIR::PublishesDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-IR::PublishesDef_var::operator ::IR::PublishesDef_ptr &() // cast 
+CORBA::ComponentIR::PublishesDef_var::operator ::CORBA::ComponentIR::PublishesDef_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::IR::PublishesDef_ptr
-IR::PublishesDef_var::operator-> (void) const
+::CORBA::ComponentIR::PublishesDef_ptr
+CORBA::ComponentIR::PublishesDef_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::IR::PublishesDef_ptr
-IR::PublishesDef_var::in (void) const
+::CORBA::ComponentIR::PublishesDef_ptr
+CORBA::ComponentIR::PublishesDef_var::in (void) const
 {
   return this->ptr_;
 }
 
-::IR::PublishesDef_ptr &
-IR::PublishesDef_var::inout (void)
+::CORBA::ComponentIR::PublishesDef_ptr &
+CORBA::ComponentIR::PublishesDef_var::inout (void)
 {
   return this->ptr_;
 }
 
-::IR::PublishesDef_ptr &
-IR::PublishesDef_var::out (void)
+::CORBA::ComponentIR::PublishesDef_ptr &
+CORBA::ComponentIR::PublishesDef_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::PublishesDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::PublishesDef::_nil ();
   return this->ptr_;
 }
 
-::IR::PublishesDef_ptr
-IR::PublishesDef_var::_retn (void)
+::CORBA::ComponentIR::PublishesDef_ptr
+CORBA::ComponentIR::PublishesDef_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::IR::PublishesDef_ptr val = this->ptr_;
-  this->ptr_ = ::IR::PublishesDef::_nil ();
+  ::CORBA::ComponentIR::PublishesDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::PublishesDef::_nil ();
   return val;
 }
 
-::IR::PublishesDef_ptr
-IR::PublishesDef_var::tao_duplicate (PublishesDef_ptr p)
+::CORBA::ComponentIR::PublishesDef_ptr
+CORBA::ComponentIR::PublishesDef_var::tao_duplicate (PublishesDef_ptr p)
 {
-  return ::IR::PublishesDef::_duplicate (p);
+  return ::CORBA::ComponentIR::PublishesDef::_duplicate (p);
 }
 
 void
-IR::PublishesDef_var::tao_release (PublishesDef_ptr p)
+CORBA::ComponentIR::PublishesDef_var::tao_release (PublishesDef_ptr p)
 {
   CORBA::release (p);
 }
 
-::IR::PublishesDef_ptr
-IR::PublishesDef_var::tao_nil (void)
+::CORBA::ComponentIR::PublishesDef_ptr
+CORBA::ComponentIR::PublishesDef_var::tao_nil (void)
 {
-  return ::IR::PublishesDef::_nil ();
+  return ::CORBA::ComponentIR::PublishesDef::_nil ();
 }
 
-::IR::PublishesDef_ptr
-IR::PublishesDef_var::tao_narrow (
+::CORBA::ComponentIR::PublishesDef_ptr
+CORBA::ComponentIR::PublishesDef_var::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::PublishesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::CORBA::ComponentIR::PublishesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IR::PublishesDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::PublishesDef_var::tao_upcast (void *src)
 {
   PublishesDef **tmp =
     ACE_static_cast (PublishesDef **, src);
@@ -9101,85 +9623,85 @@ IR::PublishesDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
-// IR::PublishesDef_out
+// CORBA::ComponentIR::PublishesDef_out
 // *************************************************************
 
-IR::PublishesDef_out::PublishesDef_out (PublishesDef_ptr &p)
+CORBA::ComponentIR::PublishesDef_out::PublishesDef_out (PublishesDef_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::IR::PublishesDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::PublishesDef::_nil ();
 }
 
-IR::PublishesDef_out::PublishesDef_out (PublishesDef_var &p)
+CORBA::ComponentIR::PublishesDef_out::PublishesDef_out (PublishesDef_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::PublishesDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::PublishesDef::_nil ();
 }
 
-IR::PublishesDef_out::PublishesDef_out (const ::IR::PublishesDef_out &p)
+CORBA::ComponentIR::PublishesDef_out::PublishesDef_out (const ::CORBA::ComponentIR::PublishesDef_out &p)
   : ptr_ (ACE_const_cast (PublishesDef_out &, p).ptr_)
 {}
 
-::IR::PublishesDef_out &
-IR::PublishesDef_out::operator= (const ::IR::PublishesDef_out &p)
+::CORBA::ComponentIR::PublishesDef_out &
+CORBA::ComponentIR::PublishesDef_out::operator= (const ::CORBA::ComponentIR::PublishesDef_out &p)
 {
   this->ptr_ = ACE_const_cast (PublishesDef_out&, p).ptr_;
   return *this;
 }
 
-IR::PublishesDef_out &
-IR::PublishesDef_out::operator= (const ::IR::PublishesDef_var &p)
+CORBA::ComponentIR::PublishesDef_out &
+CORBA::ComponentIR::PublishesDef_out::operator= (const ::CORBA::ComponentIR::PublishesDef_var &p)
 {
-  this->ptr_ = ::IR::PublishesDef::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::ComponentIR::PublishesDef::_duplicate (p.ptr ());
   return *this;
 }
 
-IR::PublishesDef_out &
-IR::PublishesDef_out::operator= (PublishesDef_ptr p)
+CORBA::ComponentIR::PublishesDef_out &
+CORBA::ComponentIR::PublishesDef_out::operator= (PublishesDef_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-IR::PublishesDef_out::operator ::IR::PublishesDef_ptr &() // cast
+CORBA::ComponentIR::PublishesDef_out::operator ::CORBA::ComponentIR::PublishesDef_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::IR::PublishesDef_ptr &
-IR::PublishesDef_out::ptr (void)
+::CORBA::ComponentIR::PublishesDef_ptr &
+CORBA::ComponentIR::PublishesDef_out::ptr (void)
 {
   return this->ptr_;
 }
 
-::IR::PublishesDef_ptr
-IR::PublishesDef_out::operator-> (void)
+::CORBA::ComponentIR::PublishesDef_ptr
+CORBA::ComponentIR::PublishesDef_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
 
-IR::_TAO_PublishesDef_Proxy_Impl::_TAO_PublishesDef_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_PublishesDef_Proxy_Impl::_TAO_PublishesDef_Proxy_Impl (void)
 {}
 
-IR::_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remote_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
@@ -9189,43 +9711,43 @@ IR::_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remote_Proxy_Impl (vo
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
 //
 
-IR::_TAO_PublishesDef_Proxy_Broker::_TAO_PublishesDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_PublishesDef_Proxy_Broker::_TAO_PublishesDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_PublishesDef_Proxy_Broker::~_TAO_PublishesDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_PublishesDef_Proxy_Broker::~_TAO_PublishesDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_PublishesDef_Proxy_Broker * (*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_PublishesDef_Proxy_Broker * (*CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-IR::_TAO_PublishesDef_Remote_Proxy_Broker *
-IR::_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_PublishesDef_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker (void)
 {
-  static ::IR::_TAO_PublishesDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::CORBA::ComponentIR::_TAO_PublishesDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-IR::_TAO_PublishesDef_Remote_Proxy_Broker::_TAO_PublishesDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_PublishesDef_Remote_Proxy_Broker::_TAO_PublishesDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_PublishesDef_Remote_Proxy_Broker::~_TAO_PublishesDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_PublishesDef_Remote_Proxy_Broker::~_TAO_PublishesDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_PublishesDef_Proxy_Impl&
-IR::_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
-    ::IR::PublishesDef *
+CORBA::ComponentIR::_TAO_PublishesDef_Proxy_Impl&
+CORBA::ComponentIR::_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::PublishesDef *
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -9237,38 +9759,38 @@ IR::_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
-IR::PublishesDef::PublishesDef (int collocated)
+CORBA::ComponentIR::PublishesDef::PublishesDef (int collocated)
 {
-  this->IR_PublishesDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_PublishesDef_setup_collocation (collocated);
 }
 
 void
-IR::PublishesDef::IR_PublishesDef_setup_collocation (int collocated)
+CORBA::ComponentIR::PublishesDef::CORBA_ComponentIR_PublishesDef_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_PublishesDef_Proxy_Broker_ =
-      ::IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer (this);
+      ::CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_PublishesDef_Proxy_Broker_ =
-      ::IR::_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker ();
+      ::CORBA::ComponentIR::_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker ();
   
-  this->IR_EventDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_EventPortDef_setup_collocation (collocated);
 }
 
-IR::PublishesDef::~PublishesDef (void)
+CORBA::ComponentIR::PublishesDef::~PublishesDef (void)
 {}
 
 void 
-IR::PublishesDef::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ComponentIR::PublishesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   PublishesDef *tmp = ACE_static_cast (PublishesDef *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IR::PublishesDef_ptr
-IR::PublishesDef::_narrow (
+CORBA::ComponentIR::PublishesDef_ptr
+CORBA::ComponentIR::PublishesDef::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -9282,7 +9804,7 @@ IR::PublishesDef::_narrow (
     {
       CORBA::Boolean is_a =
         obj->_is_a (
-            "IDL:omg.org/IR/PublishesDef:1.0"
+            "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0"
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (PublishesDef::_nil ());
@@ -9296,8 +9818,8 @@ IR::PublishesDef::_narrow (
   return PublishesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IR::PublishesDef_ptr 
-IR::PublishesDef::_unchecked_narrow (
+CORBA::ComponentIR::PublishesDef_ptr 
+CORBA::ComponentIR::PublishesDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -9322,12 +9844,12 @@ IR::PublishesDef::_unchecked_narrow (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&
-          IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer != 0
+          CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer != 0
         )
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::PublishesDef (
+              ::CORBA::ComponentIR::PublishesDef (
                   stub,
                   1,
                   obj->_servant ()
@@ -9340,7 +9862,7 @@ IR::PublishesDef::_unchecked_narrow (
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::PublishesDef (
+              ::CORBA::ComponentIR::PublishesDef (
                   stub,
                   0,
                   obj->_servant ()
@@ -9364,8 +9886,8 @@ IR::PublishesDef::_unchecked_narrow (
         );
 }
 
-IR::PublishesDef_ptr
-IR::PublishesDef::_duplicate (PublishesDef_ptr obj)
+CORBA::ComponentIR::PublishesDef_ptr
+CORBA::ComponentIR::PublishesDef::_duplicate (PublishesDef_ptr obj)
 {
   if (! CORBA::is_nil (obj))
     {
@@ -9376,7 +9898,7 @@ IR::PublishesDef::_duplicate (PublishesDef_ptr obj)
 }
 
 CORBA::Boolean
-IR::PublishesDef::_is_a (
+CORBA::ComponentIR::PublishesDef::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
   )
@@ -9384,11 +9906,11 @@ IR::PublishesDef::_is_a (
   if (
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/PublishesDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/EventDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
@@ -9415,27 +9937,27 @@ IR::PublishesDef::_is_a (
     }
 }
 
-void *IR::PublishesDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::ComponentIR::PublishesDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, PublishesDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, PublishesDef)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, EventDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, EventPortDef)::_tao_class_id)
             )
     {
       retv =
         ACE_reinterpret_cast (
             void *,
             ACE_static_cast (
-                IR::EventDef_ptr,
+                CORBA::ComponentIR::EventPortDef_ptr,
                 this
               )
           );
@@ -9488,218 +10010,233 @@ void *IR::PublishesDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* IR::PublishesDef::_interface_repository_id (void) const
+const char* CORBA::ComponentIR::PublishesDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/IR/PublishesDef:1.0";
+  return "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_PublishesDef[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_PublishesDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
+  47,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x75626c69), 
-  ACE_NTOHL (0x73686573), 
-  ACE_NTOHL (0x4465663a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PublishesDef:1.0
-  13,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5075), 
+  ACE_NTOHL (0x626c6973), 
+  ACE_NTOHL (0x68657344), 
+  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0
+    13,
   ACE_NTOHL (0x5075626c), 
   ACE_NTOHL (0x69736865), 
   ACE_NTOHL (0x73446566), 
   ACE_NTOHL (0x0),  // name = PublishesDef
-};
+  };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_PublishesDef (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_PublishesDef (
     CORBA::tk_objref,
-    sizeof (_oc_IR_PublishesDef),
-    (char *) &_oc_IR_PublishesDef,
+    sizeof (_oc_CORBA_ComponentIR_PublishesDef),
+    (char *) &_oc_CORBA_ComponentIR_PublishesDef,
     0,
-    sizeof (IR::PublishesDef)
+    sizeof (CORBA::ComponentIR::PublishesDef)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
     _tc_PublishesDef,
-    &_tc_TAO_tc_IR_PublishesDef
+    &_tc_TAO_tc_CORBA_ComponentIR_PublishesDef
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-int IR::ConsumesDef::_tao_class_id = 0;
+int CORBA::ComponentIR::ConsumesDef::_tao_class_id = 0;
 
-IR::ConsumesDef_ptr
-tao_IR_ConsumesDef_duplicate (
-    IR::ConsumesDef_ptr p
+CORBA::ComponentIR::ConsumesDef_ptr
+tao_CORBA_ComponentIR_ConsumesDef_duplicate (
+    CORBA::ComponentIR::ConsumesDef_ptr p
   )
 {
-  return IR::ConsumesDef::_duplicate (p);
+  return CORBA::ComponentIR::ConsumesDef::_duplicate (p);
 }
 
 void
-tao_IR_ConsumesDef_release (
-    IR::ConsumesDef_ptr p
+tao_CORBA_ComponentIR_ConsumesDef_release (
+    CORBA::ComponentIR::ConsumesDef_ptr p
   )
 {
   CORBA::release (p);
 }
 
-IR::ConsumesDef_ptr
-tao_IR_ConsumesDef_nil (
+CORBA::ComponentIR::ConsumesDef_ptr
+tao_CORBA_ComponentIR_ConsumesDef_nil (
     void
   )
 {
-  return IR::ConsumesDef::_nil ();
+  return CORBA::ComponentIR::ConsumesDef::_nil ();
 }
 
-IR::ConsumesDef_ptr
-tao_IR_ConsumesDef_narrow (
+CORBA::ComponentIR::ConsumesDef_ptr
+tao_CORBA_ComponentIR_ConsumesDef_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return IR::ConsumesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ConsumesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-tao_IR_ConsumesDef_upcast (
+tao_CORBA_ComponentIR_ConsumesDef_upcast (
     void *src
   )
 {
-  IR::ConsumesDef **tmp =
-    ACE_static_cast (IR::ConsumesDef **, src);
+  CORBA::ComponentIR::ConsumesDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::ConsumesDef **, src);
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ComponentIR_ConsumesDef_marshal (
+    CORBA::ComponentIR::ConsumesDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
-// IR::ConsumesDef_var
+// CORBA::ComponentIR::ConsumesDef_var
 // *************************************************************
 
-IR::ConsumesDef_var::ConsumesDef_var (void)
+CORBA::ComponentIR::ConsumesDef_var::ConsumesDef_var (void)
   : ptr_ (ConsumesDef::_nil ())
 {}
 
-::IR::ConsumesDef_ptr
-IR::ConsumesDef_var::ptr (void) const
+::CORBA::ComponentIR::ConsumesDef_ptr
+CORBA::ComponentIR::ConsumesDef_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-IR::ConsumesDef_var::ConsumesDef_var (const ::IR::ConsumesDef_var &p)
+CORBA::ComponentIR::ConsumesDef_var::ConsumesDef_var (const ::CORBA::ComponentIR::ConsumesDef_var &p)
   : TAO_Base_var (),
     ptr_ (ConsumesDef::_duplicate (p.ptr ()))
 {}
 
-IR::ConsumesDef_var::~ConsumesDef_var (void)
+CORBA::ComponentIR::ConsumesDef_var::~ConsumesDef_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
-IR::ConsumesDef_var &
-IR::ConsumesDef_var::operator= (ConsumesDef_ptr p)
+CORBA::ComponentIR::ConsumesDef_var &
+CORBA::ComponentIR::ConsumesDef_var::operator= (ConsumesDef_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-IR::ConsumesDef_var &
-IR::ConsumesDef_var::operator= (const ::IR::ConsumesDef_var &p)
+CORBA::ComponentIR::ConsumesDef_var &
+CORBA::ComponentIR::ConsumesDef_var::operator= (const ::CORBA::ComponentIR::ConsumesDef_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::ConsumesDef::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::ComponentIR::ConsumesDef::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-IR::ConsumesDef_var::operator const ::IR::ConsumesDef_ptr &() const // cast
+CORBA::ComponentIR::ConsumesDef_var::operator const ::CORBA::ComponentIR::ConsumesDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-IR::ConsumesDef_var::operator ::IR::ConsumesDef_ptr &() // cast 
+CORBA::ComponentIR::ConsumesDef_var::operator ::CORBA::ComponentIR::ConsumesDef_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::IR::ConsumesDef_ptr
-IR::ConsumesDef_var::operator-> (void) const
+::CORBA::ComponentIR::ConsumesDef_ptr
+CORBA::ComponentIR::ConsumesDef_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::IR::ConsumesDef_ptr
-IR::ConsumesDef_var::in (void) const
+::CORBA::ComponentIR::ConsumesDef_ptr
+CORBA::ComponentIR::ConsumesDef_var::in (void) const
 {
   return this->ptr_;
 }
 
-::IR::ConsumesDef_ptr &
-IR::ConsumesDef_var::inout (void)
+::CORBA::ComponentIR::ConsumesDef_ptr &
+CORBA::ComponentIR::ConsumesDef_var::inout (void)
 {
   return this->ptr_;
 }
 
-::IR::ConsumesDef_ptr &
-IR::ConsumesDef_var::out (void)
+::CORBA::ComponentIR::ConsumesDef_ptr &
+CORBA::ComponentIR::ConsumesDef_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::ConsumesDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::ConsumesDef::_nil ();
   return this->ptr_;
 }
 
-::IR::ConsumesDef_ptr
-IR::ConsumesDef_var::_retn (void)
+::CORBA::ComponentIR::ConsumesDef_ptr
+CORBA::ComponentIR::ConsumesDef_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::IR::ConsumesDef_ptr val = this->ptr_;
-  this->ptr_ = ::IR::ConsumesDef::_nil ();
+  ::CORBA::ComponentIR::ConsumesDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::ConsumesDef::_nil ();
   return val;
 }
 
-::IR::ConsumesDef_ptr
-IR::ConsumesDef_var::tao_duplicate (ConsumesDef_ptr p)
+::CORBA::ComponentIR::ConsumesDef_ptr
+CORBA::ComponentIR::ConsumesDef_var::tao_duplicate (ConsumesDef_ptr p)
 {
-  return ::IR::ConsumesDef::_duplicate (p);
+  return ::CORBA::ComponentIR::ConsumesDef::_duplicate (p);
 }
 
 void
-IR::ConsumesDef_var::tao_release (ConsumesDef_ptr p)
+CORBA::ComponentIR::ConsumesDef_var::tao_release (ConsumesDef_ptr p)
 {
   CORBA::release (p);
 }
 
-::IR::ConsumesDef_ptr
-IR::ConsumesDef_var::tao_nil (void)
+::CORBA::ComponentIR::ConsumesDef_ptr
+CORBA::ComponentIR::ConsumesDef_var::tao_nil (void)
 {
-  return ::IR::ConsumesDef::_nil ();
+  return ::CORBA::ComponentIR::ConsumesDef::_nil ();
 }
 
-::IR::ConsumesDef_ptr
-IR::ConsumesDef_var::tao_narrow (
+::CORBA::ComponentIR::ConsumesDef_ptr
+CORBA::ComponentIR::ConsumesDef_var::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::ConsumesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::CORBA::ComponentIR::ConsumesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IR::ConsumesDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::ConsumesDef_var::tao_upcast (void *src)
 {
   ConsumesDef **tmp =
     ACE_static_cast (ConsumesDef **, src);
@@ -9707,85 +10244,85 @@ IR::ConsumesDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
-// IR::ConsumesDef_out
+// CORBA::ComponentIR::ConsumesDef_out
 // *************************************************************
 
-IR::ConsumesDef_out::ConsumesDef_out (ConsumesDef_ptr &p)
+CORBA::ComponentIR::ConsumesDef_out::ConsumesDef_out (ConsumesDef_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::IR::ConsumesDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::ConsumesDef::_nil ();
 }
 
-IR::ConsumesDef_out::ConsumesDef_out (ConsumesDef_var &p)
+CORBA::ComponentIR::ConsumesDef_out::ConsumesDef_out (ConsumesDef_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::ConsumesDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::ConsumesDef::_nil ();
 }
 
-IR::ConsumesDef_out::ConsumesDef_out (const ::IR::ConsumesDef_out &p)
+CORBA::ComponentIR::ConsumesDef_out::ConsumesDef_out (const ::CORBA::ComponentIR::ConsumesDef_out &p)
   : ptr_ (ACE_const_cast (ConsumesDef_out &, p).ptr_)
 {}
 
-::IR::ConsumesDef_out &
-IR::ConsumesDef_out::operator= (const ::IR::ConsumesDef_out &p)
+::CORBA::ComponentIR::ConsumesDef_out &
+CORBA::ComponentIR::ConsumesDef_out::operator= (const ::CORBA::ComponentIR::ConsumesDef_out &p)
 {
   this->ptr_ = ACE_const_cast (ConsumesDef_out&, p).ptr_;
   return *this;
 }
 
-IR::ConsumesDef_out &
-IR::ConsumesDef_out::operator= (const ::IR::ConsumesDef_var &p)
+CORBA::ComponentIR::ConsumesDef_out &
+CORBA::ComponentIR::ConsumesDef_out::operator= (const ::CORBA::ComponentIR::ConsumesDef_var &p)
 {
-  this->ptr_ = ::IR::ConsumesDef::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::ComponentIR::ConsumesDef::_duplicate (p.ptr ());
   return *this;
 }
 
-IR::ConsumesDef_out &
-IR::ConsumesDef_out::operator= (ConsumesDef_ptr p)
+CORBA::ComponentIR::ConsumesDef_out &
+CORBA::ComponentIR::ConsumesDef_out::operator= (ConsumesDef_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-IR::ConsumesDef_out::operator ::IR::ConsumesDef_ptr &() // cast
+CORBA::ComponentIR::ConsumesDef_out::operator ::CORBA::ComponentIR::ConsumesDef_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::IR::ConsumesDef_ptr &
-IR::ConsumesDef_out::ptr (void)
+::CORBA::ComponentIR::ConsumesDef_ptr &
+CORBA::ComponentIR::ConsumesDef_out::ptr (void)
 {
   return this->ptr_;
 }
 
-::IR::ConsumesDef_ptr
-IR::ConsumesDef_out::operator-> (void)
+::CORBA::ComponentIR::ConsumesDef_ptr
+CORBA::ComponentIR::ConsumesDef_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
 
-IR::_TAO_ConsumesDef_Proxy_Impl::_TAO_ConsumesDef_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_ConsumesDef_Proxy_Impl::_TAO_ConsumesDef_Proxy_Impl (void)
 {}
 
-IR::_TAO_ConsumesDef_Remote_Proxy_Impl::_TAO_ConsumesDef_Remote_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_ConsumesDef_Remote_Proxy_Impl::_TAO_ConsumesDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
@@ -9795,43 +10332,43 @@ IR::_TAO_ConsumesDef_Remote_Proxy_Impl::_TAO_ConsumesDef_Remote_Proxy_Impl (void
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
 //
 
-IR::_TAO_ConsumesDef_Proxy_Broker::_TAO_ConsumesDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ConsumesDef_Proxy_Broker::_TAO_ConsumesDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ConsumesDef_Proxy_Broker::~_TAO_ConsumesDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ConsumesDef_Proxy_Broker::~_TAO_ConsumesDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ConsumesDef_Proxy_Broker * (*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_ConsumesDef_Proxy_Broker * (*CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-IR::_TAO_ConsumesDef_Remote_Proxy_Broker *
-IR::_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ConsumesDef_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker (void)
 {
-  static ::IR::_TAO_ConsumesDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::CORBA::ComponentIR::_TAO_ConsumesDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-IR::_TAO_ConsumesDef_Remote_Proxy_Broker::_TAO_ConsumesDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ConsumesDef_Remote_Proxy_Broker::_TAO_ConsumesDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ConsumesDef_Remote_Proxy_Broker::~_TAO_ConsumesDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ConsumesDef_Remote_Proxy_Broker::~_TAO_ConsumesDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ConsumesDef_Proxy_Impl&
-IR::_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
-    ::IR::ConsumesDef *
+CORBA::ComponentIR::_TAO_ConsumesDef_Proxy_Impl&
+CORBA::ComponentIR::_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::ConsumesDef *
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -9843,38 +10380,38 @@ IR::_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
-IR::ConsumesDef::ConsumesDef (int collocated)
+CORBA::ComponentIR::ConsumesDef::ConsumesDef (int collocated)
 {
-  this->IR_ConsumesDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_ConsumesDef_setup_collocation (collocated);
 }
 
 void
-IR::ConsumesDef::IR_ConsumesDef_setup_collocation (int collocated)
+CORBA::ComponentIR::ConsumesDef::CORBA_ComponentIR_ConsumesDef_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ConsumesDef_Proxy_Broker_ =
-      ::IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
+      ::CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ConsumesDef_Proxy_Broker_ =
-      ::IR::_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
+      ::CORBA::ComponentIR::_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
   
-  this->IR_EventDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_EventPortDef_setup_collocation (collocated);
 }
 
-IR::ConsumesDef::~ConsumesDef (void)
+CORBA::ComponentIR::ConsumesDef::~ConsumesDef (void)
 {}
 
 void 
-IR::ConsumesDef::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ComponentIR::ConsumesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConsumesDef *tmp = ACE_static_cast (ConsumesDef *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IR::ConsumesDef_ptr
-IR::ConsumesDef::_narrow (
+CORBA::ComponentIR::ConsumesDef_ptr
+CORBA::ComponentIR::ConsumesDef::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -9888,7 +10425,7 @@ IR::ConsumesDef::_narrow (
     {
       CORBA::Boolean is_a =
         obj->_is_a (
-            "IDL:omg.org/IR/ConsumesDef:1.0"
+            "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0"
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ConsumesDef::_nil ());
@@ -9902,8 +10439,8 @@ IR::ConsumesDef::_narrow (
   return ConsumesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IR::ConsumesDef_ptr 
-IR::ConsumesDef::_unchecked_narrow (
+CORBA::ComponentIR::ConsumesDef_ptr 
+CORBA::ComponentIR::ConsumesDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -9928,12 +10465,12 @@ IR::ConsumesDef::_unchecked_narrow (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&
-          IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer != 0
+          CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer != 0
         )
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::ConsumesDef (
+              ::CORBA::ComponentIR::ConsumesDef (
                   stub,
                   1,
                   obj->_servant ()
@@ -9946,7 +10483,7 @@ IR::ConsumesDef::_unchecked_narrow (
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::ConsumesDef (
+              ::CORBA::ComponentIR::ConsumesDef (
                   stub,
                   0,
                   obj->_servant ()
@@ -9970,8 +10507,8 @@ IR::ConsumesDef::_unchecked_narrow (
         );
 }
 
-IR::ConsumesDef_ptr
-IR::ConsumesDef::_duplicate (ConsumesDef_ptr obj)
+CORBA::ComponentIR::ConsumesDef_ptr
+CORBA::ComponentIR::ConsumesDef::_duplicate (ConsumesDef_ptr obj)
 {
   if (! CORBA::is_nil (obj))
     {
@@ -9982,7 +10519,7 @@ IR::ConsumesDef::_duplicate (ConsumesDef_ptr obj)
 }
 
 CORBA::Boolean
-IR::ConsumesDef::_is_a (
+CORBA::ComponentIR::ConsumesDef::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
   )
@@ -9990,11 +10527,11 @@ IR::ConsumesDef::_is_a (
   if (
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/ConsumesDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/EventDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
@@ -10021,27 +10558,27 @@ IR::ConsumesDef::_is_a (
     }
 }
 
-void *IR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::ComponentIR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, ConsumesDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, ConsumesDef)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, EventDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, EventPortDef)::_tao_class_id)
             )
     {
       retv =
         ACE_reinterpret_cast (
             void *,
             ACE_static_cast (
-                IR::EventDef_ptr,
+                CORBA::ComponentIR::EventPortDef_ptr,
                 this
               )
           );
@@ -10094,217 +10631,232 @@ void *IR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* IR::ConsumesDef::_interface_repository_id (void) const
+const char* CORBA::ComponentIR::ConsumesDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/IR/ConsumesDef:1.0";
+  return "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_ConsumesDef[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_ConsumesDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
+  46,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f43), 
-  ACE_NTOHL (0x6f6e7375), 
-  ACE_NTOHL (0x6d657344), 
-  ACE_NTOHL (0x65663a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ConsumesDef:1.0
-  12,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f436f), 
+  ACE_NTOHL (0x6e73756d), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0
+    12,
   ACE_NTOHL (0x436f6e73), 
   ACE_NTOHL (0x756d6573), 
   ACE_NTOHL (0x44656600),  // name = ConsumesDef
-};
+  };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_ConsumesDef (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ConsumesDef (
     CORBA::tk_objref,
-    sizeof (_oc_IR_ConsumesDef),
-    (char *) &_oc_IR_ConsumesDef,
+    sizeof (_oc_CORBA_ComponentIR_ConsumesDef),
+    (char *) &_oc_CORBA_ComponentIR_ConsumesDef,
     0,
-    sizeof (IR::ConsumesDef)
+    sizeof (CORBA::ComponentIR::ConsumesDef)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
     _tc_ConsumesDef,
-    &_tc_TAO_tc_IR_ConsumesDef
+    &_tc_TAO_tc_CORBA_ComponentIR_ConsumesDef
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-int IR::ComponentDef::_tao_class_id = 0;
+int CORBA::ComponentIR::ComponentDef::_tao_class_id = 0;
 
-IR::ComponentDef_ptr
-tao_IR_ComponentDef_duplicate (
-    IR::ComponentDef_ptr p
+CORBA::ComponentIR::ComponentDef_ptr
+tao_CORBA_ComponentIR_ComponentDef_duplicate (
+    CORBA::ComponentIR::ComponentDef_ptr p
   )
 {
-  return IR::ComponentDef::_duplicate (p);
+  return CORBA::ComponentIR::ComponentDef::_duplicate (p);
 }
 
 void
-tao_IR_ComponentDef_release (
-    IR::ComponentDef_ptr p
+tao_CORBA_ComponentIR_ComponentDef_release (
+    CORBA::ComponentIR::ComponentDef_ptr p
   )
 {
   CORBA::release (p);
 }
 
-IR::ComponentDef_ptr
-tao_IR_ComponentDef_nil (
+CORBA::ComponentIR::ComponentDef_ptr
+tao_CORBA_ComponentIR_ComponentDef_nil (
     void
   )
 {
-  return IR::ComponentDef::_nil ();
+  return CORBA::ComponentIR::ComponentDef::_nil ();
 }
 
-IR::ComponentDef_ptr
-tao_IR_ComponentDef_narrow (
+CORBA::ComponentIR::ComponentDef_ptr
+tao_CORBA_ComponentIR_ComponentDef_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return IR::ComponentDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ComponentDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-tao_IR_ComponentDef_upcast (
+tao_CORBA_ComponentIR_ComponentDef_upcast (
     void *src
   )
 {
-  IR::ComponentDef **tmp =
-    ACE_static_cast (IR::ComponentDef **, src);
+  CORBA::ComponentIR::ComponentDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::ComponentDef **, src);
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ComponentIR_ComponentDef_marshal (
+    CORBA::ComponentIR::ComponentDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
-// IR::ComponentDef_var
+// CORBA::ComponentIR::ComponentDef_var
 // *************************************************************
 
-IR::ComponentDef_var::ComponentDef_var (void)
+CORBA::ComponentIR::ComponentDef_var::ComponentDef_var (void)
   : ptr_ (ComponentDef::_nil ())
 {}
 
-::IR::ComponentDef_ptr
-IR::ComponentDef_var::ptr (void) const
+::CORBA::ComponentIR::ComponentDef_ptr
+CORBA::ComponentIR::ComponentDef_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-IR::ComponentDef_var::ComponentDef_var (const ::IR::ComponentDef_var &p)
+CORBA::ComponentIR::ComponentDef_var::ComponentDef_var (const ::CORBA::ComponentIR::ComponentDef_var &p)
   : TAO_Base_var (),
     ptr_ (ComponentDef::_duplicate (p.ptr ()))
 {}
 
-IR::ComponentDef_var::~ComponentDef_var (void)
+CORBA::ComponentIR::ComponentDef_var::~ComponentDef_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
-IR::ComponentDef_var &
-IR::ComponentDef_var::operator= (ComponentDef_ptr p)
+CORBA::ComponentIR::ComponentDef_var &
+CORBA::ComponentIR::ComponentDef_var::operator= (ComponentDef_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-IR::ComponentDef_var &
-IR::ComponentDef_var::operator= (const ::IR::ComponentDef_var &p)
+CORBA::ComponentIR::ComponentDef_var &
+CORBA::ComponentIR::ComponentDef_var::operator= (const ::CORBA::ComponentIR::ComponentDef_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::ComponentDef::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::ComponentIR::ComponentDef::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-IR::ComponentDef_var::operator const ::IR::ComponentDef_ptr &() const // cast
+CORBA::ComponentIR::ComponentDef_var::operator const ::CORBA::ComponentIR::ComponentDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-IR::ComponentDef_var::operator ::IR::ComponentDef_ptr &() // cast 
+CORBA::ComponentIR::ComponentDef_var::operator ::CORBA::ComponentIR::ComponentDef_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::IR::ComponentDef_ptr
-IR::ComponentDef_var::operator-> (void) const
+::CORBA::ComponentIR::ComponentDef_ptr
+CORBA::ComponentIR::ComponentDef_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::IR::ComponentDef_ptr
-IR::ComponentDef_var::in (void) const
+::CORBA::ComponentIR::ComponentDef_ptr
+CORBA::ComponentIR::ComponentDef_var::in (void) const
 {
   return this->ptr_;
 }
 
-::IR::ComponentDef_ptr &
-IR::ComponentDef_var::inout (void)
+::CORBA::ComponentIR::ComponentDef_ptr &
+CORBA::ComponentIR::ComponentDef_var::inout (void)
 {
   return this->ptr_;
 }
 
-::IR::ComponentDef_ptr &
-IR::ComponentDef_var::out (void)
+::CORBA::ComponentIR::ComponentDef_ptr &
+CORBA::ComponentIR::ComponentDef_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::ComponentDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::ComponentDef::_nil ();
   return this->ptr_;
 }
 
-::IR::ComponentDef_ptr
-IR::ComponentDef_var::_retn (void)
+::CORBA::ComponentIR::ComponentDef_ptr
+CORBA::ComponentIR::ComponentDef_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::IR::ComponentDef_ptr val = this->ptr_;
-  this->ptr_ = ::IR::ComponentDef::_nil ();
+  ::CORBA::ComponentIR::ComponentDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::ComponentDef::_nil ();
   return val;
 }
 
-::IR::ComponentDef_ptr
-IR::ComponentDef_var::tao_duplicate (ComponentDef_ptr p)
+::CORBA::ComponentIR::ComponentDef_ptr
+CORBA::ComponentIR::ComponentDef_var::tao_duplicate (ComponentDef_ptr p)
 {
-  return ::IR::ComponentDef::_duplicate (p);
+  return ::CORBA::ComponentIR::ComponentDef::_duplicate (p);
 }
 
 void
-IR::ComponentDef_var::tao_release (ComponentDef_ptr p)
+CORBA::ComponentIR::ComponentDef_var::tao_release (ComponentDef_ptr p)
 {
   CORBA::release (p);
 }
 
-::IR::ComponentDef_ptr
-IR::ComponentDef_var::tao_nil (void)
+::CORBA::ComponentIR::ComponentDef_ptr
+CORBA::ComponentIR::ComponentDef_var::tao_nil (void)
 {
-  return ::IR::ComponentDef::_nil ();
+  return ::CORBA::ComponentIR::ComponentDef::_nil ();
 }
 
-::IR::ComponentDef_ptr
-IR::ComponentDef_var::tao_narrow (
+::CORBA::ComponentIR::ComponentDef_ptr
+CORBA::ComponentIR::ComponentDef_var::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::ComponentDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::CORBA::ComponentIR::ComponentDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IR::ComponentDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::ComponentDef_var::tao_upcast (void *src)
 {
   ComponentDef **tmp =
     ACE_static_cast (ComponentDef **, src);
@@ -10312,79 +10864,79 @@ IR::ComponentDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
-// IR::ComponentDef_out
+// CORBA::ComponentIR::ComponentDef_out
 // *************************************************************
 
-IR::ComponentDef_out::ComponentDef_out (ComponentDef_ptr &p)
+CORBA::ComponentIR::ComponentDef_out::ComponentDef_out (ComponentDef_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::IR::ComponentDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::ComponentDef::_nil ();
 }
 
-IR::ComponentDef_out::ComponentDef_out (ComponentDef_var &p)
+CORBA::ComponentIR::ComponentDef_out::ComponentDef_out (ComponentDef_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::ComponentDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::ComponentDef::_nil ();
 }
 
-IR::ComponentDef_out::ComponentDef_out (const ::IR::ComponentDef_out &p)
+CORBA::ComponentIR::ComponentDef_out::ComponentDef_out (const ::CORBA::ComponentIR::ComponentDef_out &p)
   : ptr_ (ACE_const_cast (ComponentDef_out &, p).ptr_)
 {}
 
-::IR::ComponentDef_out &
-IR::ComponentDef_out::operator= (const ::IR::ComponentDef_out &p)
+::CORBA::ComponentIR::ComponentDef_out &
+CORBA::ComponentIR::ComponentDef_out::operator= (const ::CORBA::ComponentIR::ComponentDef_out &p)
 {
   this->ptr_ = ACE_const_cast (ComponentDef_out&, p).ptr_;
   return *this;
 }
 
-IR::ComponentDef_out &
-IR::ComponentDef_out::operator= (const ::IR::ComponentDef_var &p)
+CORBA::ComponentIR::ComponentDef_out &
+CORBA::ComponentIR::ComponentDef_out::operator= (const ::CORBA::ComponentIR::ComponentDef_var &p)
 {
-  this->ptr_ = ::IR::ComponentDef::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::ComponentIR::ComponentDef::_duplicate (p.ptr ());
   return *this;
 }
 
-IR::ComponentDef_out &
-IR::ComponentDef_out::operator= (ComponentDef_ptr p)
+CORBA::ComponentIR::ComponentDef_out &
+CORBA::ComponentIR::ComponentDef_out::operator= (ComponentDef_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-IR::ComponentDef_out::operator ::IR::ComponentDef_ptr &() // cast
+CORBA::ComponentIR::ComponentDef_out::operator ::CORBA::ComponentIR::ComponentDef_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::IR::ComponentDef_ptr &
-IR::ComponentDef_out::ptr (void)
+::CORBA::ComponentIR::ComponentDef_ptr &
+CORBA::ComponentIR::ComponentDef_out::ptr (void)
 {
   return this->ptr_;
 }
 
-::IR::ComponentDef_ptr
-IR::ComponentDef_out::operator-> (void)
+::CORBA::ComponentIR::ComponentDef_ptr
+CORBA::ComponentIR::ComponentDef_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -10398,19 +10950,19 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::CORBA::InterfaceDefSeq * result);
+    void result (::CORBA::ComponentIR::ComponentDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get &);
     
-    ::CORBA::InterfaceDefSeq * _result;
+    ::CORBA::ComponentIR::ComponentDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_NOT_USED      
@@ -10419,7 +10971,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -10431,7 +10983,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (ACE_E
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -10443,7 +10995,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (ACE_
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -10459,22 +11011,22 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (ACE_ENV_
 }
 
 void 
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (::CORBA::InterfaceDefSeq * result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::result (::CORBA::ComponentIR::ComponentDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::InterfaceDefSeq & supported_interfaces
+      CORBA::ComponentIR::ComponentDef_ptr base_component
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
@@ -10487,26 +11039,26 @@ public:
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
-    TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set &);
-    const CORBA::InterfaceDefSeq & supported_interfaces_;
+    TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set &);
+    CORBA::ComponentIR::ComponentDef_ptr base_component_;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::InterfaceDefSeq & supported_interfaces
+      CORBA::ComponentIR::ComponentDef_ptr base_component
       ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      supported_interfaces_ (supported_interfaces)
+      base_component_ (base_component)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -10518,7 +11070,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (ACE_E
   
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<=  this->supported_interfaces_;
+  (*parameter_list)[len].argument <<=  this->base_component_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -10526,7 +11078,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (ACE_E
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -10538,7 +11090,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (ACE_
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -10553,12 +11105,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (ACE_ENV_
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_ComponentDef_base_component_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -10572,280 +11124,19 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::ComponentDef_ptr result);
-    
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (const TAO_ClientRequestInfo_IR_ComponentDef_base_component_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_base_component_get &);
-    
-    ::IR::ComponentDef_ptr _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-  
-  TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (::IR::ComponentDef_ptr result)
-{
-  // Update the result. 
-  this->_result = result;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void result (::IR::ProvidesDefSeq * result);
-    
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get &);
-    
-    ::IR::ProvidesDefSeq * _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-  
-  TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (::IR::ProvidesDefSeq * result)
-{
-  // Update the result. 
-  this->_result = result;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void result (::IR::UsesDefSeq * result);
-    
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get &);
-    
-    ::IR::UsesDefSeq * _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-  
-  TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (::IR::UsesDefSeq * result)
-{
-  // Update the result. 
-  this->_result = result;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void result (::IR::EmitsDefSeq * result);
+    void result (::CORBA::InterfaceDefSeq * result);
     
   private:
-    TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (const TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get &);
     
-    ::IR::EmitsDefSeq * _result;
+    ::CORBA::InterfaceDefSeq * _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_NOT_USED      
@@ -10854,7 +11145,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -10866,7 +11157,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (ACE_ENV_SINGL
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -10878,7 +11169,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (ACE_ENV_SING
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -10894,21 +11185,22 @@ TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (ACE_ENV_SINGLE_A
 }
 
 void 
-TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (::IR::EmitsDefSeq * result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::result (::CORBA::InterfaceDefSeq * result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
+      CORBA::Object_ptr _tao_target,
+      const CORBA::InterfaceDefSeq & supported_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
@@ -10920,28 +11212,27 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::PublishesDefSeq * result);
-    
   private:
-    TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (const TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get &);
-    
-    ::IR::PublishesDefSeq * _result;
+    TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set &);
+    const CORBA::InterfaceDefSeq & supported_interfaces_;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
+      CORBA::Object_ptr _tao_target,
+      const CORBA::InterfaceDefSeq & supported_interfaces
       ACE_ENV_ARG_DECL_NOT_USED      
     )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      supported_interfaces_ (supported_interfaces)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -10949,98 +11240,19 @@ TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (ACE_ENV_S
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (::IR::PublishesDefSeq * result)
-{
-  // Update the result. 
-  this->_result = result;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void result (::IR::ConsumesDefSeq * result);
-    
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (const TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get &);
-    
-    ::IR::ConsumesDefSeq * _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   
-  TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<=  this->supported_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
-  return parameter_list;
+  return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -11052,122 +11264,27 @@ TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (ACE_ENV_S
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
+  CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (::IR::ConsumesDefSeq * result)
-{
-  // Update the result. 
-  this->_result = result;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void result (::CORBA::Boolean result);
-    
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (const TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get &);
-    
-    ::CORBA::Boolean _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-  
-  TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
+  return result_any;
 }
 
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
 
-CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Boolean result)
-{
-  // Update the result. 
-  this->_result = result;
-}
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_ComponentDef_create_provides : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_ComponentDef_create_provides (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
@@ -11185,23 +11302,23 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::ProvidesDef_ptr result);
+    void result (::CORBA::ComponentIR::ProvidesDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_ComponentDef_create_provides (const TAO_ClientRequestInfo_IR_ComponentDef_create_provides &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_provides &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides &);
     const char * id_;
     const char * name_;
     const char * version_;
     CORBA::InterfaceDef_ptr interface_type_;
     
-    ::IR::ProvidesDef_ptr _result;
+    ::CORBA::ComponentIR::ProvidesDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_ComponentDef_create_provides (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
@@ -11218,7 +11335,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -11250,7 +11367,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (ACE_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -11262,7 +11379,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (ACE_ENV_SINGL
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -11278,19 +11395,19 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (ACE_ENV_SINGLE_AR
 }
 
 void 
-TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (::IR::ProvidesDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::result (::CORBA::ComponentIR::ProvidesDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_ComponentDef_create_uses : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_ComponentDef_create_uses (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
@@ -11309,24 +11426,24 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::UsesDef_ptr result);
+    void result (::CORBA::ComponentIR::UsesDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_ComponentDef_create_uses (const TAO_ClientRequestInfo_IR_ComponentDef_create_uses &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_uses &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses &);
     const char * id_;
     const char * name_;
     const char * version_;
     CORBA::InterfaceDef_ptr interface_type_;
     const CORBA::Boolean & is_multiple_;
     
-    ::IR::UsesDef_ptr _result;
+    ::CORBA::ComponentIR::UsesDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_ComponentDef_create_uses (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
@@ -11345,7 +11462,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -11381,7 +11498,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (ACE_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -11393,7 +11510,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (ACE_ENV_SINGLE_AR
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -11409,25 +11526,25 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (ACE_ENV_SINGLE_ARG_DE
 }
 
 void 
-TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (::IR::UsesDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::result (::CORBA::ComponentIR::UsesDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_ComponentDef_create_emits : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_ComponentDef_create_emits (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value
+      CORBA::ComponentIR::EventDef_ptr event
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
@@ -11439,40 +11556,40 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::EmitsDef_ptr result);
+    void result (::CORBA::ComponentIR::EmitsDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_ComponentDef_create_emits (const TAO_ClientRequestInfo_IR_ComponentDef_create_emits &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_emits &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits &);
     const char * id_;
     const char * name_;
     const char * version_;
-    CORBA::ValueDef_ptr value_;
+    CORBA::ComponentIR::EventDef_ptr event_;
     
-    ::IR::EmitsDef_ptr _result;
+    ::CORBA::ComponentIR::EmitsDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_ComponentDef_create_emits (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value
+      CORBA::ComponentIR::EventDef_ptr event
       ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
       name_ (name),
       version_ (version),
-      value_ (value)
+      event_ (event)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -11496,7 +11613,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (ACE_ENV_SINGLE_AR
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
-  (*parameter_list)[len].argument <<=  this->value_;
+  (*parameter_list)[len].argument <<=  this->event_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -11504,7 +11621,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (ACE_ENV_SINGLE_AR
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -11516,7 +11633,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (ACE_ENV_SINGLE_A
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -11532,25 +11649,25 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (ACE_ENV_SINGLE_ARG_D
 }
 
 void 
-TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (::IR::EmitsDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::result (::CORBA::ComponentIR::EmitsDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_ComponentDef_create_publishes : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value
+      CORBA::ComponentIR::EventDef_ptr event
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
@@ -11562,40 +11679,40 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::PublishesDef_ptr result);
+    void result (::CORBA::ComponentIR::PublishesDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (const TAO_ClientRequestInfo_IR_ComponentDef_create_publishes &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_publishes &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes &);
     const char * id_;
     const char * name_;
     const char * version_;
-    CORBA::ValueDef_ptr value_;
+    CORBA::ComponentIR::EventDef_ptr event_;
     
-    ::IR::PublishesDef_ptr _result;
+    ::CORBA::ComponentIR::PublishesDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value
+      CORBA::ComponentIR::EventDef_ptr event
       ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
       name_ (name),
       version_ (version),
-      value_ (value)
+      event_ (event)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -11619,7 +11736,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (ACE_ENV_SINGL
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
-  (*parameter_list)[len].argument <<=  this->value_;
+  (*parameter_list)[len].argument <<=  this->event_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -11627,7 +11744,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (ACE_ENV_SINGL
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -11639,7 +11756,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (ACE_ENV_SING
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -11655,25 +11772,25 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (ACE_ENV_SINGLE_A
 }
 
 void 
-TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (::IR::PublishesDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::result (::CORBA::ComponentIR::PublishesDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_ComponentDef_create_consumes : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value
+      CORBA::ComponentIR::EventDef_ptr event
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
@@ -11685,40 +11802,40 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::ConsumesDef_ptr result);
+    void result (::CORBA::ComponentIR::ConsumesDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (const TAO_ClientRequestInfo_IR_ComponentDef_create_consumes &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_consumes &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes &);
     const char * id_;
     const char * name_;
     const char * version_;
-    CORBA::ValueDef_ptr value_;
+    CORBA::ComponentIR::EventDef_ptr event_;
     
-    ::IR::ConsumesDef_ptr _result;
+    ::CORBA::ComponentIR::ConsumesDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value
+      CORBA::ComponentIR::EventDef_ptr event
       ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
       name_ (name),
       version_ (version),
-      value_ (value)
+      event_ (event)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -11742,7 +11859,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (ACE_ENV_SINGLE
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
-  (*parameter_list)[len].argument <<=  this->value_;
+  (*parameter_list)[len].argument <<=  this->event_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -11750,7 +11867,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (ACE_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -11762,7 +11879,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (ACE_ENV_SINGL
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -11778,7 +11895,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (ACE_ENV_SINGLE_AR
 }
 
 void 
-TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (::IR::ConsumesDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::result (::CORBA::ComponentIR::ConsumesDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
@@ -11787,24 +11904,24 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (::IR::ConsumesDef
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
 
-IR::_TAO_ComponentDef_Proxy_Impl::_TAO_ComponentDef_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_ComponentDef_Proxy_Impl::_TAO_ComponentDef_Proxy_Impl (void)
 {}
 
-IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::CORBA::InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
+::CORBA::ComponentIR::ComponentDef_ptr CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
   )
@@ -11812,24 +11929,18 @@ IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (vo
     CORBA::SystemException
   ))
 {
-  CORBA::InterfaceDefSeq_var _tao_retval;
+  CORBA::ComponentIR::ComponentDef_var _tao_retval (CORBA::ComponentIR::ComponentDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
-  {
-    CORBA::InterfaceDefSeq *tmp;
-    ACE_NEW_RETURN (tmp, CORBA::InterfaceDefSeq, _tao_retval._retn ());
-    _tao_retval = tmp;
-  }
-  
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "_get_supported_interfaces",
-      25,
+      "_get_base_component",
+      19,
       0,
       istub->orb_core ()
     );
@@ -11850,7 +11961,7 @@ IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (vo
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get _tao_ri (
           &_tao_call,
           _collocated_tao_target_
           ACE_ENV_ARG_PARAMETER
@@ -11875,82 +11986,74 @@ IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (vo
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::InterfaceDefSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::ComponentDef_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
         {
@@ -11961,7 +12064,7 @@ IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (vo
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -11985,7 +12088,7 @@ IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (vo
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -11997,28 +12100,30 @@ IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (vo
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
+void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
     CORBA::Object *_collocated_tao_target_,
-    const CORBA::InterfaceDefSeq & supported_interfaces
+    CORBA::ComponentIR::ComponentDef_ptr base_component
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -12034,8 +12139,8 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
     
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "_set_supported_interfaces",
-      25,
+      "_set_base_component",
+      19,
       1,
       istub->orb_core ()
     );
@@ -12056,10 +12161,10 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
-          supported_interfaces
+          base_component
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
@@ -12082,490 +12187,66 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
           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 (!(
-                  (_tao_out << supported_interfaces)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
-                          
-                        )
-                    );
-                }
-              
-              _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 TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-          ACE_TRY_CHECK;
-          
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+          if (!(
+              (_tao_out << base_component)
+              ))
             {
-              ACE_RE_THROW;
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
             }
-        }
-      
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-      ACE_CATCHALL
-        {
-          CORBA::UNKNOWN ex;
-          
-          _tao_ri.exception (&ex);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
           
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
-            ACE_TRY_THROW (ex);
-        }
-# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-      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)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-}
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
-
-::IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
-    CORBA::Object *_collocated_tao_target_
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  IR::ComponentDef_var _tao_retval (IR::ComponentDef::_nil ());
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
-  if (istub == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
-    }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_base_component",
-      19,
-      0,
-      istub->orb_core ()
-    );
-  
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_base_component_get _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
-              _tao_call.restart_flag (1);
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
-          else
+          else if (_invoke_status == TAO_INVOKE_RESTART)
             {
-              
-#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 ());
-
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::ComponentDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-              || _tao_status == PortableInterceptor::USER_EXCEPTION)
-            {
-              ACE_RE_THROW;
+                )
+              
+              continue;
             }
-        }
-      
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-      ACE_CATCHALL
-        {
-          CORBA::UNKNOWN ex;
-          
-          _tao_ri.exception (&ex);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
-            ACE_TRY_THROW (ex);
-        }
-# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      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)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-
-return _tao_retval._retn ();
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
-
-::IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
-    CORBA::Object *_collocated_tao_target_
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  IR::ProvidesDefSeq_var _tao_retval;
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
-  if (istub == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
-    }
-  
-  {
-    IR::ProvidesDefSeq *tmp;
-    ACE_NEW_RETURN (tmp, IR::ProvidesDefSeq, _tao_retval._retn ());
-    _tao_retval = tmp;
-  }
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_provides_interfaces",
-      24,
-      0,
-      istub->orb_core ()
-    );
-  
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          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 ());
-
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::ProvidesDefSeq * _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;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
         }
       ACE_CATCHANY
         {
@@ -12576,7 +12257,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12600,7 +12281,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -12610,28 +12291,28 @@ return _tao_retval._retn ();
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
       
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      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 */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
+::CORBA::InterfaceDefSeq * CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
   )
@@ -12639,7 +12320,7 @@ return _tao_retval._retn ();
     CORBA::SystemException
   ))
 {
-  IR::UsesDefSeq_var _tao_retval;
+  CORBA::InterfaceDefSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
@@ -12648,15 +12329,15 @@ return _tao_retval._retn ();
     }
   
   {
-    IR::UsesDefSeq *tmp;
-    ACE_NEW_RETURN (tmp, IR::UsesDefSeq, _tao_retval._retn ());
+    CORBA::InterfaceDefSeq *tmp;
+    ACE_NEW_RETURN (tmp, CORBA::InterfaceDefSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
   
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "_get_uses_interfaces",
-      20,
+      "_get_supported_interfaces",
+      25,
       0,
       istub->orb_core ()
     );
@@ -12677,7 +12358,7 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get _tao_ri (
           &_tao_call,
           _collocated_tao_target_
           ACE_ENV_ARG_PARAMETER
@@ -12702,506 +12383,74 @@ return _tao_retval._retn ();
           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 ());
-
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::UsesDefSeq * _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;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
           
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-              || _tao_status == PortableInterceptor::USER_EXCEPTION)
-            {
-              ACE_RE_THROW;
-            }
-        }
-      
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-      ACE_CATCHALL
-        {
-          CORBA::UNKNOWN ex;
-          
-          _tao_ri.exception (&ex);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
           
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
-            ACE_TRY_THROW (ex);
-        }
-# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      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)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-
-return _tao_retval._retn ();
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-::IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
-    CORBA::Object *_collocated_tao_target_
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  IR::EmitsDefSeq_var _tao_retval;
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
-  if (istub == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
-    }
-  
-  {
-    IR::EmitsDefSeq *tmp;
-    ACE_NEW_RETURN (tmp, IR::EmitsDefSeq, _tao_retval._retn ());
-    _tao_retval = tmp;
-  }
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_emits_events",
-      17,
-      0,
-      istub->orb_core ()
-    );
-  
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-          ACE_TRY_CHECK;
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
           
-          if (_invoke_status == TAO_INVOKE_RESTART)
+          _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_call.restart_flag (1);
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  0
+                );
             }
-          else
+          else if (_invoke_status == TAO_INVOKE_RESTART)
             {
-              
-#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 ());
-
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::EmitsDefSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+          if (!(
+              (_tao_in >> _tao_retval.inout ())
+              ))
             {
-              ACE_RE_THROW;
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  0
+                );
             }
-        }
-      
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-      ACE_CATCHALL
-        {
-          CORBA::UNKNOWN ex;
-          
-          _tao_ri.exception (&ex);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
-            ACE_TRY_THROW (ex);
-        }
-# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      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)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-
-return _tao_retval._retn ();
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
-
-::IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
-    CORBA::Object *_collocated_tao_target_
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  IR::PublishesDefSeq_var _tao_retval;
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
-  if (istub == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
-    }
-  
-  {
-    IR::PublishesDefSeq *tmp;
-    ACE_NEW_RETURN (tmp, IR::PublishesDefSeq, _tao_retval._retn ());
-    _tao_retval = tmp;
-  }
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_publishes_events",
-      21,
-      0,
-      istub->orb_core ()
-    );
-  
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
 #if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
+          ::CORBA::InterfaceDefSeq * _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;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          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 ());
-
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::PublishesDefSeq * _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;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
         }
       ACE_CATCHANY
         {
@@ -13212,7 +12461,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13236,7 +12485,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13248,52 +12497,48 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
-    CORBA::Object *_collocated_tao_target_
+void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
+    CORBA::Object *_collocated_tao_target_,
+    const CORBA::InterfaceDefSeq & supported_interfaces
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  IR::ConsumesDefSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+      ACE_THROW (CORBA::INTERNAL ());
     }
-  
-  {
-    IR::ConsumesDefSeq *tmp;
-    ACE_NEW_RETURN (tmp, IR::ConsumesDefSeq, _tao_retval._retn ());
-    _tao_retval = tmp;
-  }
-  
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "_get_consumes_events",
-      20,
-      0,
+      "_set_supported_interfaces",
+      25,
+      1,
       istub->orb_core ()
     );
   
@@ -13313,12 +12558,13 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set _tao_ri (
           &_tao_call,
-          _collocated_tao_target_
+          _collocated_tao_target_,
+          supported_interfaces
           ACE_ENV_ARG_PARAMETER
         );
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK;
       
 #endif /* TAO_HAS_INTERCEPTORS */
       
@@ -13338,287 +12584,66 @@ return _tao_retval._retn ();
           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;
 
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::ConsumesDefSeq * _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;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-          ACE_TRY_CHECK;
-          
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+          if (!(
+              (_tao_out << supported_interfaces)
+              ))
             {
-              ACE_RE_THROW;
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
             }
-        }
-      
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-      ACE_CATCHALL
-        {
-          CORBA::UNKNOWN ex;
           
-          _tao_ri.exception (&ex);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
-            ACE_TRY_THROW (ex);
-        }
-# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      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)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-return _tao_retval._retn ();
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
-
-CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
-    CORBA::Object *_collocated_tao_target_
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  CORBA::Boolean _tao_retval = 0;
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
-  if (istub == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
-    }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_is_basic",
-      13,
-      0,
-      istub->orb_core ()
-    );
-  
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
-              _tao_call.restart_flag (1);
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
-          else
+          else if (_invoke_status == TAO_INVOKE_RESTART)
             {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-                  
-                  if (!(
-                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Boolean _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -13629,7 +12654,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13653,7 +12678,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13663,28 +12688,28 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
       
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval);
+      ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval);
+      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 */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
+::CORBA::ComponentIR::ProvidesDef_ptr CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
     CORBA::Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -13696,7 +12721,7 @@ return _tao_retval;
     CORBA::SystemException
   ))
 {
-  IR::ProvidesDef_var _tao_retval (IR::ProvidesDef::_nil ());
+  CORBA::ComponentIR::ProvidesDef_var _tao_retval (CORBA::ComponentIR::ProvidesDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
@@ -13728,7 +12753,7 @@ return _tao_retval;
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_create_provides _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           id,
@@ -13757,98 +12782,90 @@ return _tao_retval;
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << interface_type)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << interface_type)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::ProvidesDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::ProvidesDef_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
         {
@@ -13859,7 +12876,7 @@ return _tao_retval;
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13883,7 +12900,7 @@ return _tao_retval;
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -13895,26 +12912,28 @@ return _tao_retval;
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
+::CORBA::ComponentIR::UsesDef_ptr CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
     CORBA::Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -13927,7 +12946,7 @@ return _tao_retval._retn ();
     CORBA::SystemException
   ))
 {
-  IR::UsesDef_var _tao_retval (IR::UsesDef::_nil ());
+  CORBA::ComponentIR::UsesDef_var _tao_retval (CORBA::ComponentIR::UsesDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
@@ -13959,7 +12978,7 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_create_uses _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           id,
@@ -13989,99 +13008,91 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << interface_type) &&
+              (_tao_out << CORBA::Any::from_boolean (is_multiple))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << interface_type) &&
-                  (_tao_out << CORBA::Any::from_boolean (is_multiple))
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::UsesDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::UsesDef_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
         {
@@ -14092,7 +13103,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14116,7 +13127,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14128,38 +13139,40 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
+::CORBA::ComponentIR::EmitsDef_ptr CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
     CORBA::Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value
+    CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  IR::EmitsDef_var _tao_retval (IR::EmitsDef::_nil ());
+  CORBA::ComponentIR::EmitsDef_var _tao_retval (CORBA::ComponentIR::EmitsDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
@@ -14191,13 +13204,13 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_create_emits _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           id,
           name,
           version,
-          value
+          event
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
@@ -14220,98 +13233,90 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << event)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << value)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::EmitsDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::EmitsDef_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
         {
@@ -14322,7 +13327,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14346,7 +13351,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14358,38 +13363,40 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
+::CORBA::ComponentIR::PublishesDef_ptr CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
     CORBA::Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value
+    CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  IR::PublishesDef_var _tao_retval (IR::PublishesDef::_nil ());
+  CORBA::ComponentIR::PublishesDef_var _tao_retval (CORBA::ComponentIR::PublishesDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
@@ -14421,13 +13428,13 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_create_publishes _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           id,
           name,
           version,
-          value
+          event
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
@@ -14450,98 +13457,90 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << event)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << value)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::PublishesDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::PublishesDef_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
         {
@@ -14552,7 +13551,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14576,7 +13575,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14588,38 +13587,40 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
+::CORBA::ComponentIR::ConsumesDef_ptr CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
     CORBA::Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value
+    CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  IR::ConsumesDef_var _tao_retval (IR::ConsumesDef::_nil ());
+  CORBA::ComponentIR::ConsumesDef_var _tao_retval (CORBA::ComponentIR::ConsumesDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
@@ -14651,13 +13652,13 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_ComponentDef_create_consumes _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           id,
           name,
           version,
-          value
+          event
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
@@ -14680,98 +13681,90 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << event)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << value)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::ConsumesDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::ConsumesDef_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
         {
@@ -14782,7 +13775,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14806,7 +13799,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -14818,20 +13811,22 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 //
@@ -14839,43 +13834,43 @@ return _tao_retval._retn ();
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
 //
 
-IR::_TAO_ComponentDef_Proxy_Broker::_TAO_ComponentDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ComponentDef_Proxy_Broker::_TAO_ComponentDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ComponentDef_Proxy_Broker::~_TAO_ComponentDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ComponentDef_Proxy_Broker::~_TAO_ComponentDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ComponentDef_Proxy_Broker * (*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_ComponentDef_Proxy_Broker * (*CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-IR::_TAO_ComponentDef_Remote_Proxy_Broker *
-IR::_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker (void)
 {
-  static ::IR::_TAO_ComponentDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-IR::_TAO_ComponentDef_Remote_Proxy_Broker::_TAO_ComponentDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Broker::_TAO_ComponentDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ComponentDef_Remote_Proxy_Broker::~_TAO_ComponentDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Broker::~_TAO_ComponentDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_ComponentDef_Proxy_Impl&
-IR::_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
-    ::IR::ComponentDef *
+CORBA::ComponentIR::_TAO_ComponentDef_Proxy_Impl&
+CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::ComponentDef *
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -14887,38 +13882,38 @@ IR::_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
-IR::ComponentDef::ComponentDef (int collocated)
+CORBA::ComponentIR::ComponentDef::ComponentDef (int collocated)
 {
-  this->IR_ComponentDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_ComponentDef_setup_collocation (collocated);
 }
 
 void
-IR::ComponentDef::IR_ComponentDef_setup_collocation (int collocated)
+CORBA::ComponentIR::ComponentDef::CORBA_ComponentIR_ComponentDef_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ComponentDef_Proxy_Broker_ =
-      ::IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this);
+      ::CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ComponentDef_Proxy_Broker_ =
-      ::IR::_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker ();
+      ::CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker ();
   
-  this->CORBA_InterfaceDef_setup_collocation (collocated);
+  this->CORBA_ExtInterfaceDef_setup_collocation (collocated);
 }
 
-IR::ComponentDef::~ComponentDef (void)
+CORBA::ComponentIR::ComponentDef::~ComponentDef (void)
 {}
 
 void 
-IR::ComponentDef::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ComponentIR::ComponentDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ComponentDef *tmp = ACE_static_cast (ComponentDef *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IR::ComponentDef_ptr
-IR::ComponentDef::_narrow (
+CORBA::ComponentIR::ComponentDef_ptr
+CORBA::ComponentIR::ComponentDef::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -14932,7 +13927,7 @@ IR::ComponentDef::_narrow (
     {
       CORBA::Boolean is_a =
         obj->_is_a (
-            "IDL:omg.org/IR/ComponentDef:1.0"
+            "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ComponentDef::_nil ());
@@ -14946,8 +13941,8 @@ IR::ComponentDef::_narrow (
   return ComponentDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IR::ComponentDef_ptr 
-IR::ComponentDef::_unchecked_narrow (
+CORBA::ComponentIR::ComponentDef_ptr 
+CORBA::ComponentIR::ComponentDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -14972,12 +13967,12 @@ IR::ComponentDef::_unchecked_narrow (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&
-          IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer != 0
+          CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer != 0
         )
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::ComponentDef (
+              ::CORBA::ComponentIR::ComponentDef (
                   stub,
                   1,
                   obj->_servant ()
@@ -14990,7 +13985,7 @@ IR::ComponentDef::_unchecked_narrow (
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::ComponentDef (
+              ::CORBA::ComponentIR::ComponentDef (
                   stub,
                   0,
                   obj->_servant ()
@@ -15014,8 +14009,8 @@ IR::ComponentDef::_unchecked_narrow (
         );
 }
 
-IR::ComponentDef_ptr
-IR::ComponentDef::_duplicate (ComponentDef_ptr obj)
+CORBA::ComponentIR::ComponentDef_ptr
+CORBA::ComponentIR::ComponentDef::_duplicate (ComponentDef_ptr obj)
 {
   if (! CORBA::is_nil (obj))
     {
@@ -15026,7 +14021,7 @@ IR::ComponentDef::_duplicate (ComponentDef_ptr obj)
 }
 
 CORBA::Boolean
-IR::ComponentDef::_is_a (
+CORBA::ComponentIR::ComponentDef::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
   )
@@ -15034,7 +14029,11 @@ IR::ComponentDef::_is_a (
   if (
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/ComponentDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
@@ -15042,6 +14041,10 @@ IR::ComponentDef::_is_a (
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
+          "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -15073,19 +14076,33 @@ IR::ComponentDef::_is_a (
     }
 }
 
-void *IR::ComponentDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::ComponentIR::ComponentDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, ComponentDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, ComponentDef)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
               ptr_arith_t,
+              &::CORBA::ExtInterfaceDef::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::ExtInterfaceDef_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
               &::CORBA::InterfaceDef::_tao_class_id)
             )
     {
@@ -15100,6 +14117,20 @@ void *IR::ComponentDef::_tao_QueryInterface (ptr_arith_t type)
     }
   else if (type == ACE_reinterpret_cast (
               ptr_arith_t,
+              &::CORBA::InterfaceAttrExtension::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::InterfaceAttrExtension_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
               &::CORBA::Container::_tao_class_id)
             )
     {
@@ -15174,15 +14205,15 @@ void *IR::ComponentDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* IR::ComponentDef::_interface_repository_id (void) const
+const char* CORBA::ComponentIR::ComponentDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/IR/ComponentDef:1.0";
+  return "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::CORBA::InterfaceDefSeq * IR::ComponentDef::supported_interfaces (
+::CORBA::ComponentIR::ComponentDef_ptr CORBA::ComponentIR::ComponentDef::base_component (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -15193,17 +14224,17 @@ const char* IR::ComponentDef::_interface_repository_id (void) const
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  return proxy.supported_interfaces (
+  return proxy.base_component (
       this
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-void IR::ComponentDef::supported_interfaces (
-    const CORBA::InterfaceDefSeq & supported_interfaces
+void CORBA::ComponentIR::ComponentDef::base_component (
+    CORBA::ComponentIR::ComponentDef_ptr base_component
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -15214,37 +14245,17 @@ void IR::ComponentDef::supported_interfaces (
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   
-  proxy.supported_interfaces (
+  proxy.base_component (
       this,
-      supported_interfaces
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-::IR::ComponentDef_ptr IR::ComponentDef::base_component (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.base_component (
-      this
+      base_component
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::ProvidesDefSeq * IR::ComponentDef::provides_interfaces (
+::CORBA::InterfaceDefSeq * CORBA::ComponentIR::ComponentDef::supported_interfaces (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -15255,97 +14266,18 @@ void IR::ComponentDef::supported_interfaces (
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  return proxy.provides_interfaces (
-      this
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-::IR::UsesDefSeq * IR::ComponentDef::uses_interfaces (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.uses_interfaces (
-      this
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-::IR::EmitsDefSeq * IR::ComponentDef::emits_events (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.emits_events (
-      this
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-::IR::PublishesDefSeq * IR::ComponentDef::publishes_events (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.publishes_events (
-      this
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-::IR::ConsumesDefSeq * IR::ComponentDef::consumes_events (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.consumes_events (
+  return proxy.supported_interfaces (
       this
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-CORBA::Boolean IR::ComponentDef::is_basic (
-    ACE_ENV_SINGLE_ARG_DECL
+void CORBA::ComponentIR::ComponentDef::supported_interfaces (
+    const CORBA::InterfaceDefSeq & supported_interfaces
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -15353,18 +14285,19 @@ CORBA::Boolean IR::ComponentDef::is_basic (
 {
   _TAO_ComponentDef_Proxy_Impl &proxy = 
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK;
   
-  return proxy.is_basic (
-      this
+  proxy.supported_interfaces (
+      this,
+      supported_interfaces
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::ProvidesDef_ptr IR::ComponentDef::create_provides (
+::CORBA::ComponentIR::ProvidesDef_ptr CORBA::ComponentIR::ComponentDef::create_provides (
     const char * id,
     const char * name,
     const char * version,
@@ -15390,9 +14323,9 @@ CORBA::Boolean IR::ComponentDef::is_basic (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::UsesDef_ptr IR::ComponentDef::create_uses (
+::CORBA::ComponentIR::UsesDef_ptr CORBA::ComponentIR::ComponentDef::create_uses (
     const char * id,
     const char * name,
     const char * version,
@@ -15420,13 +14353,13 @@ CORBA::Boolean IR::ComponentDef::is_basic (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::EmitsDef_ptr IR::ComponentDef::create_emits (
+::CORBA::ComponentIR::EmitsDef_ptr CORBA::ComponentIR::ComponentDef::create_emits (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value
+    CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -15442,19 +14375,19 @@ CORBA::Boolean IR::ComponentDef::is_basic (
       id,
       name,
       version,
-      value
+      event
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::PublishesDef_ptr IR::ComponentDef::create_publishes (
+::CORBA::ComponentIR::PublishesDef_ptr CORBA::ComponentIR::ComponentDef::create_publishes (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value
+    CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -15470,19 +14403,19 @@ CORBA::Boolean IR::ComponentDef::is_basic (
       id,
       name,
       version,
-      value
+      event
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::ConsumesDef_ptr IR::ComponentDef::create_consumes (
+::CORBA::ComponentIR::ConsumesDef_ptr CORBA::ComponentIR::ComponentDef::create_consumes (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value
+    CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -15498,2171 +14431,1754 @@ CORBA::Boolean IR::ComponentDef::is_basic (
       id,
       name,
       version,
-      value
+      event
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_ComponentDef[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
+  47,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f43), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x4465663a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ComponentDef:1.0
-  13,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7444), 
+  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0
+    13,
   ACE_NTOHL (0x436f6d70), 
   ACE_NTOHL (0x6f6e656e), 
   ACE_NTOHL (0x74446566), 
   ACE_NTOHL (0x0),  // name = ComponentDef
-};
+  };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDef (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ComponentDef (
     CORBA::tk_objref,
-    sizeof (_oc_IR_ComponentDef),
-    (char *) &_oc_IR_ComponentDef,
+    sizeof (_oc_CORBA_ComponentIR_ComponentDef),
+    (char *) &_oc_CORBA_ComponentIR_ComponentDef,
     0,
-    sizeof (IR::ComponentDef)
+    sizeof (CORBA::ComponentIR::ComponentDef)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
     _tc_ComponentDef,
-    &_tc_TAO_tc_IR_ComponentDef
+    &_tc_TAO_tc_CORBA_ComponentIR_ComponentDef
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-static const CORBA::Long _oc_IR_ComponentDescription[] =
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CS_
+
+void
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::_allocate_buffer (CORBA::ULong length)
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f43), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ComponentDescription:1.0
-  21,
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x74446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = ComponentDescription
-  13, // member count
-  5,
-  ACE_NTOHL (0x6e616d65), 
-  ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f49), 
-    ACE_NTOHL (0x64656e74), 
-    ACE_NTOHL (0x69666965), 
-    ACE_NTOHL (0x723a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
-    ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
-    0U, // string length
+  CORBA::ComponentIR::ProvidesDescription* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::ComponentIR::ProvidesDescription *old =
+        ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::freebuf (old);
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
 
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
-    ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
-    0U, // string length
+void
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ComponentIR::ProvidesDescription *tmp =
+    ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription *, this->buffer_);
+  _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::freebuf (tmp);
+  this->buffer_ = 0;
+} 
 
-  11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
-  ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
-  0xffffffa0, // negative offset (-96)
-  8,
-  ACE_NTOHL (0x76657273), 
-  ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f56), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5370), 
-    ACE_NTOHL (0x65633a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
-    0U, // string length
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (void)
+{
+  this->_deallocate_buffer ();
+}
 
-  15,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f636f6d), 
-  ACE_NTOHL (0x706f6e65), 
-  ACE_NTOHL (0x6e740000),  // name = base_component
-  0xffffffff, // indirection
-  0xffffff30, // negative offset (-208)
-  20,
-  ACE_NTOHL (0x73757070), 
-  ACE_NTOHL (0x6f727473), 
-  ACE_NTOHL (0x5f696e74), 
-  ACE_NTOHL (0x65726661), 
-  ACE_NTOHL (0x63657300),  // name = supports_interfaces
-  CORBA::tk_alias, // typecode kind for typedefs
-  88, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x79496453), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/RepositoryIdSeq:1.0
-    16,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
-    ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
-    16, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      0xffffffff, // indirection
-      0xfffffebc, // negative offset (-324)
-      0U,
+#endif /* end #if !defined */
 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
-  20,
-  ACE_NTOHL (0x70726f76), 
-  ACE_NTOHL (0x69646573), 
-  ACE_NTOHL (0x5f696e74), 
-  ACE_NTOHL (0x65726661), 
-  ACE_NTOHL (0x63657300),  // name = provides_interfaces
-  CORBA::tk_alias, // typecode kind for typedefs
-  144, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f50), 
-    ACE_NTOHL (0x726f7669), 
-    ACE_NTOHL (0x64657344), 
-    ACE_NTOHL (0x65665365), 
-    ACE_NTOHL (0x713a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ProvidesDefSeq:1.0
-    15,
-    ACE_NTOHL (0x50726f76), 
-    ACE_NTOHL (0x69646573), 
-    ACE_NTOHL (0x44656653), 
-    ACE_NTOHL (0x65710000),  // name = ProvidesDefSeq
-    CORBA::tk_sequence, // typecode kind
-    72, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_objref, // typecode kind
-      56, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f50), 
-        ACE_NTOHL (0x726f7669), 
-        ACE_NTOHL (0x64657344), 
-        ACE_NTOHL (0x65663a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDef:1.0
-        12,
-        ACE_NTOHL (0x50726f76), 
-        ACE_NTOHL (0x69646573), 
-        ACE_NTOHL (0x44656600),  // name = ProvidesDef
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CS_)
+#define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CS_
 
-      0U,
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
+// *************************************************************
+// CORBA::ComponentIR::ProvidesDescriptionSeq
+// *************************************************************
 
-  16,
-  ACE_NTOHL (0x75736573), 
-  ACE_NTOHL (0x5f696e74), 
-  ACE_NTOHL (0x65726661), 
-  ACE_NTOHL (0x63657300),  // name = uses_interfaces
-  CORBA::tk_alias, // typecode kind for typedefs
-  128, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f55), 
-    ACE_NTOHL (0x73657344), 
-    ACE_NTOHL (0x65665365), 
-    ACE_NTOHL (0x713a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/UsesDefSeq:1.0
-    11,
-    ACE_NTOHL (0x55736573), 
-    ACE_NTOHL (0x44656653), 
-    ACE_NTOHL (0x65710000),  // name = UsesDefSeq
-    CORBA::tk_sequence, // typecode kind
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_objref, // typecode kind
-      48, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        27,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f55), 
-        ACE_NTOHL (0x73657344), 
-        ACE_NTOHL (0x65663a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDef:1.0
-        8,
-        ACE_NTOHL (0x55736573), 
-        ACE_NTOHL (0x44656600),  // name = UsesDef
+CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (void)
+{}
 
-      0U,
+CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (CORBA::ULong max)
+  : 
 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ComponentIR::ProvidesDescription>
 
-  11,
-  ACE_NTOHL (0x61747472), 
-  ACE_NTOHL (0x69627574), 
-  ACE_NTOHL (0x65730000),  // name = attributes
-  CORBA::tk_alias, // typecode kind for typedefs
-  612, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    41,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4174), 
-    ACE_NTOHL (0x74724465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
-    19,
-    ACE_NTOHL (0x41747472), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
-    528, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      512, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4174), 
-        ACE_NTOHL (0x74726962), 
-        ACE_NTOHL (0x75746544), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-        21,
-        ACE_NTOHL (0x41747472), 
-        ACE_NTOHL (0x69627574), 
-        ACE_NTOHL (0x65446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
-        ACE_NTOHL (0x0),  // name = AttributeDescription
-        6, // member count
-        5,
-        ACE_NTOHL (0x6e616d65), 
-        ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
-          ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
 
-        3,
-        ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
-          ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
+CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ComponentIR::ProvidesDescription *buffer,
+    CORBA::Boolean release
+  )
+  : 
 
-        11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
-        ACE_NTOHL (0x696e0000),  // name = defined_in
-        0xffffffff, // indirection
-        0xffffff9c, // negative offset (-100)
-        8,
-        ACE_NTOHL (0x76657273), 
-        ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
-          ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ComponentIR::ProvidesDescription>
 
-        5,
-        ACE_NTOHL (0x74797065), 
-        ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
 
-        5,
-        ACE_NTOHL (0x6d6f6465), 
-        ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
-        104, // encapsulation length
-TAO_ENCAP_BYTE_ORDER, // byte order
-          36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
-          ACE_NTOHL (0x74726962), 
-          ACE_NTOHL (0x7574654d), 
-          ACE_NTOHL (0x6f64653a), 
-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
-          ACE_NTOHL (0x65000000),  // name = AttributeMode
-          2, // member count
-12,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f4e4f52), 
-          ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-14,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f524541), 
-          ACE_NTOHL (0x444f4e4c), 
-          ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
+CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (const ProvidesDescriptionSeq &seq)
+  : 
 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ComponentIR::ProvidesDescription>
 
-      0U,
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
 
+CORBA::ComponentIR::ProvidesDescriptionSeq::~ProvidesDescriptionSeq (void) // dtor
+{}
 
-  13,
-  ACE_NTOHL (0x656d6974), 
-  ACE_NTOHL (0x735f6576), 
-  ACE_NTOHL (0x656e7473), 
-  ACE_NTOHL (0x0),  // name = emits_events
-  CORBA::tk_alias, // typecode kind for typedefs
-  132, // encapsulation length
+void CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ProvidesDescriptionSeq *tmp = ACE_static_cast (ProvidesDescriptionSeq*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDescriptionSeq[] =
+{
     TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f45), 
-    ACE_NTOHL (0x6d697473), 
-    ACE_NTOHL (0x44656653), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/EmitsDefSeq:1.0
-    12,
-    ACE_NTOHL (0x456d6974), 
-    ACE_NTOHL (0x73446566), 
-    ACE_NTOHL (0x53657100),  // name = EmitsDefSeq
+  57,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5072), 
+  ACE_NTOHL (0x6f766964), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e536571), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0
+    23,
+  ACE_NTOHL (0x50726f76), 
+  ACE_NTOHL (0x69646573), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e53), 
+  ACE_NTOHL (0x65710000),  // name = ProvidesDescriptionSeq
     CORBA::tk_sequence, // typecode kind
-    68, // encapsulation length
+  424, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    408, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_objref, // typecode kind
-      52, // encapsulation length
+      54,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e7449), 
+      ACE_NTOHL (0x522f5072), 
+      ACE_NTOHL (0x6f766964), 
+      ACE_NTOHL (0x65734465), 
+      ACE_NTOHL (0x73637269), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e3a312e), 
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0
+            20,
+      ACE_NTOHL (0x50726f76), 
+      ACE_NTOHL (0x69646573), 
+      ACE_NTOHL (0x44657363), 
+      ACE_NTOHL (0x72697074), 
+      ACE_NTOHL (0x696f6e00),  // name = ProvidesDescription
+      5, // member count
+            5,
+      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x0),  // name = name
+            CORBA::tk_alias, // typecode kind for typedefs
+      68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        28,
+        33,
         ACE_NTOHL (0x49444c3a), 
         ACE_NTOHL (0x6f6d672e), 
         ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f45), 
-        ACE_NTOHL (0x6d697473), 
-        ACE_NTOHL (0x4465663a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EmitsDef:1.0
-        9,
-        ACE_NTOHL (0x456d6974), 
-        ACE_NTOHL (0x73446566), 
-        ACE_NTOHL (0x0),  // name = EmitsDef
-
-      0U,
-
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                11,
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x65720000),  // name = Identifier
+                CORBA::tk_string, 
+        0U, // string length
 
-  17,
-  ACE_NTOHL (0x7075626c), 
-  ACE_NTOHL (0x69736865), 
-  ACE_NTOHL (0x735f6576), 
-  ACE_NTOHL (0x656e7473), 
-  ACE_NTOHL (0x0),  // name = publishes_events
-  CORBA::tk_alias, // typecode kind for typedefs
-  148, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f50), 
-    ACE_NTOHL (0x75626c69), 
-    ACE_NTOHL (0x73686573), 
-    ACE_NTOHL (0x44656653), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/PublishesDefSeq:1.0
-    16,
-    ACE_NTOHL (0x5075626c), 
-    ACE_NTOHL (0x69736865), 
-    ACE_NTOHL (0x73446566), 
-    ACE_NTOHL (0x53657100),  // name = PublishesDefSeq
-    CORBA::tk_sequence, // typecode kind
-    76, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_objref, // typecode kind
-      60, // encapsulation length
+      3,
+      ACE_NTOHL (0x69640000),  // name = id
+            CORBA::tk_alias, // typecode kind for typedefs
+      72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        32,
+        35,
         ACE_NTOHL (0x49444c3a), 
         ACE_NTOHL (0x6f6d672e), 
         ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f50), 
-        ACE_NTOHL (0x75626c69), 
-        ACE_NTOHL (0x73686573), 
-        ACE_NTOHL (0x4465663a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PublishesDef:1.0
-        13,
-        ACE_NTOHL (0x5075626c), 
-        ACE_NTOHL (0x69736865), 
-        ACE_NTOHL (0x73446566), 
-        ACE_NTOHL (0x0),  // name = PublishesDef
-
-      0U,
-
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                13,
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x0),  // name = RepositoryId
+                CORBA::tk_string, 
+        0U, // string length
 
-  16,
-  ACE_NTOHL (0x636f6e73), 
-  ACE_NTOHL (0x756d6573), 
-  ACE_NTOHL (0x5f657665), 
-  ACE_NTOHL (0x6e747300),  // name = consumes_events
-  CORBA::tk_alias, // typecode kind for typedefs
-  144, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f43), 
-    ACE_NTOHL (0x6f6e7375), 
-    ACE_NTOHL (0x6d657344), 
-    ACE_NTOHL (0x65665365), 
-    ACE_NTOHL (0x713a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ConsumesDefSeq:1.0
-    15,
-    ACE_NTOHL (0x436f6e73), 
-    ACE_NTOHL (0x756d6573), 
-    ACE_NTOHL (0x44656653), 
-    ACE_NTOHL (0x65710000),  // name = ConsumesDefSeq
-    CORBA::tk_sequence, // typecode kind
-    72, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_objref, // typecode kind
-      56, // encapsulation length
+      11,
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x696e0000),  // name = defined_in
+            0xffffffff, // indirection
+      0xffffff9c, // negative offset (-100)
+      8,
+      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x696f6e00),  // name = version
+            CORBA::tk_alias, // typecode kind for typedefs
+      68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
+        34,
         ACE_NTOHL (0x49444c3a), 
         ACE_NTOHL (0x6f6d672e), 
         ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f43), 
-        ACE_NTOHL (0x6f6e7375), 
-        ACE_NTOHL (0x6d657344), 
-        ACE_NTOHL (0x65663a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ConsumesDef:1.0
-        12,
-        ACE_NTOHL (0x436f6e73), 
-        ACE_NTOHL (0x756d6573), 
-        ACE_NTOHL (0x44656600),  // name = ConsumesDef
-
-      0U,
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                12,
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x70656300),  // name = VersionSpec
+                CORBA::tk_string, 
+        0U, // string length
 
+      15,
+      ACE_NTOHL (0x696e7465), 
+      ACE_NTOHL (0x72666163), 
+      ACE_NTOHL (0x655f7479), 
+      ACE_NTOHL (0x70650000),  // name = interface_type
+            0xffffffff, // indirection
+      0xffffff28, // negative offset (-216)
 
-  9,
-  ACE_NTOHL (0x69735f62), 
-  ACE_NTOHL (0x61736963), 
-  ACE_NTOHL (0x0),  // name = is_basic
-  CORBA::tk_boolean,
+    0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDescription (
-    CORBA::tk_struct,
-    sizeof (_oc_IR_ComponentDescription),
-    (char *) &_oc_IR_ComponentDescription,
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ProvidesDescriptionSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ComponentIR_ProvidesDescriptionSeq),
+    (char *) &_oc_CORBA_ComponentIR_ProvidesDescriptionSeq,
     0,
-    sizeof (IR::ComponentDescription)
+    sizeof (CORBA::ComponentIR::ProvidesDescriptionSeq)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
-    _tc_ComponentDescription,
-    &_tc_TAO_tc_IR_ComponentDescription
+    _tc_ProvidesDescriptionSeq,
+    &_tc_TAO_tc_CORBA_ComponentIR_ProvidesDescriptionSeq
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
 
-void IR::ComponentDescription::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ComponentDescription *tmp = ACE_static_cast (ComponentDescription*, _tao_void_pointer);
-  delete tmp;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-int IR::PrimaryKeyDef::_tao_class_id = 0;
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CS_
 
-IR::PrimaryKeyDef_ptr
-tao_IR_PrimaryKeyDef_duplicate (
-    IR::PrimaryKeyDef_ptr p
-  )
+void
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::_allocate_buffer (CORBA::ULong length)
 {
-  return IR::PrimaryKeyDef::_duplicate (p);
+  CORBA::ComponentIR::UsesDescription* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::ComponentIR::UsesDescription *old =
+        ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::freebuf (old);
+        }
+    }
+  
+  this->buffer_ = tmp;
 }
 
 void
-tao_IR_PrimaryKeyDef_release (
-    IR::PrimaryKeyDef_ptr p
-  )
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::_deallocate_buffer (void)
 {
-  CORBA::release (p);
-}
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ComponentIR::UsesDescription *tmp =
+    ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription *, this->buffer_);
+  _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::freebuf (tmp);
+  this->buffer_ = 0;
+} 
 
-IR::PrimaryKeyDef_ptr
-tao_IR_PrimaryKeyDef_nil (
-    void
-  )
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (void)
 {
-  return IR::PrimaryKeyDef::_nil ();
+  this->_deallocate_buffer ();
 }
 
-IR::PrimaryKeyDef_ptr
-tao_IR_PrimaryKeyDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return IR::PrimaryKeyDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
+#endif /* end #if !defined */
 
-CORBA::Object *
-tao_IR_PrimaryKeyDef_upcast (
-    void *src
-  )
-{
-  IR::PrimaryKeyDef **tmp =
-    ACE_static_cast (IR::PrimaryKeyDef **, src);
-  return *tmp;
-}
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CS_)
+#define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
-// IR::PrimaryKeyDef_var
+// CORBA::ComponentIR::UsesDescriptionSeq
 // *************************************************************
 
-IR::PrimaryKeyDef_var::PrimaryKeyDef_var (void)
-  : ptr_ (PrimaryKeyDef::_nil ())
+CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (void)
 {}
 
-::IR::PrimaryKeyDef_ptr
-IR::PrimaryKeyDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-IR::PrimaryKeyDef_var::PrimaryKeyDef_var (const ::IR::PrimaryKeyDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (PrimaryKeyDef::_duplicate (p.ptr ()))
-{}
-
-IR::PrimaryKeyDef_var::~PrimaryKeyDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-IR::PrimaryKeyDef_var &
-IR::PrimaryKeyDef_var::operator= (PrimaryKeyDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-IR::PrimaryKeyDef_var &
-IR::PrimaryKeyDef_var::operator= (const ::IR::PrimaryKeyDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::PrimaryKeyDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-IR::PrimaryKeyDef_var::operator const ::IR::PrimaryKeyDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-IR::PrimaryKeyDef_var::operator ::IR::PrimaryKeyDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::IR::PrimaryKeyDef_ptr
-IR::PrimaryKeyDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::IR::PrimaryKeyDef_ptr
-IR::PrimaryKeyDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::IR::PrimaryKeyDef_ptr &
-IR::PrimaryKeyDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::IR::PrimaryKeyDef_ptr &
-IR::PrimaryKeyDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::PrimaryKeyDef::_nil ();
-  return this->ptr_;
-}
-
-::IR::PrimaryKeyDef_ptr
-IR::PrimaryKeyDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::IR::PrimaryKeyDef_ptr val = this->ptr_;
-  this->ptr_ = ::IR::PrimaryKeyDef::_nil ();
-  return val;
-}
-
-::IR::PrimaryKeyDef_ptr
-IR::PrimaryKeyDef_var::tao_duplicate (PrimaryKeyDef_ptr p)
-{
-  return ::IR::PrimaryKeyDef::_duplicate (p);
-}
+CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (CORBA::ULong max)
+  : 
 
-void
-IR::PrimaryKeyDef_var::tao_release (PrimaryKeyDef_ptr p)
-{
-  CORBA::release (p);
-}
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ComponentIR::UsesDescription>
 
-::IR::PrimaryKeyDef_ptr
-IR::PrimaryKeyDef_var::tao_nil (void)
-{
-  return ::IR::PrimaryKeyDef::_nil ();
-}
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
 
-::IR::PrimaryKeyDef_ptr
-IR::PrimaryKeyDef_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
+CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ComponentIR::UsesDescription *buffer,
+    CORBA::Boolean release
   )
-{
-  return ::IR::PrimaryKeyDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-IR::PrimaryKeyDef_var::tao_upcast (void *src)
-{
-  PrimaryKeyDef **tmp =
-    ACE_static_cast (PrimaryKeyDef **, src);
-  return *tmp;
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1030
-
-// *************************************************************
-// IR::PrimaryKeyDef_out
-// *************************************************************
-
-IR::PrimaryKeyDef_out::PrimaryKeyDef_out (PrimaryKeyDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::IR::PrimaryKeyDef::_nil ();
-}
+  : 
 
-IR::PrimaryKeyDef_out::PrimaryKeyDef_out (PrimaryKeyDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::PrimaryKeyDef::_nil ();
-}
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ComponentIR::UsesDescription>
 
-IR::PrimaryKeyDef_out::PrimaryKeyDef_out (const ::IR::PrimaryKeyDef_out &p)
-  : ptr_ (ACE_const_cast (PrimaryKeyDef_out &, p).ptr_)
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
 {}
 
-::IR::PrimaryKeyDef_out &
-IR::PrimaryKeyDef_out::operator= (const ::IR::PrimaryKeyDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (PrimaryKeyDef_out&, p).ptr_;
-  return *this;
-}
-
-IR::PrimaryKeyDef_out &
-IR::PrimaryKeyDef_out::operator= (const ::IR::PrimaryKeyDef_var &p)
-{
-  this->ptr_ = ::IR::PrimaryKeyDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-IR::PrimaryKeyDef_out &
-IR::PrimaryKeyDef_out::operator= (PrimaryKeyDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-IR::PrimaryKeyDef_out::operator ::IR::PrimaryKeyDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::IR::PrimaryKeyDef_ptr &
-IR::PrimaryKeyDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::IR::PrimaryKeyDef_ptr
-IR::PrimaryKeyDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * primary_key_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (const UsesDescriptionSeq &seq)
+  : 
 
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ComponentIR::UsesDescription>
 
-    void result (::CORBA::Boolean result);
-    
-  private:
-    TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a &);
-    void operator= (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a &);
-    const char * primary_key_id_;
-    
-    ::CORBA::Boolean _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-  
-  TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * primary_key_id
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      primary_key_id_ (primary_key_id)
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
 {}
 
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
-  parameter_list->length (1);
-  CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<= primary_key_id_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
+CORBA::ComponentIR::UsesDescriptionSeq::~UsesDescriptionSeq (void) // dtor
+{}
 
-CORBA::Any * 
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+void CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
+  UsesDescriptionSeq *tmp = ACE_static_cast (UsesDescriptionSeq*, _tao_void_pointer);
+  delete tmp;
 }
 
-void 
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Boolean result)
-{
-  // Update the result. 
-  this->_result = result;
-}
+#endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-class TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get : public TAO_ClientRequestInfo_i
+static const CORBA::Long _oc_CORBA_ComponentIR_UsesDescriptionSeq[] =
 {
-public:
-  TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void result (::CORBA::ValueDef_ptr result);
-    
-  private:
-    TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
-    
-    ::CORBA::ValueDef_ptr _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-  
-  TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
-{}
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  53,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5573), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e536571), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0
+    19,
+  ACE_NTOHL (0x55736573), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e53), 
+  ACE_NTOHL (0x65710000),  // name = UsesDescriptionSeq
+    CORBA::tk_sequence, // typecode kind
+  436, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    420, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      50,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e7449), 
+      ACE_NTOHL (0x522f5573), 
+      ACE_NTOHL (0x65734465), 
+      ACE_NTOHL (0x73637269), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e3a312e), 
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0
+            16,
+      ACE_NTOHL (0x55736573), 
+      ACE_NTOHL (0x44657363), 
+      ACE_NTOHL (0x72697074), 
+      ACE_NTOHL (0x696f6e00),  // name = UsesDescription
+      6, // member count
+            5,
+      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x0),  // name = name
+            CORBA::tk_alias, // typecode kind for typedefs
+      68, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        33,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                11,
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x65720000),  // name = Identifier
+                CORBA::tk_string, 
+        0U, // string length
 
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
+      3,
+      ACE_NTOHL (0x69640000),  // name = id
+            CORBA::tk_alias, // typecode kind for typedefs
+      72, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        35,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                13,
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x0),  // name = RepositoryId
+                CORBA::tk_string, 
+        0U, // string length
 
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
+      11,
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x696e0000),  // name = defined_in
+            0xffffffff, // indirection
+      0xffffff9c, // negative offset (-100)
+      8,
+      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x696f6e00),  // name = version
+            CORBA::tk_alias, // typecode kind for typedefs
+      68, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        34,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                12,
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x70656300),  // name = VersionSpec
+                CORBA::tk_string, 
+        0U, // string length
 
-CORBA::Any * 
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
+      15,
+      ACE_NTOHL (0x696e7465), 
+      ACE_NTOHL (0x72666163), 
+      ACE_NTOHL (0x655f7479), 
+      ACE_NTOHL (0x70650000),  // name = interface_type
+            0xffffffff, // indirection
+      0xffffff28, // negative offset (-216)
+      12,
+      ACE_NTOHL (0x69735f6d), 
+      ACE_NTOHL (0x756c7469), 
+      ACE_NTOHL (0x706c6500),  // name = is_multiple
+            CORBA::tk_boolean,
 
-void 
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (::CORBA::ValueDef_ptr result)
-{
-  // Update the result. 
-  this->_result = result;
-}
 
-#endif /* TAO_HAS_INTERCEPTORS */
+    0U,
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+};
 
-///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
-//
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_UsesDescriptionSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ComponentIR_UsesDescriptionSeq),
+    (char *) &_oc_CORBA_ComponentIR_UsesDescriptionSeq,
+    0,
+    sizeof (CORBA::ComponentIR::UsesDescriptionSeq)
+  );
 
-IR::_TAO_PrimaryKeyDef_Proxy_Impl::_TAO_PrimaryKeyDef_Proxy_Impl (void)
-{}
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_UsesDescriptionSeq,
+    &_tc_TAO_tc_CORBA_ComponentIR_UsesDescriptionSeq
+  )
+TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::_TAO_PrimaryKeyDef_Remote_Proxy_Impl (void)
-{}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
 
-// Remote Implementation of the IDL interface methods
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CS_
 
-CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
-    CORBA::Object *_collocated_tao_target_,
-    const char * primary_key_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+void
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::_allocate_buffer (CORBA::ULong length)
 {
-  CORBA::Boolean _tao_retval = 0;
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  CORBA::ComponentIR::EventPortDescription* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (length);
   
-  if (istub == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
-    }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "is_a",
-      4,
-      1,
-      istub->orb_core ()
-    );
-  
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
+  if (this->buffer_ != 0)
     {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          primary_key_id
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+      CORBA::ComponentIR::EventPortDescription *old =
+        ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription *, this->buffer_);
       
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << primary_key_id)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      _tao_retval
-                    );
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-                  
-                  if (!(
-                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Boolean _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-              || _tao_status == PortableInterceptor::USER_EXCEPTION)
-            {
-              ACE_RE_THROW;
-            }
+          tmp[i] = old[i];
         }
       
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-      ACE_CATCHALL
+      if (this->release_)
         {
-          CORBA::UNKNOWN ex;
-          
-          _tao_ri.exception (&ex);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
-            ACE_TRY_THROW (ex);
+          _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::freebuf (old);
         }
-# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval);
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
     }
-
-return _tao_retval;
+  
+  this->buffer_ = tmp;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
-
-::CORBA::ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
-    CORBA::Object *_collocated_tao_target_
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+void
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::_deallocate_buffer (void)
 {
-  CORBA::ValueDef_var _tao_retval (CORBA::ValueDef::_nil ());
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
-  if (istub == 0)
+  if (this->buffer_ == 0 || this->release_ == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+      return;
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_primary_key",
-      16,
-      0,
-      istub->orb_core ()
-    );
-  
-  int _invoke_status;
   
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          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 ());
-
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ValueDef_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;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-              || _tao_status == PortableInterceptor::USER_EXCEPTION)
-            {
-              ACE_RE_THROW;
-            }
-        }
-      
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-      ACE_CATCHALL
-        {
-          CORBA::UNKNOWN ex;
-          
-          _tao_ri.exception (&ex);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const PortableInterceptor::ReplyStatus _tao_status =
-            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          
-          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
-            ACE_TRY_THROW (ex);
-        }
-# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      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)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-
-return _tao_retval._retn ();
-}
-
-//
-//            End  Base & Remote  Proxy Implemeentation. 
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
-
-///////////////////////////////////////////////////////////////////////
-//           Remote & Base  Proxy Broker Implementation
-//
-
-IR::_TAO_PrimaryKeyDef_Proxy_Broker::_TAO_PrimaryKeyDef_Proxy_Broker (void)
-{
-}
+  CORBA::ComponentIR::EventPortDescription *tmp =
+    ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription *, this->buffer_);
+  _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::freebuf (tmp);
+  this->buffer_ = 0;
+} 
 
-IR::_TAO_PrimaryKeyDef_Proxy_Broker::~_TAO_PrimaryKeyDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (void)
 {
+  this->_deallocate_buffer ();
 }
 
-IR::_TAO_PrimaryKeyDef_Proxy_Broker * (*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker *
-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
-{
-  static ::IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker remote_proxy_broker;
-  return &remote_proxy_broker;
-}
+#endif /* end #if !defined */
 
-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
-{
-}
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
-{
-}
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CS_)
+#define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CS_
 
-IR::_TAO_PrimaryKeyDef_Proxy_Impl&
-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::select_proxy (
-    ::IR::PrimaryKeyDef *
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return this->remote_proxy_impl_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
-//
-//           End Remote & Base Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
+// *************************************************************
+// CORBA::ComponentIR::EventPortDescriptionSeq
+// *************************************************************
 
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (void)
+{}
 
-IR::PrimaryKeyDef::PrimaryKeyDef (int collocated)
-{
-  this->IR_PrimaryKeyDef_setup_collocation (collocated);
-}
+CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (CORBA::ULong max)
+  : 
 
-void
-IR::PrimaryKeyDef::IR_PrimaryKeyDef_setup_collocation (int collocated)
-{
-  if (collocated)
-    this->the_TAO_PrimaryKeyDef_Proxy_Broker_ =
-      ::IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer (this);
-  else
-    this->the_TAO_PrimaryKeyDef_Proxy_Broker_ =
-      ::IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker ();
-  
-  this->CORBA_Contained_setup_collocation (collocated);
-}
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ComponentIR::EventPortDescription>
 
-IR::PrimaryKeyDef::~PrimaryKeyDef (void)
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
 {}
 
-void 
-IR::PrimaryKeyDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PrimaryKeyDef *tmp = ACE_static_cast (PrimaryKeyDef *, _tao_void_pointer);
-  CORBA::release (tmp);
-}
-
-IR::PrimaryKeyDef_ptr
-IR::PrimaryKeyDef::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
+CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ComponentIR::EventPortDescription *buffer,
+    CORBA::Boolean release
   )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return PrimaryKeyDef::_nil ();
-    }
-  
-  if (! obj->_is_local ())
-    {
-      CORBA::Boolean is_a =
-        obj->_is_a (
-            "IDL:omg.org/IR/PrimaryKeyDef:1.0"
-            ACE_ENV_ARG_PARAMETER
-          );
-      ACE_CHECK_RETURN (PrimaryKeyDef::_nil ());
-      
-      if (is_a == 0)
-        {
-          return PrimaryKeyDef::_nil ();
-        }
-    }
-  
-  return PrimaryKeyDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
+  : 
 
-IR::PrimaryKeyDef_ptr 
-IR::PrimaryKeyDef::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return PrimaryKeyDef::_nil ();
-    }
-  
-  if (! obj->_is_local ())
-    {
-      TAO_Stub* stub = obj->_stubobj ();
-      
-      if (stub != 0)
-        {
-          stub->_incr_refcnt ();
-        }
-      
-      PrimaryKeyDef_ptr default_proxy = PrimaryKeyDef::_nil ();
-      
-      if (
-          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&
-          IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer != 0
-        )
-        {
-          ACE_NEW_RETURN (
-              default_proxy,
-              ::IR::PrimaryKeyDef (
-                  stub,
-                  1,
-                  obj->_servant ()
-                ),
-              PrimaryKeyDef::_nil ()
-            );
-        }
-      
-      if (CORBA::is_nil (default_proxy))
-        {
-          ACE_NEW_RETURN (
-              default_proxy,
-              ::IR::PrimaryKeyDef (
-                  stub,
-                  0,
-                  obj->_servant ()
-                ),
-              PrimaryKeyDef::_nil ()
-            );
-        }
-      
-      return default_proxy;
-    }
-  else 
-    return
-      ACE_reinterpret_cast (
-          PrimaryKeyDef_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptr_arith_t,
-                  &PrimaryKeyDef::_tao_class_id
-                )
-            )
-        );
-}
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ComponentIR::EventPortDescription>
 
-IR::PrimaryKeyDef_ptr
-IR::PrimaryKeyDef::_duplicate (PrimaryKeyDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
 
-CORBA::Boolean
-IR::PrimaryKeyDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/IR/PrimaryKeyDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
+CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (const EventPortDescriptionSeq &seq)
+  : 
 
-void *IR::PrimaryKeyDef::_tao_QueryInterface (ptr_arith_t type)
-{
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, PrimaryKeyDef)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
-              &::CORBA::Contained::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Contained_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
-              &::CORBA::IRObject::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::IRObject_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptr_arith_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
-}
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ComponentIR::EventPortDescription>
 
-const char* IR::PrimaryKeyDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/IR/PrimaryKeyDef:1.0";
-}
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+CORBA::ComponentIR::EventPortDescriptionSeq::~EventPortDescriptionSeq (void) // dtor
+{}
 
-CORBA::Boolean IR::PrimaryKeyDef::is_a (
-    const char * primary_key_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+void CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  _TAO_PrimaryKeyDef_Proxy_Impl &proxy = 
-    this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.is_a (
-      this,
-      primary_key_id
-      ACE_ENV_ARG_PARAMETER
-    );
+  EventPortDescriptionSeq *tmp = ACE_static_cast (EventPortDescriptionSeq*, _tao_void_pointer);
+  delete tmp;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-::CORBA::ValueDef_ptr IR::PrimaryKeyDef::primary_key (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  _TAO_PrimaryKeyDef_Proxy_Impl &proxy = 
-    this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.primary_key (
-      this
-      ACE_ENV_ARG_PARAMETER
-    );
-}
+#endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_PrimaryKeyDef[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
+  58,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x72696d61), 
-  ACE_NTOHL (0x72794b65), 
-  ACE_NTOHL (0x79446566), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/PrimaryKeyDef:1.0
-  14,
-  ACE_NTOHL (0x5072696d), 
-  ACE_NTOHL (0x6172794b), 
-  ACE_NTOHL (0x65794465), 
-  ACE_NTOHL (0x66000000),  // name = PrimaryKeyDef
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4576), 
+  ACE_NTOHL (0x656e7450), 
+  ACE_NTOHL (0x6f727444), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e5365), 
+  ACE_NTOHL (0x713a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0
+    24,
+  ACE_NTOHL (0x4576656e), 
+  ACE_NTOHL (0x74506f72), 
+  ACE_NTOHL (0x74446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x53657100),  // name = EventPortDescriptionSeq
+    CORBA::tk_sequence, // typecode kind
+  420, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    404, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      55,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e7449), 
+      ACE_NTOHL (0x522f4576), 
+      ACE_NTOHL (0x656e7450), 
+      ACE_NTOHL (0x6f727444), 
+      ACE_NTOHL (0x65736372), 
+      ACE_NTOHL (0x69707469), 
+      ACE_NTOHL (0x6f6e3a31), 
+      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0
+            21,
+      ACE_NTOHL (0x4576656e), 
+      ACE_NTOHL (0x74506f72), 
+      ACE_NTOHL (0x74446573), 
+      ACE_NTOHL (0x63726970), 
+      ACE_NTOHL (0x74696f6e), 
+      ACE_NTOHL (0x0),  // name = EventPortDescription
+      5, // member count
+            5,
+      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x0),  // name = name
+            CORBA::tk_alias, // typecode kind for typedefs
+      68, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        33,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                11,
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x65720000),  // name = Identifier
+                CORBA::tk_string, 
+        0U, // string length
+
+      3,
+      ACE_NTOHL (0x69640000),  // name = id
+            CORBA::tk_alias, // typecode kind for typedefs
+      72, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        35,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                13,
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x0),  // name = RepositoryId
+                CORBA::tk_string, 
+        0U, // string length
+
+      11,
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x696e0000),  // name = defined_in
+            0xffffffff, // indirection
+      0xffffff9c, // negative offset (-100)
+      8,
+      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x696f6e00),  // name = version
+            CORBA::tk_alias, // typecode kind for typedefs
+      68, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        34,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                12,
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x70656300),  // name = VersionSpec
+                CORBA::tk_string, 
+        0U, // string length
+
+      6,
+      ACE_NTOHL (0x6576656e), 
+      ACE_NTOHL (0x74000000),  // name = event
+            0xffffffff, // indirection
+      0xffffff30, // negative offset (-208)
+
+    0U,
+
 };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_PrimaryKeyDef (
-    CORBA::tk_objref,
-    sizeof (_oc_IR_PrimaryKeyDef),
-    (char *) &_oc_IR_PrimaryKeyDef,
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_EventPortDescriptionSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ComponentIR_EventPortDescriptionSeq),
+    (char *) &_oc_CORBA_ComponentIR_EventPortDescriptionSeq,
     0,
-    sizeof (IR::PrimaryKeyDef)
+    sizeof (CORBA::ComponentIR::EventPortDescriptionSeq)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
-    _tc_PrimaryKeyDef,
-    &_tc_TAO_tc_IR_PrimaryKeyDef
+    _tc_EventPortDescriptionSeq,
+    &_tc_TAO_tc_CORBA_ComponentIR_EventPortDescriptionSeq
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_PrimaryKeyDescription[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
+  55,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f50), 
-  ACE_NTOHL (0x72696d61), 
-  ACE_NTOHL (0x72794b65), 
-  ACE_NTOHL (0x79446573), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7444), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ComponentDescription:1.0
+    21,
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x74446573), 
   ACE_NTOHL (0x63726970), 
   ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/PrimaryKeyDescription:1.0
-  22,
-  ACE_NTOHL (0x5072696d), 
-  ACE_NTOHL (0x6172794b), 
-  ACE_NTOHL (0x65794465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e000000),  // name = PrimaryKeyDescription
-  5, // member count
-  5,
+  ACE_NTOHL (0x0),  // name = ComponentDescription
+  13, // member count
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
+    33,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f49), 
-    ACE_NTOHL (0x64656e74), 
-    ACE_NTOHL (0x69666965), 
-    ACE_NTOHL (0x723a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
-    11,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
+    35,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
-    13,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+        13,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x64656669), 
   ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
-  0xffffffa0, // negative offset (-96)
+    0xffffffff, // indirection
+  0xffffff9c, // negative offset (-100)
   8,
   ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
+    34,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f56), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5370), 
-    ACE_NTOHL (0x65633a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
-    12,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+        12,
     ACE_NTOHL (0x56657273), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
-  12,
-  ACE_NTOHL (0x7072696d), 
-  ACE_NTOHL (0x6172795f), 
-  ACE_NTOHL (0x6b657900),  // name = primary_key
-  CORBA::tk_objref, // typecode kind
-  56, // encapsulation length
+  15,
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f636f6d), 
+  ACE_NTOHL (0x706f6e65), 
+  ACE_NTOHL (0x6e740000),  // name = base_component
+    0xffffffff, // indirection
+  0xffffff28, // negative offset (-216)
+  21,
+  ACE_NTOHL (0x73757070), 
+  ACE_NTOHL (0x6f727465), 
+  ACE_NTOHL (0x645f696e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636573), 
+  ACE_NTOHL (0x0),  // name = supported_interfaces
+    CORBA::tk_alias, // typecode kind for typedefs
+  92, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
+    38,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
     ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5661), 
-    ACE_NTOHL (0x6c756544), 
-    ACE_NTOHL (0x65663a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-    9,
-    ACE_NTOHL (0x56616c75), 
-    ACE_NTOHL (0x65446566), 
-    ACE_NTOHL (0x0),  // name = ValueDef
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
+        16,
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
+        CORBA::tk_sequence, // typecode kind
+    16, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      0xffffffff, // indirection
+      0xfffffeac, // negative offset (-340)
+      0U,
+
+
+  20,
+  ACE_NTOHL (0x70726f76), 
+  ACE_NTOHL (0x69646564), 
+  ACE_NTOHL (0x5f696e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63657300),  // name = provided_interfaces
+    CORBA::tk_alias, // typecode kind for typedefs
+  320, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    57,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f436f), 
+    ACE_NTOHL (0x6d706f6e), 
+    ACE_NTOHL (0x656e7449), 
+    ACE_NTOHL (0x522f5072), 
+    ACE_NTOHL (0x6f766964), 
+    ACE_NTOHL (0x65734465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0
+        23,
+    ACE_NTOHL (0x50726f76), 
+    ACE_NTOHL (0x69646573), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65710000),  // name = ProvidesDescriptionSeq
+        CORBA::tk_sequence, // typecode kind
+    216, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      200, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        54,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f436f), 
+        ACE_NTOHL (0x6d706f6e), 
+        ACE_NTOHL (0x656e7449), 
+        ACE_NTOHL (0x522f5072), 
+        ACE_NTOHL (0x6f766964), 
+        ACE_NTOHL (0x65734465), 
+        ACE_NTOHL (0x73637269), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e3a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0
+                20,
+        ACE_NTOHL (0x50726f76), 
+        ACE_NTOHL (0x69646573), 
+        ACE_NTOHL (0x44657363), 
+        ACE_NTOHL (0x72697074), 
+        ACE_NTOHL (0x696f6e00),  // name = ProvidesDescription
+        5, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                0xffffffff, // indirection
+        0xfffffd50, // negative offset (-688)
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                0xffffffff, // indirection
+        0xfffffd94, // negative offset (-620)
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                0xffffffff, // indirection
+        0xfffffd7c, // negative offset (-644)
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                0xffffffff, // indirection
+        0xfffffddc, // negative offset (-548)
+        15,
+        ACE_NTOHL (0x696e7465), 
+        ACE_NTOHL (0x72666163), 
+        ACE_NTOHL (0x655f7479), 
+        ACE_NTOHL (0x70650000),  // name = interface_type
+                0xffffffff, // indirection
+        0xfffffd4c, // negative offset (-692)
+
+      0U,
+
+
+  16,
+  ACE_NTOHL (0x75736564), 
+  ACE_NTOHL (0x5f696e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63657300),  // name = used_interfaces
+    CORBA::tk_alias, // typecode kind for typedefs
+  324, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    53,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f436f), 
+    ACE_NTOHL (0x6d706f6e), 
+    ACE_NTOHL (0x656e7449), 
+    ACE_NTOHL (0x522f5573), 
+    ACE_NTOHL (0x65734465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0
+        19,
+    ACE_NTOHL (0x55736573), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65710000),  // name = UsesDescriptionSeq
+        CORBA::tk_sequence, // typecode kind
+    228, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      212, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        50,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f436f), 
+        ACE_NTOHL (0x6d706f6e), 
+        ACE_NTOHL (0x656e7449), 
+        ACE_NTOHL (0x522f5573), 
+        ACE_NTOHL (0x65734465), 
+        ACE_NTOHL (0x73637269), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e3a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0
+                16,
+        ACE_NTOHL (0x55736573), 
+        ACE_NTOHL (0x44657363), 
+        ACE_NTOHL (0x72697074), 
+        ACE_NTOHL (0x696f6e00),  // name = UsesDescription
+        6, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                0xffffffff, // indirection
+        0xfffffc04, // negative offset (-1020)
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                0xffffffff, // indirection
+        0xfffffc48, // negative offset (-952)
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                0xffffffff, // indirection
+        0xfffffc30, // negative offset (-976)
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                0xffffffff, // indirection
+        0xfffffc90, // negative offset (-880)
+        15,
+        ACE_NTOHL (0x696e7465), 
+        ACE_NTOHL (0x72666163), 
+        ACE_NTOHL (0x655f7479), 
+        ACE_NTOHL (0x70650000),  // name = interface_type
+                0xffffffff, // indirection
+        0xfffffc00, // negative offset (-1024)
+        12,
+        ACE_NTOHL (0x69735f6d), 
+        ACE_NTOHL (0x756c7469), 
+        ACE_NTOHL (0x706c6500),  // name = is_multiple
+                CORBA::tk_boolean,
+
+
+      0U,
+
+
+  13,
+  ACE_NTOHL (0x656d6974), 
+  ACE_NTOHL (0x735f6576), 
+  ACE_NTOHL (0x656e7473), 
+  ACE_NTOHL (0x0),  // name = emits_events
+    CORBA::tk_alias, // typecode kind for typedefs
+  316, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    58,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f436f), 
+    ACE_NTOHL (0x6d706f6e), 
+    ACE_NTOHL (0x656e7449), 
+    ACE_NTOHL (0x522f4576), 
+    ACE_NTOHL (0x656e7450), 
+    ACE_NTOHL (0x6f727444), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0
+        24,
+    ACE_NTOHL (0x4576656e), 
+    ACE_NTOHL (0x74506f72), 
+    ACE_NTOHL (0x74446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x53657100),  // name = EventPortDescriptionSeq
+        CORBA::tk_sequence, // typecode kind
+    212, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      196, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        55,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f436f), 
+        ACE_NTOHL (0x6d706f6e), 
+        ACE_NTOHL (0x656e7449), 
+        ACE_NTOHL (0x522f4576), 
+        ACE_NTOHL (0x656e7450), 
+        ACE_NTOHL (0x6f727444), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0
+                21,
+        ACE_NTOHL (0x4576656e), 
+        ACE_NTOHL (0x74506f72), 
+        ACE_NTOHL (0x74446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x0),  // name = EventPortDescription
+        5, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                0xffffffff, // indirection
+        0xfffffa90, // negative offset (-1392)
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                0xffffffff, // indirection
+        0xfffffad4, // negative offset (-1324)
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                0xffffffff, // indirection
+        0xfffffabc, // negative offset (-1348)
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                0xffffffff, // indirection
+        0xfffffb1c, // negative offset (-1252)
+        6,
+        ACE_NTOHL (0x6576656e), 
+        ACE_NTOHL (0x74000000),  // name = event
+                0xffffffff, // indirection
+        0xfffffa94, // negative offset (-1388)
+
+      0U,
+
+
+  17,
+  ACE_NTOHL (0x7075626c), 
+  ACE_NTOHL (0x69736865), 
+  ACE_NTOHL (0x735f6576), 
+  ACE_NTOHL (0x656e7473), 
+  ACE_NTOHL (0x0),  // name = publishes_events
+    0xffffffff, // indirection
+  0xfffffea0, // negative offset (-352)
+  16,
+  ACE_NTOHL (0x636f6e73), 
+  ACE_NTOHL (0x756d6573), 
+  ACE_NTOHL (0x5f657665), 
+  ACE_NTOHL (0x6e747300),  // name = consumes_events
+    0xffffffff, // indirection
+  0xfffffe84, // negative offset (-380)
+  11,
+  ACE_NTOHL (0x61747472), 
+  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x65730000),  // name = attributes
+    CORBA::tk_alias, // typecode kind for typedefs
+  744, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    44,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x74417474), 
+    ACE_NTOHL (0x72446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
+        22,
+    ACE_NTOHL (0x45787441), 
+    ACE_NTOHL (0x74747244), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
+        CORBA::tk_sequence, // typecode kind
+    656, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      640, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        46,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x74417474), 
+        ACE_NTOHL (0x72696275), 
+        ACE_NTOHL (0x74654465), 
+        ACE_NTOHL (0x73637269), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e3a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
+                24,
+        ACE_NTOHL (0x45787441), 
+        ACE_NTOHL (0x74747269), 
+        ACE_NTOHL (0x62757465), 
+        ACE_NTOHL (0x44657363), 
+        ACE_NTOHL (0x72697074), 
+        ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
+        8, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                0xffffffff, // indirection
+        0xfffff918, // negative offset (-1768)
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                0xffffffff, // indirection
+        0xfffff95c, // negative offset (-1700)
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                0xffffffff, // indirection
+        0xfffff944, // negative offset (-1724)
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                0xffffffff, // indirection
+        0xfffff9a4, // negative offset (-1628)
+        5,
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x0),  // name = type
+                CORBA::tk_TypeCode,
+
+        5,
+        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x0),  // name = mode
+                CORBA::tk_enum, // typecode kind
+        104, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+          36,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4174), 
+          ACE_NTOHL (0x74726962), 
+          ACE_NTOHL (0x7574654d), 
+          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
+          14,
+          ACE_NTOHL (0x41747472), 
+          ACE_NTOHL (0x69627574), 
+          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x65000000),  // name = AttributeMode
+          2, // member count
+          12,
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
+          14,
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f524541), 
+          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
+          
+        15,
+        ACE_NTOHL (0x6765745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = get_exceptions
+                CORBA::tk_alias, // typecode kind for typedefs
+        276, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          40,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+                    18,
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+                    CORBA::tk_sequence, // typecode kind
+          196, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_struct, // typecode kind
+            180, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              43,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                            21,
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x0),  // name = ExceptionDescription
+              5, // member count
+                            5,
+              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x0),  // name = name
+                            0xffffffff, // indirection
+              0xfffff770, // negative offset (-2192)
+              3,
+              ACE_NTOHL (0x69640000),  // name = id
+                            0xffffffff, // indirection
+              0xfffff7b4, // negative offset (-2124)
+              11,
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x696e0000),  // name = defined_in
+                            0xffffffff, // indirection
+              0xfffff79c, // negative offset (-2148)
+              8,
+              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x696f6e00),  // name = version
+                            0xffffffff, // indirection
+              0xfffff7fc, // negative offset (-2052)
+              5,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x0),  // name = type
+                            CORBA::tk_TypeCode,
+
+
+            0U,
+
+
+        15,
+        ACE_NTOHL (0x7075745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = put_exceptions
+                0xffffffff, // indirection
+        0xfffffecc, // negative offset (-308)
+
+      0U,
+
+
+  5,
+  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x0),  // name = type
+    CORBA::tk_TypeCode,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_PrimaryKeyDescription (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ComponentDescription (
     CORBA::tk_struct,
-    sizeof (_oc_IR_PrimaryKeyDescription),
-    (char *) &_oc_IR_PrimaryKeyDescription,
+    sizeof (_oc_CORBA_ComponentIR_ComponentDescription),
+    (char *) &_oc_CORBA_ComponentIR_ComponentDescription,
     0,
-    sizeof (IR::PrimaryKeyDescription)
+    sizeof (CORBA::ComponentIR::ComponentDescription)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
-    _tc_PrimaryKeyDescription,
-    &_tc_TAO_tc_IR_PrimaryKeyDescription
+    _tc_ComponentDescription,
+    &_tc_TAO_tc_CORBA_ComponentIR_ComponentDescription
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void IR::PrimaryKeyDescription::_tao_any_destructor (void *_tao_void_pointer)
+void CORBA::ComponentIR::ComponentDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
-  PrimaryKeyDescription *tmp = ACE_static_cast (PrimaryKeyDescription*, _tao_void_pointer);
+  ComponentDescription *tmp = ACE_static_cast (ComponentDescription*, _tao_void_pointer);
   delete tmp;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-int IR::FactoryDef::_tao_class_id = 0;
+int CORBA::ComponentIR::FactoryDef::_tao_class_id = 0;
 
-IR::FactoryDef_ptr
-tao_IR_FactoryDef_duplicate (
-    IR::FactoryDef_ptr p
+CORBA::ComponentIR::FactoryDef_ptr
+tao_CORBA_ComponentIR_FactoryDef_duplicate (
+    CORBA::ComponentIR::FactoryDef_ptr p
   )
 {
-  return IR::FactoryDef::_duplicate (p);
+  return CORBA::ComponentIR::FactoryDef::_duplicate (p);
 }
 
 void
-tao_IR_FactoryDef_release (
-    IR::FactoryDef_ptr p
+tao_CORBA_ComponentIR_FactoryDef_release (
+    CORBA::ComponentIR::FactoryDef_ptr p
   )
 {
   CORBA::release (p);
 }
 
-IR::FactoryDef_ptr
-tao_IR_FactoryDef_nil (
+CORBA::ComponentIR::FactoryDef_ptr
+tao_CORBA_ComponentIR_FactoryDef_nil (
     void
   )
 {
-  return IR::FactoryDef::_nil ();
+  return CORBA::ComponentIR::FactoryDef::_nil ();
 }
 
-IR::FactoryDef_ptr
-tao_IR_FactoryDef_narrow (
+CORBA::ComponentIR::FactoryDef_ptr
+tao_CORBA_ComponentIR_FactoryDef_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return IR::FactoryDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::FactoryDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-tao_IR_FactoryDef_upcast (
+tao_CORBA_ComponentIR_FactoryDef_upcast (
     void *src
   )
 {
-  IR::FactoryDef **tmp =
-    ACE_static_cast (IR::FactoryDef **, src);
+  CORBA::ComponentIR::FactoryDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::FactoryDef **, src);
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ComponentIR_FactoryDef_marshal (
+    CORBA::ComponentIR::FactoryDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
-// IR::FactoryDef_var
+// CORBA::ComponentIR::FactoryDef_var
 // *************************************************************
 
-IR::FactoryDef_var::FactoryDef_var (void)
+CORBA::ComponentIR::FactoryDef_var::FactoryDef_var (void)
   : ptr_ (FactoryDef::_nil ())
 {}
 
-::IR::FactoryDef_ptr
-IR::FactoryDef_var::ptr (void) const
+::CORBA::ComponentIR::FactoryDef_ptr
+CORBA::ComponentIR::FactoryDef_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-IR::FactoryDef_var::FactoryDef_var (const ::IR::FactoryDef_var &p)
+CORBA::ComponentIR::FactoryDef_var::FactoryDef_var (const ::CORBA::ComponentIR::FactoryDef_var &p)
   : TAO_Base_var (),
     ptr_ (FactoryDef::_duplicate (p.ptr ()))
 {}
 
-IR::FactoryDef_var::~FactoryDef_var (void)
+CORBA::ComponentIR::FactoryDef_var::~FactoryDef_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
-IR::FactoryDef_var &
-IR::FactoryDef_var::operator= (FactoryDef_ptr p)
+CORBA::ComponentIR::FactoryDef_var &
+CORBA::ComponentIR::FactoryDef_var::operator= (FactoryDef_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-IR::FactoryDef_var &
-IR::FactoryDef_var::operator= (const ::IR::FactoryDef_var &p)
+CORBA::ComponentIR::FactoryDef_var &
+CORBA::ComponentIR::FactoryDef_var::operator= (const ::CORBA::ComponentIR::FactoryDef_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::FactoryDef::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::ComponentIR::FactoryDef::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-IR::FactoryDef_var::operator const ::IR::FactoryDef_ptr &() const // cast
+CORBA::ComponentIR::FactoryDef_var::operator const ::CORBA::ComponentIR::FactoryDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-IR::FactoryDef_var::operator ::IR::FactoryDef_ptr &() // cast 
+CORBA::ComponentIR::FactoryDef_var::operator ::CORBA::ComponentIR::FactoryDef_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::IR::FactoryDef_ptr
-IR::FactoryDef_var::operator-> (void) const
+::CORBA::ComponentIR::FactoryDef_ptr
+CORBA::ComponentIR::FactoryDef_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::IR::FactoryDef_ptr
-IR::FactoryDef_var::in (void) const
+::CORBA::ComponentIR::FactoryDef_ptr
+CORBA::ComponentIR::FactoryDef_var::in (void) const
 {
   return this->ptr_;
 }
 
-::IR::FactoryDef_ptr &
-IR::FactoryDef_var::inout (void)
+::CORBA::ComponentIR::FactoryDef_ptr &
+CORBA::ComponentIR::FactoryDef_var::inout (void)
 {
   return this->ptr_;
 }
 
-::IR::FactoryDef_ptr &
-IR::FactoryDef_var::out (void)
+::CORBA::ComponentIR::FactoryDef_ptr &
+CORBA::ComponentIR::FactoryDef_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::FactoryDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::FactoryDef::_nil ();
   return this->ptr_;
 }
 
-::IR::FactoryDef_ptr
-IR::FactoryDef_var::_retn (void)
+::CORBA::ComponentIR::FactoryDef_ptr
+CORBA::ComponentIR::FactoryDef_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::IR::FactoryDef_ptr val = this->ptr_;
-  this->ptr_ = ::IR::FactoryDef::_nil ();
+  ::CORBA::ComponentIR::FactoryDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::FactoryDef::_nil ();
   return val;
 }
 
-::IR::FactoryDef_ptr
-IR::FactoryDef_var::tao_duplicate (FactoryDef_ptr p)
+::CORBA::ComponentIR::FactoryDef_ptr
+CORBA::ComponentIR::FactoryDef_var::tao_duplicate (FactoryDef_ptr p)
 {
-  return ::IR::FactoryDef::_duplicate (p);
+  return ::CORBA::ComponentIR::FactoryDef::_duplicate (p);
 }
 
 void
-IR::FactoryDef_var::tao_release (FactoryDef_ptr p)
+CORBA::ComponentIR::FactoryDef_var::tao_release (FactoryDef_ptr p)
 {
   CORBA::release (p);
 }
 
-::IR::FactoryDef_ptr
-IR::FactoryDef_var::tao_nil (void)
+::CORBA::ComponentIR::FactoryDef_ptr
+CORBA::ComponentIR::FactoryDef_var::tao_nil (void)
 {
-  return ::IR::FactoryDef::_nil ();
+  return ::CORBA::ComponentIR::FactoryDef::_nil ();
 }
 
-::IR::FactoryDef_ptr
-IR::FactoryDef_var::tao_narrow (
+::CORBA::ComponentIR::FactoryDef_ptr
+CORBA::ComponentIR::FactoryDef_var::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::FactoryDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::CORBA::ComponentIR::FactoryDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IR::FactoryDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::FactoryDef_var::tao_upcast (void *src)
 {
   FactoryDef **tmp =
     ACE_static_cast (FactoryDef **, src);
@@ -17670,85 +16186,85 @@ IR::FactoryDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
-// IR::FactoryDef_out
+// CORBA::ComponentIR::FactoryDef_out
 // *************************************************************
 
-IR::FactoryDef_out::FactoryDef_out (FactoryDef_ptr &p)
+CORBA::ComponentIR::FactoryDef_out::FactoryDef_out (FactoryDef_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::IR::FactoryDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::FactoryDef::_nil ();
 }
 
-IR::FactoryDef_out::FactoryDef_out (FactoryDef_var &p)
+CORBA::ComponentIR::FactoryDef_out::FactoryDef_out (FactoryDef_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::FactoryDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::FactoryDef::_nil ();
 }
 
-IR::FactoryDef_out::FactoryDef_out (const ::IR::FactoryDef_out &p)
+CORBA::ComponentIR::FactoryDef_out::FactoryDef_out (const ::CORBA::ComponentIR::FactoryDef_out &p)
   : ptr_ (ACE_const_cast (FactoryDef_out &, p).ptr_)
 {}
 
-::IR::FactoryDef_out &
-IR::FactoryDef_out::operator= (const ::IR::FactoryDef_out &p)
+::CORBA::ComponentIR::FactoryDef_out &
+CORBA::ComponentIR::FactoryDef_out::operator= (const ::CORBA::ComponentIR::FactoryDef_out &p)
 {
   this->ptr_ = ACE_const_cast (FactoryDef_out&, p).ptr_;
   return *this;
 }
 
-IR::FactoryDef_out &
-IR::FactoryDef_out::operator= (const ::IR::FactoryDef_var &p)
+CORBA::ComponentIR::FactoryDef_out &
+CORBA::ComponentIR::FactoryDef_out::operator= (const ::CORBA::ComponentIR::FactoryDef_var &p)
 {
-  this->ptr_ = ::IR::FactoryDef::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::ComponentIR::FactoryDef::_duplicate (p.ptr ());
   return *this;
 }
 
-IR::FactoryDef_out &
-IR::FactoryDef_out::operator= (FactoryDef_ptr p)
+CORBA::ComponentIR::FactoryDef_out &
+CORBA::ComponentIR::FactoryDef_out::operator= (FactoryDef_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-IR::FactoryDef_out::operator ::IR::FactoryDef_ptr &() // cast
+CORBA::ComponentIR::FactoryDef_out::operator ::CORBA::ComponentIR::FactoryDef_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::IR::FactoryDef_ptr &
-IR::FactoryDef_out::ptr (void)
+::CORBA::ComponentIR::FactoryDef_ptr &
+CORBA::ComponentIR::FactoryDef_out::ptr (void)
 {
   return this->ptr_;
 }
 
-::IR::FactoryDef_ptr
-IR::FactoryDef_out::operator-> (void)
+::CORBA::ComponentIR::FactoryDef_ptr
+CORBA::ComponentIR::FactoryDef_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
 
-IR::_TAO_FactoryDef_Proxy_Impl::_TAO_FactoryDef_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_FactoryDef_Proxy_Impl::_TAO_FactoryDef_Proxy_Impl (void)
 {}
 
-IR::_TAO_FactoryDef_Remote_Proxy_Impl::_TAO_FactoryDef_Remote_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_FactoryDef_Remote_Proxy_Impl::_TAO_FactoryDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
@@ -17758,43 +16274,43 @@ IR::_TAO_FactoryDef_Remote_Proxy_Impl::_TAO_FactoryDef_Remote_Proxy_Impl (void)
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
 //
 
-IR::_TAO_FactoryDef_Proxy_Broker::_TAO_FactoryDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_FactoryDef_Proxy_Broker::_TAO_FactoryDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_FactoryDef_Proxy_Broker::~_TAO_FactoryDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_FactoryDef_Proxy_Broker::~_TAO_FactoryDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_FactoryDef_Proxy_Broker * (*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_FactoryDef_Proxy_Broker * (*CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-IR::_TAO_FactoryDef_Remote_Proxy_Broker *
-IR::_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_FactoryDef_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker (void)
 {
-  static ::IR::_TAO_FactoryDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::CORBA::ComponentIR::_TAO_FactoryDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-IR::_TAO_FactoryDef_Remote_Proxy_Broker::_TAO_FactoryDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_FactoryDef_Remote_Proxy_Broker::_TAO_FactoryDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_FactoryDef_Remote_Proxy_Broker::~_TAO_FactoryDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_FactoryDef_Remote_Proxy_Broker::~_TAO_FactoryDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_FactoryDef_Proxy_Impl&
-IR::_TAO_FactoryDef_Remote_Proxy_Broker::select_proxy (
-    ::IR::FactoryDef *
+CORBA::ComponentIR::_TAO_FactoryDef_Proxy_Impl&
+CORBA::ComponentIR::_TAO_FactoryDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::FactoryDef *
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -17806,38 +16322,38 @@ IR::_TAO_FactoryDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
-IR::FactoryDef::FactoryDef (int collocated)
+CORBA::ComponentIR::FactoryDef::FactoryDef (int collocated)
 {
-  this->IR_FactoryDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_FactoryDef_setup_collocation (collocated);
 }
 
 void
-IR::FactoryDef::IR_FactoryDef_setup_collocation (int collocated)
+CORBA::ComponentIR::FactoryDef::CORBA_ComponentIR_FactoryDef_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_FactoryDef_Proxy_Broker_ =
-      ::IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer (this);
+      ::CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_FactoryDef_Proxy_Broker_ =
-      ::IR::_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker ();
+      ::CORBA::ComponentIR::_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker ();
   
   this->CORBA_OperationDef_setup_collocation (collocated);
 }
 
-IR::FactoryDef::~FactoryDef (void)
+CORBA::ComponentIR::FactoryDef::~FactoryDef (void)
 {}
 
 void 
-IR::FactoryDef::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ComponentIR::FactoryDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   FactoryDef *tmp = ACE_static_cast (FactoryDef *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IR::FactoryDef_ptr
-IR::FactoryDef::_narrow (
+CORBA::ComponentIR::FactoryDef_ptr
+CORBA::ComponentIR::FactoryDef::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -17851,7 +16367,7 @@ IR::FactoryDef::_narrow (
     {
       CORBA::Boolean is_a =
         obj->_is_a (
-            "IDL:omg.org/IR/FactoryDef:1.0"
+            "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0"
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (FactoryDef::_nil ());
@@ -17865,8 +16381,8 @@ IR::FactoryDef::_narrow (
   return FactoryDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IR::FactoryDef_ptr 
-IR::FactoryDef::_unchecked_narrow (
+CORBA::ComponentIR::FactoryDef_ptr 
+CORBA::ComponentIR::FactoryDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -17891,12 +16407,12 @@ IR::FactoryDef::_unchecked_narrow (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&
-          IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer != 0
+          CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer != 0
         )
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::FactoryDef (
+              ::CORBA::ComponentIR::FactoryDef (
                   stub,
                   1,
                   obj->_servant ()
@@ -17909,7 +16425,7 @@ IR::FactoryDef::_unchecked_narrow (
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::FactoryDef (
+              ::CORBA::ComponentIR::FactoryDef (
                   stub,
                   0,
                   obj->_servant ()
@@ -17933,8 +16449,8 @@ IR::FactoryDef::_unchecked_narrow (
         );
 }
 
-IR::FactoryDef_ptr
-IR::FactoryDef::_duplicate (FactoryDef_ptr obj)
+CORBA::ComponentIR::FactoryDef_ptr
+CORBA::ComponentIR::FactoryDef::_duplicate (FactoryDef_ptr obj)
 {
   if (! CORBA::is_nil (obj))
     {
@@ -17945,7 +16461,7 @@ IR::FactoryDef::_duplicate (FactoryDef_ptr obj)
 }
 
 CORBA::Boolean
-IR::FactoryDef::_is_a (
+CORBA::ComponentIR::FactoryDef::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
   )
@@ -17953,7 +16469,7 @@ IR::FactoryDef::_is_a (
   if (
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/FactoryDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
@@ -17984,13 +16500,13 @@ IR::FactoryDef::_is_a (
     }
 }
 
-void *IR::FactoryDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::ComponentIR::FactoryDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, FactoryDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, FactoryDef)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
@@ -18057,217 +16573,232 @@ void *IR::FactoryDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* IR::FactoryDef::_interface_repository_id (void) const
+const char* CORBA::ComponentIR::FactoryDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/IR/FactoryDef:1.0";
+  return "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_FactoryDef[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_FactoryDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
+  45,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f46), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72794465), 
-  ACE_NTOHL (0x663a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/FactoryDef:1.0
-  11,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4661), 
+  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x79446566), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0
+    11,
   ACE_NTOHL (0x46616374), 
   ACE_NTOHL (0x6f727944), 
   ACE_NTOHL (0x65660000),  // name = FactoryDef
-};
+  };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_FactoryDef (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_FactoryDef (
     CORBA::tk_objref,
-    sizeof (_oc_IR_FactoryDef),
-    (char *) &_oc_IR_FactoryDef,
+    sizeof (_oc_CORBA_ComponentIR_FactoryDef),
+    (char *) &_oc_CORBA_ComponentIR_FactoryDef,
     0,
-    sizeof (IR::FactoryDef)
+    sizeof (CORBA::ComponentIR::FactoryDef)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
     _tc_FactoryDef,
-    &_tc_TAO_tc_IR_FactoryDef
+    &_tc_TAO_tc_CORBA_ComponentIR_FactoryDef
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-int IR::FinderDef::_tao_class_id = 0;
+int CORBA::ComponentIR::FinderDef::_tao_class_id = 0;
 
-IR::FinderDef_ptr
-tao_IR_FinderDef_duplicate (
-    IR::FinderDef_ptr p
+CORBA::ComponentIR::FinderDef_ptr
+tao_CORBA_ComponentIR_FinderDef_duplicate (
+    CORBA::ComponentIR::FinderDef_ptr p
   )
 {
-  return IR::FinderDef::_duplicate (p);
+  return CORBA::ComponentIR::FinderDef::_duplicate (p);
 }
 
 void
-tao_IR_FinderDef_release (
-    IR::FinderDef_ptr p
+tao_CORBA_ComponentIR_FinderDef_release (
+    CORBA::ComponentIR::FinderDef_ptr p
   )
 {
   CORBA::release (p);
 }
 
-IR::FinderDef_ptr
-tao_IR_FinderDef_nil (
+CORBA::ComponentIR::FinderDef_ptr
+tao_CORBA_ComponentIR_FinderDef_nil (
     void
   )
 {
-  return IR::FinderDef::_nil ();
+  return CORBA::ComponentIR::FinderDef::_nil ();
 }
 
-IR::FinderDef_ptr
-tao_IR_FinderDef_narrow (
+CORBA::ComponentIR::FinderDef_ptr
+tao_CORBA_ComponentIR_FinderDef_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return IR::FinderDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::FinderDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-tao_IR_FinderDef_upcast (
+tao_CORBA_ComponentIR_FinderDef_upcast (
     void *src
   )
 {
-  IR::FinderDef **tmp =
-    ACE_static_cast (IR::FinderDef **, src);
+  CORBA::ComponentIR::FinderDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::FinderDef **, src);
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ComponentIR_FinderDef_marshal (
+    CORBA::ComponentIR::FinderDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
-// IR::FinderDef_var
+// CORBA::ComponentIR::FinderDef_var
 // *************************************************************
 
-IR::FinderDef_var::FinderDef_var (void)
+CORBA::ComponentIR::FinderDef_var::FinderDef_var (void)
   : ptr_ (FinderDef::_nil ())
 {}
 
-::IR::FinderDef_ptr
-IR::FinderDef_var::ptr (void) const
+::CORBA::ComponentIR::FinderDef_ptr
+CORBA::ComponentIR::FinderDef_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-IR::FinderDef_var::FinderDef_var (const ::IR::FinderDef_var &p)
+CORBA::ComponentIR::FinderDef_var::FinderDef_var (const ::CORBA::ComponentIR::FinderDef_var &p)
   : TAO_Base_var (),
     ptr_ (FinderDef::_duplicate (p.ptr ()))
 {}
 
-IR::FinderDef_var::~FinderDef_var (void)
+CORBA::ComponentIR::FinderDef_var::~FinderDef_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
-IR::FinderDef_var &
-IR::FinderDef_var::operator= (FinderDef_ptr p)
+CORBA::ComponentIR::FinderDef_var &
+CORBA::ComponentIR::FinderDef_var::operator= (FinderDef_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-IR::FinderDef_var &
-IR::FinderDef_var::operator= (const ::IR::FinderDef_var &p)
+CORBA::ComponentIR::FinderDef_var &
+CORBA::ComponentIR::FinderDef_var::operator= (const ::CORBA::ComponentIR::FinderDef_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::FinderDef::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::ComponentIR::FinderDef::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-IR::FinderDef_var::operator const ::IR::FinderDef_ptr &() const // cast
+CORBA::ComponentIR::FinderDef_var::operator const ::CORBA::ComponentIR::FinderDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-IR::FinderDef_var::operator ::IR::FinderDef_ptr &() // cast 
+CORBA::ComponentIR::FinderDef_var::operator ::CORBA::ComponentIR::FinderDef_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::IR::FinderDef_ptr
-IR::FinderDef_var::operator-> (void) const
+::CORBA::ComponentIR::FinderDef_ptr
+CORBA::ComponentIR::FinderDef_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::IR::FinderDef_ptr
-IR::FinderDef_var::in (void) const
+::CORBA::ComponentIR::FinderDef_ptr
+CORBA::ComponentIR::FinderDef_var::in (void) const
 {
   return this->ptr_;
 }
 
-::IR::FinderDef_ptr &
-IR::FinderDef_var::inout (void)
+::CORBA::ComponentIR::FinderDef_ptr &
+CORBA::ComponentIR::FinderDef_var::inout (void)
 {
   return this->ptr_;
 }
 
-::IR::FinderDef_ptr &
-IR::FinderDef_var::out (void)
+::CORBA::ComponentIR::FinderDef_ptr &
+CORBA::ComponentIR::FinderDef_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::FinderDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::FinderDef::_nil ();
   return this->ptr_;
 }
 
-::IR::FinderDef_ptr
-IR::FinderDef_var::_retn (void)
+::CORBA::ComponentIR::FinderDef_ptr
+CORBA::ComponentIR::FinderDef_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::IR::FinderDef_ptr val = this->ptr_;
-  this->ptr_ = ::IR::FinderDef::_nil ();
+  ::CORBA::ComponentIR::FinderDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::FinderDef::_nil ();
   return val;
 }
 
-::IR::FinderDef_ptr
-IR::FinderDef_var::tao_duplicate (FinderDef_ptr p)
+::CORBA::ComponentIR::FinderDef_ptr
+CORBA::ComponentIR::FinderDef_var::tao_duplicate (FinderDef_ptr p)
 {
-  return ::IR::FinderDef::_duplicate (p);
+  return ::CORBA::ComponentIR::FinderDef::_duplicate (p);
 }
 
 void
-IR::FinderDef_var::tao_release (FinderDef_ptr p)
+CORBA::ComponentIR::FinderDef_var::tao_release (FinderDef_ptr p)
 {
   CORBA::release (p);
 }
 
-::IR::FinderDef_ptr
-IR::FinderDef_var::tao_nil (void)
+::CORBA::ComponentIR::FinderDef_ptr
+CORBA::ComponentIR::FinderDef_var::tao_nil (void)
 {
-  return ::IR::FinderDef::_nil ();
+  return ::CORBA::ComponentIR::FinderDef::_nil ();
 }
 
-::IR::FinderDef_ptr
-IR::FinderDef_var::tao_narrow (
+::CORBA::ComponentIR::FinderDef_ptr
+CORBA::ComponentIR::FinderDef_var::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::FinderDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::CORBA::ComponentIR::FinderDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IR::FinderDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::FinderDef_var::tao_upcast (void *src)
 {
   FinderDef **tmp =
     ACE_static_cast (FinderDef **, src);
@@ -18275,85 +16806,85 @@ IR::FinderDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
-// IR::FinderDef_out
+// CORBA::ComponentIR::FinderDef_out
 // *************************************************************
 
-IR::FinderDef_out::FinderDef_out (FinderDef_ptr &p)
+CORBA::ComponentIR::FinderDef_out::FinderDef_out (FinderDef_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::IR::FinderDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::FinderDef::_nil ();
 }
 
-IR::FinderDef_out::FinderDef_out (FinderDef_var &p)
+CORBA::ComponentIR::FinderDef_out::FinderDef_out (FinderDef_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::FinderDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::FinderDef::_nil ();
 }
 
-IR::FinderDef_out::FinderDef_out (const ::IR::FinderDef_out &p)
+CORBA::ComponentIR::FinderDef_out::FinderDef_out (const ::CORBA::ComponentIR::FinderDef_out &p)
   : ptr_ (ACE_const_cast (FinderDef_out &, p).ptr_)
 {}
 
-::IR::FinderDef_out &
-IR::FinderDef_out::operator= (const ::IR::FinderDef_out &p)
+::CORBA::ComponentIR::FinderDef_out &
+CORBA::ComponentIR::FinderDef_out::operator= (const ::CORBA::ComponentIR::FinderDef_out &p)
 {
   this->ptr_ = ACE_const_cast (FinderDef_out&, p).ptr_;
   return *this;
 }
 
-IR::FinderDef_out &
-IR::FinderDef_out::operator= (const ::IR::FinderDef_var &p)
+CORBA::ComponentIR::FinderDef_out &
+CORBA::ComponentIR::FinderDef_out::operator= (const ::CORBA::ComponentIR::FinderDef_var &p)
 {
-  this->ptr_ = ::IR::FinderDef::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::ComponentIR::FinderDef::_duplicate (p.ptr ());
   return *this;
 }
 
-IR::FinderDef_out &
-IR::FinderDef_out::operator= (FinderDef_ptr p)
+CORBA::ComponentIR::FinderDef_out &
+CORBA::ComponentIR::FinderDef_out::operator= (FinderDef_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-IR::FinderDef_out::operator ::IR::FinderDef_ptr &() // cast
+CORBA::ComponentIR::FinderDef_out::operator ::CORBA::ComponentIR::FinderDef_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::IR::FinderDef_ptr &
-IR::FinderDef_out::ptr (void)
+::CORBA::ComponentIR::FinderDef_ptr &
+CORBA::ComponentIR::FinderDef_out::ptr (void)
 {
   return this->ptr_;
 }
 
-::IR::FinderDef_ptr
-IR::FinderDef_out::operator-> (void)
+::CORBA::ComponentIR::FinderDef_ptr
+CORBA::ComponentIR::FinderDef_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
 
-IR::_TAO_FinderDef_Proxy_Impl::_TAO_FinderDef_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_FinderDef_Proxy_Impl::_TAO_FinderDef_Proxy_Impl (void)
 {}
 
-IR::_TAO_FinderDef_Remote_Proxy_Impl::_TAO_FinderDef_Remote_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_FinderDef_Remote_Proxy_Impl::_TAO_FinderDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
@@ -18363,43 +16894,43 @@ IR::_TAO_FinderDef_Remote_Proxy_Impl::_TAO_FinderDef_Remote_Proxy_Impl (void)
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
 //
 
-IR::_TAO_FinderDef_Proxy_Broker::_TAO_FinderDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_FinderDef_Proxy_Broker::_TAO_FinderDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_FinderDef_Proxy_Broker::~_TAO_FinderDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_FinderDef_Proxy_Broker::~_TAO_FinderDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_FinderDef_Proxy_Broker * (*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_FinderDef_Proxy_Broker * (*CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-IR::_TAO_FinderDef_Remote_Proxy_Broker *
-IR::_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_FinderDef_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker (void)
 {
-  static ::IR::_TAO_FinderDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::CORBA::ComponentIR::_TAO_FinderDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-IR::_TAO_FinderDef_Remote_Proxy_Broker::_TAO_FinderDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_FinderDef_Remote_Proxy_Broker::_TAO_FinderDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_FinderDef_Remote_Proxy_Broker::~_TAO_FinderDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_FinderDef_Remote_Proxy_Broker::~_TAO_FinderDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_FinderDef_Proxy_Impl&
-IR::_TAO_FinderDef_Remote_Proxy_Broker::select_proxy (
-    ::IR::FinderDef *
+CORBA::ComponentIR::_TAO_FinderDef_Proxy_Impl&
+CORBA::ComponentIR::_TAO_FinderDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::FinderDef *
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -18411,38 +16942,38 @@ IR::_TAO_FinderDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
-IR::FinderDef::FinderDef (int collocated)
+CORBA::ComponentIR::FinderDef::FinderDef (int collocated)
 {
-  this->IR_FinderDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_FinderDef_setup_collocation (collocated);
 }
 
 void
-IR::FinderDef::IR_FinderDef_setup_collocation (int collocated)
+CORBA::ComponentIR::FinderDef::CORBA_ComponentIR_FinderDef_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_FinderDef_Proxy_Broker_ =
-      ::IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer (this);
+      ::CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_FinderDef_Proxy_Broker_ =
-      ::IR::_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker ();
+      ::CORBA::ComponentIR::_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker ();
   
   this->CORBA_OperationDef_setup_collocation (collocated);
 }
 
-IR::FinderDef::~FinderDef (void)
+CORBA::ComponentIR::FinderDef::~FinderDef (void)
 {}
 
 void 
-IR::FinderDef::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ComponentIR::FinderDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   FinderDef *tmp = ACE_static_cast (FinderDef *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IR::FinderDef_ptr
-IR::FinderDef::_narrow (
+CORBA::ComponentIR::FinderDef_ptr
+CORBA::ComponentIR::FinderDef::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -18456,7 +16987,7 @@ IR::FinderDef::_narrow (
     {
       CORBA::Boolean is_a =
         obj->_is_a (
-            "IDL:omg.org/IR/FinderDef:1.0"
+            "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0"
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (FinderDef::_nil ());
@@ -18470,8 +17001,8 @@ IR::FinderDef::_narrow (
   return FinderDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IR::FinderDef_ptr 
-IR::FinderDef::_unchecked_narrow (
+CORBA::ComponentIR::FinderDef_ptr 
+CORBA::ComponentIR::FinderDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -18496,12 +17027,12 @@ IR::FinderDef::_unchecked_narrow (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&
-          IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer != 0
+          CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer != 0
         )
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::FinderDef (
+              ::CORBA::ComponentIR::FinderDef (
                   stub,
                   1,
                   obj->_servant ()
@@ -18514,7 +17045,7 @@ IR::FinderDef::_unchecked_narrow (
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::FinderDef (
+              ::CORBA::ComponentIR::FinderDef (
                   stub,
                   0,
                   obj->_servant ()
@@ -18538,8 +17069,8 @@ IR::FinderDef::_unchecked_narrow (
         );
 }
 
-IR::FinderDef_ptr
-IR::FinderDef::_duplicate (FinderDef_ptr obj)
+CORBA::ComponentIR::FinderDef_ptr
+CORBA::ComponentIR::FinderDef::_duplicate (FinderDef_ptr obj)
 {
   if (! CORBA::is_nil (obj))
     {
@@ -18550,7 +17081,7 @@ IR::FinderDef::_duplicate (FinderDef_ptr obj)
 }
 
 CORBA::Boolean
-IR::FinderDef::_is_a (
+CORBA::ComponentIR::FinderDef::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
   )
@@ -18558,7 +17089,7 @@ IR::FinderDef::_is_a (
   if (
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/FinderDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
@@ -18589,13 +17120,13 @@ IR::FinderDef::_is_a (
     }
 }
 
-void *IR::FinderDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::ComponentIR::FinderDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, FinderDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, FinderDef)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
@@ -18662,217 +17193,231 @@ void *IR::FinderDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* IR::FinderDef::_interface_repository_id (void) const
+const char* CORBA::ComponentIR::FinderDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/IR/FinderDef:1.0";
+  return "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_FinderDef[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_FinderDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
+  44,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f46), 
-  ACE_NTOHL (0x696e6465), 
-  ACE_NTOHL (0x72446566), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FinderDef:1.0
-  10,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4669), 
+  ACE_NTOHL (0x6e646572), 
+  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0
+    10,
   ACE_NTOHL (0x46696e64), 
   ACE_NTOHL (0x65724465), 
   ACE_NTOHL (0x66000000),  // name = FinderDef
-};
+  };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_FinderDef (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_FinderDef (
     CORBA::tk_objref,
-    sizeof (_oc_IR_FinderDef),
-    (char *) &_oc_IR_FinderDef,
+    sizeof (_oc_CORBA_ComponentIR_FinderDef),
+    (char *) &_oc_CORBA_ComponentIR_FinderDef,
     0,
-    sizeof (IR::FinderDef)
+    sizeof (CORBA::ComponentIR::FinderDef)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
     _tc_FinderDef,
-    &_tc_TAO_tc_IR_FinderDef
+    &_tc_TAO_tc_CORBA_ComponentIR_FinderDef
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-int IR::HomeDef::_tao_class_id = 0;
+int CORBA::ComponentIR::HomeDef::_tao_class_id = 0;
 
-IR::HomeDef_ptr
-tao_IR_HomeDef_duplicate (
-    IR::HomeDef_ptr p
+CORBA::ComponentIR::HomeDef_ptr
+tao_CORBA_ComponentIR_HomeDef_duplicate (
+    CORBA::ComponentIR::HomeDef_ptr p
   )
 {
-  return IR::HomeDef::_duplicate (p);
+  return CORBA::ComponentIR::HomeDef::_duplicate (p);
 }
 
 void
-tao_IR_HomeDef_release (
-    IR::HomeDef_ptr p
+tao_CORBA_ComponentIR_HomeDef_release (
+    CORBA::ComponentIR::HomeDef_ptr p
   )
 {
   CORBA::release (p);
 }
 
-IR::HomeDef_ptr
-tao_IR_HomeDef_nil (
+CORBA::ComponentIR::HomeDef_ptr
+tao_CORBA_ComponentIR_HomeDef_nil (
     void
   )
 {
-  return IR::HomeDef::_nil ();
+  return CORBA::ComponentIR::HomeDef::_nil ();
 }
 
-IR::HomeDef_ptr
-tao_IR_HomeDef_narrow (
+CORBA::ComponentIR::HomeDef_ptr
+tao_CORBA_ComponentIR_HomeDef_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return IR::HomeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::HomeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-tao_IR_HomeDef_upcast (
+tao_CORBA_ComponentIR_HomeDef_upcast (
     void *src
   )
 {
-  IR::HomeDef **tmp =
-    ACE_static_cast (IR::HomeDef **, src);
+  CORBA::ComponentIR::HomeDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::HomeDef **, src);
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ComponentIR_HomeDef_marshal (
+    CORBA::ComponentIR::HomeDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
-// IR::HomeDef_var
+// CORBA::ComponentIR::HomeDef_var
 // *************************************************************
 
-IR::HomeDef_var::HomeDef_var (void)
+CORBA::ComponentIR::HomeDef_var::HomeDef_var (void)
   : ptr_ (HomeDef::_nil ())
 {}
 
-::IR::HomeDef_ptr
-IR::HomeDef_var::ptr (void) const
+::CORBA::ComponentIR::HomeDef_ptr
+CORBA::ComponentIR::HomeDef_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-IR::HomeDef_var::HomeDef_var (const ::IR::HomeDef_var &p)
+CORBA::ComponentIR::HomeDef_var::HomeDef_var (const ::CORBA::ComponentIR::HomeDef_var &p)
   : TAO_Base_var (),
     ptr_ (HomeDef::_duplicate (p.ptr ()))
 {}
 
-IR::HomeDef_var::~HomeDef_var (void)
+CORBA::ComponentIR::HomeDef_var::~HomeDef_var (void)
 {
   CORBA::release (this->ptr_);
 }
 
-IR::HomeDef_var &
-IR::HomeDef_var::operator= (HomeDef_ptr p)
+CORBA::ComponentIR::HomeDef_var &
+CORBA::ComponentIR::HomeDef_var::operator= (HomeDef_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-IR::HomeDef_var &
-IR::HomeDef_var::operator= (const ::IR::HomeDef_var &p)
+CORBA::ComponentIR::HomeDef_var &
+CORBA::ComponentIR::HomeDef_var::operator= (const ::CORBA::ComponentIR::HomeDef_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::HomeDef::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA::ComponentIR::HomeDef::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-IR::HomeDef_var::operator const ::IR::HomeDef_ptr &() const // cast
+CORBA::ComponentIR::HomeDef_var::operator const ::CORBA::ComponentIR::HomeDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-IR::HomeDef_var::operator ::IR::HomeDef_ptr &() // cast 
+CORBA::ComponentIR::HomeDef_var::operator ::CORBA::ComponentIR::HomeDef_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::IR::HomeDef_ptr
-IR::HomeDef_var::operator-> (void) const
+::CORBA::ComponentIR::HomeDef_ptr
+CORBA::ComponentIR::HomeDef_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::IR::HomeDef_ptr
-IR::HomeDef_var::in (void) const
+::CORBA::ComponentIR::HomeDef_ptr
+CORBA::ComponentIR::HomeDef_var::in (void) const
 {
   return this->ptr_;
 }
 
-::IR::HomeDef_ptr &
-IR::HomeDef_var::inout (void)
+::CORBA::ComponentIR::HomeDef_ptr &
+CORBA::ComponentIR::HomeDef_var::inout (void)
 {
   return this->ptr_;
 }
 
-::IR::HomeDef_ptr &
-IR::HomeDef_var::out (void)
+::CORBA::ComponentIR::HomeDef_ptr &
+CORBA::ComponentIR::HomeDef_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::HomeDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::HomeDef::_nil ();
   return this->ptr_;
 }
 
-::IR::HomeDef_ptr
-IR::HomeDef_var::_retn (void)
+::CORBA::ComponentIR::HomeDef_ptr
+CORBA::ComponentIR::HomeDef_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::IR::HomeDef_ptr val = this->ptr_;
-  this->ptr_ = ::IR::HomeDef::_nil ();
+  ::CORBA::ComponentIR::HomeDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ComponentIR::HomeDef::_nil ();
   return val;
 }
 
-::IR::HomeDef_ptr
-IR::HomeDef_var::tao_duplicate (HomeDef_ptr p)
+::CORBA::ComponentIR::HomeDef_ptr
+CORBA::ComponentIR::HomeDef_var::tao_duplicate (HomeDef_ptr p)
 {
-  return ::IR::HomeDef::_duplicate (p);
+  return ::CORBA::ComponentIR::HomeDef::_duplicate (p);
 }
 
 void
-IR::HomeDef_var::tao_release (HomeDef_ptr p)
+CORBA::ComponentIR::HomeDef_var::tao_release (HomeDef_ptr p)
 {
   CORBA::release (p);
 }
 
-::IR::HomeDef_ptr
-IR::HomeDef_var::tao_nil (void)
+::CORBA::ComponentIR::HomeDef_ptr
+CORBA::ComponentIR::HomeDef_var::tao_nil (void)
 {
-  return ::IR::HomeDef::_nil ();
+  return ::CORBA::ComponentIR::HomeDef::_nil ();
 }
 
-::IR::HomeDef_ptr
-IR::HomeDef_var::tao_narrow (
+::CORBA::ComponentIR::HomeDef_ptr
+CORBA::ComponentIR::HomeDef_var::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::HomeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::CORBA::ComponentIR::HomeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IR::HomeDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::HomeDef_var::tao_upcast (void *src)
 {
   HomeDef **tmp =
     ACE_static_cast (HomeDef **, src);
@@ -18880,79 +17425,79 @@ IR::HomeDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
-// IR::HomeDef_out
+// CORBA::ComponentIR::HomeDef_out
 // *************************************************************
 
-IR::HomeDef_out::HomeDef_out (HomeDef_ptr &p)
+CORBA::ComponentIR::HomeDef_out::HomeDef_out (HomeDef_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::IR::HomeDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::HomeDef::_nil ();
 }
 
-IR::HomeDef_out::HomeDef_out (HomeDef_var &p)
+CORBA::ComponentIR::HomeDef_out::HomeDef_out (HomeDef_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::HomeDef::_nil ();
+  this->ptr_ = ::CORBA::ComponentIR::HomeDef::_nil ();
 }
 
-IR::HomeDef_out::HomeDef_out (const ::IR::HomeDef_out &p)
+CORBA::ComponentIR::HomeDef_out::HomeDef_out (const ::CORBA::ComponentIR::HomeDef_out &p)
   : ptr_ (ACE_const_cast (HomeDef_out &, p).ptr_)
 {}
 
-::IR::HomeDef_out &
-IR::HomeDef_out::operator= (const ::IR::HomeDef_out &p)
+::CORBA::ComponentIR::HomeDef_out &
+CORBA::ComponentIR::HomeDef_out::operator= (const ::CORBA::ComponentIR::HomeDef_out &p)
 {
   this->ptr_ = ACE_const_cast (HomeDef_out&, p).ptr_;
   return *this;
 }
 
-IR::HomeDef_out &
-IR::HomeDef_out::operator= (const ::IR::HomeDef_var &p)
+CORBA::ComponentIR::HomeDef_out &
+CORBA::ComponentIR::HomeDef_out::operator= (const ::CORBA::ComponentIR::HomeDef_var &p)
 {
-  this->ptr_ = ::IR::HomeDef::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA::ComponentIR::HomeDef::_duplicate (p.ptr ());
   return *this;
 }
 
-IR::HomeDef_out &
-IR::HomeDef_out::operator= (HomeDef_ptr p)
+CORBA::ComponentIR::HomeDef_out &
+CORBA::ComponentIR::HomeDef_out::operator= (HomeDef_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-IR::HomeDef_out::operator ::IR::HomeDef_ptr &() // cast
+CORBA::ComponentIR::HomeDef_out::operator ::CORBA::ComponentIR::HomeDef_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::IR::HomeDef_ptr &
-IR::HomeDef_out::ptr (void)
+::CORBA::ComponentIR::HomeDef_ptr &
+CORBA::ComponentIR::HomeDef_out::ptr (void)
 {
   return this->ptr_;
 }
 
-::IR::HomeDef_ptr
-IR::HomeDef_out::operator-> (void)
+::CORBA::ComponentIR::HomeDef_ptr
+CORBA::ComponentIR::HomeDef_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_HomeDef_base_home_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -18966,19 +17511,19 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::HomeDef_ptr result);
+    void result (::CORBA::ComponentIR::HomeDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_HomeDef_base_home_get (const TAO_ClientRequestInfo_IR_HomeDef_base_home_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_base_home_get &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get &);
     
-    ::IR::HomeDef_ptr _result;
+    ::CORBA::ComponentIR::HomeDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_HomeDef_base_home_get::TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_NOT_USED      
@@ -18987,7 +17532,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -18999,7 +17544,7 @@ TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (ACE_ENV_SINGLE_ARG_DE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -19011,7 +17556,7 @@ TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (ACE_ENV_SINGLE_ARG_D
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -19027,21 +17572,22 @@ TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void 
-TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (::IR::HomeDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::result (::CORBA::ComponentIR::HomeDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_HomeDef_managed_component_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
+      CORBA::Object_ptr _tao_target,
+      CORBA::ComponentIR::HomeDef_ptr base_home
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
@@ -19053,28 +17599,27 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::ComponentDef_ptr result);
-    
   private:
-    TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (const TAO_ClientRequestInfo_IR_HomeDef_managed_component_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_managed_component_get &);
-    
-    ::IR::ComponentDef_ptr _result;
+    TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set &);
+    CORBA::ComponentIR::HomeDef_ptr base_home_;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
+      CORBA::Object_ptr _tao_target,
+      CORBA::ComponentIR::HomeDef_ptr base_home
       ACE_ENV_ARG_DECL_NOT_USED      
     )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      base_home_ (base_home)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -19082,11 +17627,19 @@ TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (ACE_ENV_SINGL
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  return parameter_list;
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<=  this->base_home_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -19098,35 +17651,27 @@ TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (ACE_ENV_SING
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
+  CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  return result_any;
 }
 
-void 
-TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (::IR::ComponentDef_ptr result)
-{
-  // Update the result. 
-  this->_result = result;
-}
+
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_HomeDef_primary_key_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -19140,19 +17685,19 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::PrimaryKeyDef_ptr result);
+    void result (::CORBA::InterfaceDefSeq * result);
     
   private:
-    TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (const TAO_ClientRequestInfo_IR_HomeDef_primary_key_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_primary_key_get &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get &);
     
-    ::IR::PrimaryKeyDef_ptr _result;
+    ::CORBA::InterfaceDefSeq * _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_NOT_USED      
@@ -19161,7 +17706,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -19173,7 +17718,7 @@ TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -19185,7 +17730,7 @@ TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -19201,21 +17746,22 @@ TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DEC
 }
 
 void 
-TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (::IR::PrimaryKeyDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::result (::CORBA::InterfaceDefSeq * result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_HomeDef_factories_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_HomeDef_factories_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
+      CORBA::Object_ptr _tao_target,
+      const CORBA::InterfaceDefSeq & supported_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
@@ -19227,28 +17773,27 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::FactoryDefSeq * result);
-    
   private:
-    TAO_ClientRequestInfo_IR_HomeDef_factories_get (const TAO_ClientRequestInfo_IR_HomeDef_factories_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_factories_get &);
-    
-    ::IR::FactoryDefSeq * _result;
+    TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set &);
+    const CORBA::InterfaceDefSeq & supported_interfaces_;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_HomeDef_factories_get::TAO_ClientRequestInfo_IR_HomeDef_factories_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
+      CORBA::Object_ptr _tao_target,
+      const CORBA::InterfaceDefSeq & supported_interfaces
       ACE_ENV_ARG_DECL_NOT_USED      
     )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      supported_interfaces_ (supported_interfaces)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -19256,11 +17801,19 @@ TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (ACE_ENV_SINGLE_ARG_DE
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  return parameter_list;
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<=  this->supported_interfaces_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -19272,35 +17825,27 @@ TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (ACE_ENV_SINGLE_ARG_D
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
+  CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  return result_any;
 }
 
-void 
-TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (::IR::FactoryDefSeq * result)
-{
-  // Update the result. 
-  this->_result = result;
-}
+
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_HomeDef_finders_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_HomeDef_finders_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -19314,19 +17859,19 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::FinderDefSeq * result);
+    void result (::CORBA::ComponentIR::ComponentDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_HomeDef_finders_get (const TAO_ClientRequestInfo_IR_HomeDef_finders_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_finders_get &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get &);
     
-    ::IR::FinderDefSeq * _result;
+    ::CORBA::ComponentIR::ComponentDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_HomeDef_finders_get::TAO_ClientRequestInfo_IR_HomeDef_finders_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_NOT_USED      
@@ -19335,7 +17880,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -19347,7 +17892,7 @@ TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (ACE_ENV_SINGLE_ARG_DECL
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -19359,7 +17904,7 @@ TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (ACE_ENV_SINGLE_ARG_DEC
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -19375,19 +17920,106 @@ TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void 
-TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (::IR::FinderDefSeq * result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::result (::CORBA::ComponentIR::ComponentDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      CORBA::ComponentIR::ComponentDef_ptr managed_component
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set &);
+    CORBA::ComponentIR::ComponentDef_ptr managed_component_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      CORBA::ComponentIR::ComponentDef_ptr managed_component
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      managed_component_ (managed_component)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<=  this->managed_component_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_HomeDef_is_basic_get : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -19401,19 +18033,19 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::CORBA::Boolean result);
+    void result (::CORBA::ValueDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (const TAO_ClientRequestInfo_IR_HomeDef_is_basic_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_is_basic_get &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get &);
     
-    ::CORBA::Boolean _result;
+    ::CORBA::ValueDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
       ACE_ENV_ARG_DECL_NOT_USED      
@@ -19422,7 +18054,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -19434,7 +18066,7 @@ TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DEC
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -19446,7 +18078,7 @@ TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DE
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -19457,29 +18089,26 @@ TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL)
   
   CORBA::Any_var safe_result_any = result_any;
   
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
+  (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
 void 
-TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Boolean result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::result (::CORBA::ValueDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_HomeDef_create_primary_key : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_HomeDef_create_primary_key (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
       CORBA::ValueDef_ptr primary_key
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
@@ -19492,40 +18121,27 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::PrimaryKeyDef_ptr result);
-    
   private:
-    TAO_ClientRequestInfo_IR_HomeDef_create_primary_key (const TAO_ClientRequestInfo_IR_HomeDef_create_primary_key &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_create_primary_key &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
+    TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set &);
     CORBA::ValueDef_ptr primary_key_;
-    
-    ::IR::PrimaryKeyDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
       CORBA::ValueDef_ptr primary_key
       ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      id_ (id),
-      name_ (name),
-      version_ (version),
       primary_key_ (primary_key)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -19535,20 +18151,8 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (ACE_ENV_SINGLE_A
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   
-  parameter_list->length (4);
+  parameter_list->length (1);
   CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<= id_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  (*parameter_list)[len].argument <<= name_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  (*parameter_list)[len].argument <<= version_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
   (*parameter_list)[len].argument <<=  this->primary_key_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -19557,7 +18161,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (ACE_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -19569,35 +18173,27 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (ACE_ENV_SINGLE_
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
+  CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  return result_any;
 }
 
-void 
-TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (::IR::PrimaryKeyDef_ptr result)
-{
-  // Update the result. 
-  this->_result = result;
-}
+
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_HomeDef_create_factory : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_HomeDef_create_factory (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
@@ -19616,24 +18212,24 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::FactoryDef_ptr result);
+    void result (::CORBA::ComponentIR::FactoryDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_HomeDef_create_factory (const TAO_ClientRequestInfo_IR_HomeDef_create_factory &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_create_factory &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory &);
     const char * id_;
     const char * name_;
     const char * version_;
     const CORBA::ParDescriptionSeq & params_;
     const CORBA::ExceptionDefSeq & exceptions_;
     
-    ::IR::FactoryDef_ptr _result;
+    ::CORBA::ComponentIR::FactoryDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDef_create_factory (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
@@ -19652,7 +18248,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -19688,7 +18284,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (ACE_ENV_SINGLE_ARG_D
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -19700,7 +18296,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (ACE_ENV_SINGLE_ARG_
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -19716,19 +18312,19 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (ACE_ENV_SINGLE_ARG_DECL
 }
 
 void 
-TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (::IR::FactoryDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::result (::CORBA::ComponentIR::FactoryDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-class TAO_ClientRequestInfo_IR_HomeDef_create_finder : public TAO_ClientRequestInfo_i
+class TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder : public TAO_ClientRequestInfo_i
 {
 public:
-  TAO_ClientRequestInfo_IR_HomeDef_create_finder (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
@@ -19747,24 +18343,24 @@ public:
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void result (::IR::FinderDef_ptr result);
+    void result (::CORBA::ComponentIR::FinderDef_ptr result);
     
   private:
-    TAO_ClientRequestInfo_IR_HomeDef_create_finder (const TAO_ClientRequestInfo_IR_HomeDef_create_finder &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_create_finder &);
+    TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder &);
     const char * id_;
     const char * name_;
     const char * version_;
     const CORBA::ParDescriptionSeq & params_;
     const CORBA::ExceptionDefSeq & exceptions_;
     
-    ::IR::FinderDef_ptr _result;
+    ::CORBA::ComponentIR::FinderDef_ptr _result;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
   
-  TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef_create_finder (
+  TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
@@ -19783,7 +18379,7 @@ public:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
@@ -19819,7 +18415,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (ACE_ENV_SINGLE_ARG_DE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
@@ -19831,7 +18427,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (ACE_ENV_SINGLE_ARG_D
 }
 
 CORBA::Any * 
-TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -19847,7 +18443,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void 
-TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (::IR::FinderDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::result (::CORBA::ComponentIR::FinderDef_ptr result)
 {
   // Update the result. 
   this->_result = result;
@@ -19856,24 +18452,24 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (::IR::FinderDef_ptr resu
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
 
-IR::_TAO_HomeDef_Proxy_Impl::_TAO_HomeDef_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_HomeDef_Proxy_Impl::_TAO_HomeDef_Proxy_Impl (void)
 {}
 
-IR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
+CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
+::CORBA::ComponentIR::HomeDef_ptr CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
   )
@@ -19881,7 +18477,7 @@ IR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  IR::HomeDef_var _tao_retval (IR::HomeDef::_nil ());
+  CORBA::ComponentIR::HomeDef_var _tao_retval (CORBA::ComponentIR::HomeDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
@@ -19913,7 +18509,7 @@ IR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_HomeDef_base_home_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get _tao_ri (
           &_tao_call,
           _collocated_tao_target_
           ACE_ENV_ARG_PARAMETER
@@ -19938,82 +18534,74 @@ IR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::HomeDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::HomeDef_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
         {
@@ -20024,7 +18612,7 @@ IR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20048,7 +18636,7 @@ IR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20060,46 +18648,48 @@ IR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
-    CORBA::Object *_collocated_tao_target_
+void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
+    CORBA::Object *_collocated_tao_target_,
+    CORBA::ComponentIR::HomeDef_ptr base_home
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  IR::ComponentDef_var _tao_retval (IR::ComponentDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+      ACE_THROW (CORBA::INTERNAL ());
     }
     
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "_get_managed_component",
-      22,
-      0,
+      "_set_base_home",
+      14,
+      1,
       istub->orb_core ()
     );
   
@@ -20119,12 +18709,13 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_HomeDef_managed_component_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set _tao_ri (
           &_tao_call,
-          _collocated_tao_target_
+          _collocated_tao_target_,
+          base_home
           ACE_ENV_ARG_PARAMETER
         );
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK;
       
 #endif /* TAO_HAS_INTERCEPTORS */
       
@@ -20144,82 +18735,66 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << base_home)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-                  
-                  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
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::ComponentDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -20230,7 +18805,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20254,7 +18829,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20264,28 +18839,28 @@ return _tao_retval._retn ();
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
       
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      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 */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
+::CORBA::InterfaceDefSeq * CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
   )
@@ -20293,18 +18868,24 @@ return _tao_retval._retn ();
     CORBA::SystemException
   ))
 {
-  IR::PrimaryKeyDef_var _tao_retval (IR::PrimaryKeyDef::_nil ());
+  CORBA::InterfaceDefSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+  
+  {
+    CORBA::InterfaceDefSeq *tmp;
+    ACE_NEW_RETURN (tmp, CORBA::InterfaceDefSeq, _tao_retval._retn ());
+    _tao_retval = tmp;
+  }
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "_get_primary_key",
-      16,
+      "_get_supported_interfaces",
+      25,
       0,
       istub->orb_core ()
     );
@@ -20325,7 +18906,7 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_HomeDef_primary_key_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get _tao_ri (
           &_tao_call,
           _collocated_tao_target_
           ACE_ENV_ARG_PARAMETER
@@ -20350,82 +18931,74 @@ return _tao_retval._retn ();
           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.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.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::PrimaryKeyDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::InterfaceDefSeq * _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
         {
@@ -20436,7 +19009,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20460,7 +19033,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20472,52 +19045,48 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
-    CORBA::Object *_collocated_tao_target_
+void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::supported_interfaces (
+    CORBA::Object *_collocated_tao_target_,
+    const CORBA::InterfaceDefSeq & supported_interfaces
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  IR::FactoryDefSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+      ACE_THROW (CORBA::INTERNAL ());
     }
-  
-  {
-    IR::FactoryDefSeq *tmp;
-    ACE_NEW_RETURN (tmp, IR::FactoryDefSeq, _tao_retval._retn ());
-    _tao_retval = tmp;
-  }
-  
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "_get_factories",
-      14,
-      0,
+      "_set_supported_interfaces",
+      25,
+      1,
       istub->orb_core ()
     );
   
@@ -20537,12 +19106,13 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_HomeDef_factories_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set _tao_ri (
           &_tao_call,
-          _collocated_tao_target_
+          _collocated_tao_target_,
+          supported_interfaces
           ACE_ENV_ARG_PARAMETER
         );
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK;
       
 #endif /* TAO_HAS_INTERCEPTORS */
       
@@ -20562,82 +19132,66 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << supported_interfaces)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-                  
-                  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
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::FactoryDefSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -20648,7 +19202,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20672,7 +19226,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20682,28 +19236,28 @@ return _tao_retval._retn ();
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
       
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      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 */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
+::CORBA::ComponentIR::ComponentDef_ptr CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
   )
@@ -20711,24 +19265,18 @@ return _tao_retval._retn ();
     CORBA::SystemException
   ))
 {
-  IR::FinderDefSeq_var _tao_retval;
+  CORBA::ComponentIR::ComponentDef_var _tao_retval (CORBA::ComponentIR::ComponentDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
-  {
-    IR::FinderDefSeq *tmp;
-    ACE_NEW_RETURN (tmp, IR::FinderDefSeq, _tao_retval._retn ());
-    _tao_retval = tmp;
-  }
-  
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "_get_finders",
-      12,
+      "_get_managed_component",
+      22,
       0,
       istub->orb_core ()
     );
@@ -20749,7 +19297,7 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_HomeDef_finders_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get _tao_ri (
           &_tao_call,
           _collocated_tao_target_
           ACE_ENV_ARG_PARAMETER
@@ -20774,82 +19322,267 @@ return _tao_retval._retn ();
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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 ());
+
+          
+          _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
+          else if (_invoke_status == TAO_INVOKE_RESTART)
             {
+              TAO_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::ComponentDef_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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
+    CORBA::Object *_collocated_tao_target_,
+    CORBA::ComponentIR::ComponentDef_ptr managed_component
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "_set_managed_component",
+      22,
+      1,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_,
+          managed_component
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK;
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK;
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << managed_component)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-                  
-                  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
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::FinderDefSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -20860,7 +19593,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20884,7 +19617,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -20894,28 +19627,28 @@ return _tao_retval._retn ();
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
       
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      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 */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
+::CORBA::ValueDef_ptr CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
   )
@@ -20923,18 +19656,18 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
     CORBA::SystemException
   ))
 {
-  CORBA::Boolean _tao_retval = 0;
+  CORBA::ValueDef_var _tao_retval (CORBA::ValueDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
     
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "_get_is_basic",
-      13,
+      "_get_primary_key",
+      16,
       0,
       istub->orb_core ()
     );
@@ -20955,12 +19688,12 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_HomeDef_is_basic_get _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get _tao_ri (
           &_tao_call,
           _collocated_tao_target_
           ACE_ENV_ARG_PARAMETER
         );
-      ACE_CHECK_RETURN (_tao_retval);
+      ACE_CHECK_RETURN (_tao_retval._retn ());
       
 #endif /* TAO_HAS_INTERCEPTORS */
       
@@ -20980,81 +19713,74 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
           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);
+          
+          _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);
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              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);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-                  
-                  if (!(
-                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Boolean _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ValueDef_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
         {
@@ -21065,7 +19791,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21089,7 +19815,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21099,32 +19825,31 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
       
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval);
+      ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval);
+      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 */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
+void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
     CORBA::Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
     CORBA::ValueDef_ptr primary_key
     ACE_ENV_ARG_DECL
   )
@@ -21132,19 +19857,18 @@ return _tao_retval;
     CORBA::SystemException
   ))
 {
-  IR::PrimaryKeyDef_var _tao_retval (IR::PrimaryKeyDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+      ACE_THROW (CORBA::INTERNAL ());
     }
     
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
-      "create_primary_key",
-      18,
-      4,
+      "_set_primary_key",
+      16,
+      1,
       istub->orb_core ()
     );
   
@@ -21164,16 +19888,13 @@ return _tao_retval;
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_HomeDef_create_primary_key _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
-          id,
-          name,
-          version,
           primary_key
           ACE_ENV_ARG_PARAMETER
         );
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK;
       
 #endif /* TAO_HAS_INTERCEPTORS */
       
@@ -21193,98 +19914,66 @@ return _tao_retval;
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << primary_key)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK;
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << primary_key)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-                  
-                  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
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::PrimaryKeyDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -21295,7 +19984,7 @@ return _tao_retval;
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21319,7 +20008,7 @@ return _tao_retval;
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21329,28 +20018,28 @@ return _tao_retval;
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
       
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      ACE_CHECK;
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval._retn ());
+      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 */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
+::CORBA::ComponentIR::FactoryDef_ptr CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
     CORBA::Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -21363,7 +20052,7 @@ return _tao_retval._retn ();
     CORBA::SystemException
   ))
 {
-  IR::FactoryDef_var _tao_retval (IR::FactoryDef::_nil ());
+  CORBA::ComponentIR::FactoryDef_var _tao_retval (CORBA::ComponentIR::FactoryDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
@@ -21395,7 +20084,7 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_HomeDef_create_factory _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           id,
@@ -21425,99 +20114,91 @@ return _tao_retval._retn ();
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << params) &&
+              (_tao_out << exceptions)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << params) &&
-                  (_tao_out << exceptions)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::FactoryDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::FactoryDef_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
         {
@@ -21528,7 +20209,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21552,7 +20233,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21564,26 +20245,28 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
-::IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
+::CORBA::ComponentIR::FinderDef_ptr CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
     CORBA::Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -21596,7 +20279,7 @@ return _tao_retval._retn ();
     CORBA::SystemException
   ))
 {
-  IR::FinderDef_var _tao_retval (IR::FinderDef::_nil ());
+  CORBA::ComponentIR::FinderDef_var _tao_retval (CORBA::ComponentIR::FinderDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
   if (istub == 0)
@@ -21628,7 +20311,7 @@ return _tao_retval._retn ();
       _invoke_status = TAO_INVOKE_EXCEPTION;
       
 #if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_IR_HomeDef_create_finder _tao_ri (
+      TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           id,
@@ -21658,99 +20341,91 @@ return _tao_retval._retn ();
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << params) &&
+              (_tao_out << exceptions)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              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 ());
 
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << params) &&
-                  (_tao_out << exceptions)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-                          
-                        ),
-                      0
-                    );
-                }
-              
-              _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 ();
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::IR::FinderDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
+          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_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ComponentIR::FinderDef_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
         {
@@ -21761,7 +20436,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21785,7 +20460,7 @@ return _tao_retval._retn ();
             );
           ACE_TRY_CHECK;
           
-          const PortableInterceptor::ReplyStatus _tao_status =
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           
@@ -21797,20 +20472,22 @@ return _tao_retval._retn ();
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
       
-      const PortableInterceptor::ReplyStatus _tao_status =
+      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)
-        
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 //
@@ -21818,43 +20495,43 @@ return _tao_retval._retn ();
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
 //
 
-IR::_TAO_HomeDef_Proxy_Broker::_TAO_HomeDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_HomeDef_Proxy_Broker::_TAO_HomeDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_HomeDef_Proxy_Broker::~_TAO_HomeDef_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_HomeDef_Proxy_Broker::~_TAO_HomeDef_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_HomeDef_Proxy_Broker * (*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_HomeDef_Proxy_Broker * (*CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-IR::_TAO_HomeDef_Remote_Proxy_Broker *
-IR::_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Broker *
+CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker (void)
 {
-  static ::IR::_TAO_HomeDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-IR::_TAO_HomeDef_Remote_Proxy_Broker::_TAO_HomeDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Broker::_TAO_HomeDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_HomeDef_Remote_Proxy_Broker::~_TAO_HomeDef_Remote_Proxy_Broker (void)
+CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Broker::~_TAO_HomeDef_Remote_Proxy_Broker (void)
 {
 }
 
-IR::_TAO_HomeDef_Proxy_Impl&
-IR::_TAO_HomeDef_Remote_Proxy_Broker::select_proxy (
-    ::IR::HomeDef *
+CORBA::ComponentIR::_TAO_HomeDef_Proxy_Impl&
+CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ComponentIR::HomeDef *
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
@@ -21866,38 +20543,38 @@ IR::_TAO_HomeDef_Remote_Proxy_Broker::select_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:225
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
-IR::HomeDef::HomeDef (int collocated)
+CORBA::ComponentIR::HomeDef::HomeDef (int collocated)
 {
-  this->IR_HomeDef_setup_collocation (collocated);
+  this->CORBA_ComponentIR_HomeDef_setup_collocation (collocated);
 }
 
 void
-IR::HomeDef::IR_HomeDef_setup_collocation (int collocated)
+CORBA::ComponentIR::HomeDef::CORBA_ComponentIR_HomeDef_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_HomeDef_Proxy_Broker_ =
-      ::IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer (this);
+      ::CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_HomeDef_Proxy_Broker_ =
-      ::IR::_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker ();
+      ::CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker ();
   
-  this->CORBA_InterfaceDef_setup_collocation (collocated);
+  this->CORBA_ExtInterfaceDef_setup_collocation (collocated);
 }
 
-IR::HomeDef::~HomeDef (void)
+CORBA::ComponentIR::HomeDef::~HomeDef (void)
 {}
 
 void 
-IR::HomeDef::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::ComponentIR::HomeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   HomeDef *tmp = ACE_static_cast (HomeDef *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IR::HomeDef_ptr
-IR::HomeDef::_narrow (
+CORBA::ComponentIR::HomeDef_ptr
+CORBA::ComponentIR::HomeDef::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -21911,7 +20588,7 @@ IR::HomeDef::_narrow (
     {
       CORBA::Boolean is_a =
         obj->_is_a (
-            "IDL:omg.org/IR/HomeDef:1.0"
+            "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (HomeDef::_nil ());
@@ -21925,8 +20602,8 @@ IR::HomeDef::_narrow (
   return HomeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IR::HomeDef_ptr 
-IR::HomeDef::_unchecked_narrow (
+CORBA::ComponentIR::HomeDef_ptr 
+CORBA::ComponentIR::HomeDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -21951,12 +20628,12 @@ IR::HomeDef::_unchecked_narrow (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&
-          IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer != 0
+          CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer != 0
         )
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::HomeDef (
+              ::CORBA::ComponentIR::HomeDef (
                   stub,
                   1,
                   obj->_servant ()
@@ -21969,7 +20646,7 @@ IR::HomeDef::_unchecked_narrow (
         {
           ACE_NEW_RETURN (
               default_proxy,
-              ::IR::HomeDef (
+              ::CORBA::ComponentIR::HomeDef (
                   stub,
                   0,
                   obj->_servant ()
@@ -21993,8 +20670,8 @@ IR::HomeDef::_unchecked_narrow (
         );
 }
 
-IR::HomeDef_ptr
-IR::HomeDef::_duplicate (HomeDef_ptr obj)
+CORBA::ComponentIR::HomeDef_ptr
+CORBA::ComponentIR::HomeDef::_duplicate (HomeDef_ptr obj)
 {
   if (! CORBA::is_nil (obj))
     {
@@ -22005,7 +20682,7 @@ IR::HomeDef::_duplicate (HomeDef_ptr obj)
 }
 
 CORBA::Boolean
-IR::HomeDef::_is_a (
+CORBA::ComponentIR::HomeDef::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
   )
@@ -22013,7 +20690,11 @@ IR::HomeDef::_is_a (
   if (
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:omg.org/IR/HomeDef:1.0"
+          "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
@@ -22021,6 +20702,10 @@ IR::HomeDef::_is_a (
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
+          "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -22052,19 +20737,33 @@ IR::HomeDef::_is_a (
     }
 }
 
-void *IR::HomeDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::ComponentIR::HomeDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
-              &ACE_NESTED_CLASS (::IR, HomeDef)::_tao_class_id)
+              &ACE_NESTED_CLASS (::CORBA::ComponentIR, HomeDef)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
               ptr_arith_t,
+              &::CORBA::ExtInterfaceDef::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::ExtInterfaceDef_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
               &::CORBA::InterfaceDef::_tao_class_id)
             )
     {
@@ -22079,6 +20778,20 @@ void *IR::HomeDef::_tao_QueryInterface (ptr_arith_t type)
     }
   else if (type == ACE_reinterpret_cast (
               ptr_arith_t,
+              &::CORBA::InterfaceAttrExtension::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::InterfaceAttrExtension_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
               &::CORBA::Container::_tao_class_id)
             )
     {
@@ -22153,15 +20866,15 @@ void *IR::HomeDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* IR::HomeDef::_interface_repository_id (void) const
+const char* CORBA::ComponentIR::HomeDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/IR/HomeDef:1.0";
+  return "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::HomeDef_ptr IR::HomeDef::base_home (
+::CORBA::ComponentIR::HomeDef_ptr CORBA::ComponentIR::HomeDef::base_home (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -22179,10 +20892,11 @@ const char* IR::HomeDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::ComponentDef_ptr IR::HomeDef::managed_component (
-    ACE_ENV_SINGLE_ARG_DECL
+void CORBA::ComponentIR::HomeDef::base_home (
+    CORBA::ComponentIR::HomeDef_ptr base_home
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22190,18 +20904,19 @@ const char* IR::HomeDef::_interface_repository_id (void) const
 {
   _TAO_HomeDef_Proxy_Impl &proxy = 
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK;
   
-  return proxy.managed_component (
-      this
+  proxy.base_home (
+      this,
+      base_home
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::PrimaryKeyDef_ptr IR::HomeDef::primary_key (
+::CORBA::InterfaceDefSeq * CORBA::ComponentIR::HomeDef::supported_interfaces (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -22212,17 +20927,18 @@ const char* IR::HomeDef::_interface_repository_id (void) const
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  return proxy.primary_key (
+  return proxy.supported_interfaces (
       this
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::FactoryDefSeq * IR::HomeDef::factories (
-    ACE_ENV_SINGLE_ARG_DECL
+void CORBA::ComponentIR::HomeDef::supported_interfaces (
+    const CORBA::InterfaceDefSeq & supported_interfaces
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22230,18 +20946,19 @@ const char* IR::HomeDef::_interface_repository_id (void) const
 {
   _TAO_HomeDef_Proxy_Impl &proxy = 
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK;
   
-  return proxy.factories (
-      this
+  proxy.supported_interfaces (
+      this,
+      supported_interfaces
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::FinderDefSeq * IR::HomeDef::finders (
+::CORBA::ComponentIR::ComponentDef_ptr CORBA::ComponentIR::HomeDef::managed_component (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -22252,16 +20969,38 @@ const char* IR::HomeDef::_interface_repository_id (void) const
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  return proxy.finders (
+  return proxy.managed_component (
       this
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-CORBA::Boolean IR::HomeDef::is_basic (
+void CORBA::ComponentIR::HomeDef::managed_component (
+    CORBA::ComponentIR::ComponentDef_ptr managed_component
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_HomeDef_Proxy_Impl &proxy = 
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  proxy.managed_component (
+      this,
+      managed_component
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::ValueDef_ptr CORBA::ComponentIR::HomeDef::primary_key (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -22272,19 +21011,16 @@ CORBA::Boolean IR::HomeDef::is_basic (
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   
-  return proxy.is_basic (
+  return proxy.primary_key (
       this
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key (
-    const char * id,
-    const char * name,
-    const char * version,
+void CORBA::ComponentIR::HomeDef::primary_key (
     CORBA::ValueDef_ptr primary_key
     ACE_ENV_ARG_DECL
   )
@@ -22294,22 +21030,19 @@ CORBA::Boolean IR::HomeDef::is_basic (
 {
   _TAO_HomeDef_Proxy_Impl &proxy = 
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK;
   
-  return proxy.create_primary_key (
+  proxy.primary_key (
       this,
-      id,
-      name,
-      version,
       primary_key
       ACE_ENV_ARG_PARAMETER
     );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::FactoryDef_ptr IR::HomeDef::create_factory (
+::CORBA::ComponentIR::FactoryDef_ptr CORBA::ComponentIR::HomeDef::create_factory (
     const char * id,
     const char * name,
     const char * version,
@@ -22337,9 +21070,9 @@ CORBA::Boolean IR::HomeDef::is_basic (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
-::IR::FinderDef_ptr IR::HomeDef::create_finder (
+::CORBA::ComponentIR::FinderDef_ptr CORBA::ComponentIR::HomeDef::create_finder (
     const char * id,
     const char * name,
     const char * version,
@@ -22367,267 +21100,282 @@ CORBA::Boolean IR::HomeDef::is_basic (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_HomeDef[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_HomeDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  27,
+  42,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f48), 
-  ACE_NTOHL (0x6f6d6544), 
-  ACE_NTOHL (0x65663a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDef:1.0
-  8,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f486f), 
+  ACE_NTOHL (0x6d654465), 
+  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0
+    8,
   ACE_NTOHL (0x486f6d65), 
   ACE_NTOHL (0x44656600),  // name = HomeDef
-};
+  };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_HomeDef (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_HomeDef (
     CORBA::tk_objref,
-    sizeof (_oc_IR_HomeDef),
-    (char *) &_oc_IR_HomeDef,
+    sizeof (_oc_CORBA_ComponentIR_HomeDef),
+    (char *) &_oc_CORBA_ComponentIR_HomeDef,
     0,
-    sizeof (IR::HomeDef)
+    sizeof (CORBA::ComponentIR::HomeDef)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
     _tc_HomeDef,
-    &_tc_TAO_tc_IR_HomeDef
+    &_tc_TAO_tc_CORBA_ComponentIR_HomeDef
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_HomeDescription[] =
+static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
+  50,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
   ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f48), 
-  ACE_NTOHL (0x6f6d6544), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDescription:1.0
-  16,
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f486f), 
+  ACE_NTOHL (0x6d654465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/HomeDescription:1.0
+    16,
   ACE_NTOHL (0x486f6d65), 
   ACE_NTOHL (0x44657363), 
   ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = HomeDescription
   12, // member count
-  5,
+    5,
   ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
+    33,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f49), 
-    ACE_NTOHL (0x64656e74), 
-    ACE_NTOHL (0x69666965), 
-    ACE_NTOHL (0x723a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
-    11,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+        11,
     ACE_NTOHL (0x4964656e), 
     ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
+    35,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
-    ACE_NTOHL (0x7949643a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
-    13,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+        13,
     ACE_NTOHL (0x5265706f), 
     ACE_NTOHL (0x7369746f), 
     ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   11,
   ACE_NTOHL (0x64656669), 
   ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
-  0xffffffa0, // negative offset (-96)
+    0xffffffff, // indirection
+  0xffffff9c, // negative offset (-100)
   8,
   ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
+    34,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f56), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5370), 
-    ACE_NTOHL (0x65633a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
-    12,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+        12,
     ACE_NTOHL (0x56657273), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+        CORBA::tk_string, 
     0U, // string length
 
   10,
   ACE_NTOHL (0x62617365), 
   ACE_NTOHL (0x5f686f6d), 
   ACE_NTOHL (0x65000000),  // name = base_home
-  0xffffffff, // indirection
-  0xffffff34, // negative offset (-204)
+    0xffffffff, // indirection
+  0xffffff2c, // negative offset (-212)
   18,
   ACE_NTOHL (0x6d616e61), 
   ACE_NTOHL (0x6765645f), 
   ACE_NTOHL (0x636f6d70), 
   ACE_NTOHL (0x6f6e656e), 
   ACE_NTOHL (0x74000000),  // name = managed_component
-  0xffffffff, // indirection
-  0xffffff14, // negative offset (-236)
-  16,
+    0xffffffff, // indirection
+  0xffffff0c, // negative offset (-244)
+  12,
   ACE_NTOHL (0x7072696d), 
   ACE_NTOHL (0x6172795f), 
-  ACE_NTOHL (0x6b65795f), 
-  ACE_NTOHL (0x64656600),  // name = primary_key_def
-  CORBA::tk_objref, // typecode kind
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f50), 
-    ACE_NTOHL (0x72696d61), 
-    ACE_NTOHL (0x72794b65), 
-    ACE_NTOHL (0x79446566), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/PrimaryKeyDef:1.0
-    14,
-    ACE_NTOHL (0x5072696d), 
-    ACE_NTOHL (0x6172794b), 
-    ACE_NTOHL (0x65794465), 
-    ACE_NTOHL (0x66000000),  // name = PrimaryKeyDef
-
-  10,
-  ACE_NTOHL (0x66616374), 
-  ACE_NTOHL (0x6f726965), 
-  ACE_NTOHL (0x73000000),  // name = factories
-  CORBA::tk_alias, // typecode kind for typedefs
-  144, // encapsulation length
+  ACE_NTOHL (0x6b657900),  // name = primary_key
+    CORBA::tk_struct, // typecode kind
+  408, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
+    39,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f46), 
-    ACE_NTOHL (0x6163746f), 
-    ACE_NTOHL (0x72794465), 
-    ACE_NTOHL (0x66536571), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FactoryDefSeq:1.0
-    14,
-    ACE_NTOHL (0x46616374), 
-    ACE_NTOHL (0x6f727944), 
-    ACE_NTOHL (0x65665365), 
-    ACE_NTOHL (0x71000000),  // name = FactoryDefSeq
-    CORBA::tk_sequence, // typecode kind
-    72, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_objref, // typecode kind
-      56, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f46), 
-        ACE_NTOHL (0x6163746f), 
-        ACE_NTOHL (0x72794465), 
-        ACE_NTOHL (0x663a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/FactoryDef:1.0
-        11,
-        ACE_NTOHL (0x46616374), 
-        ACE_NTOHL (0x6f727944), 
-        ACE_NTOHL (0x65660000),  // name = FactoryDef
-
-      0U,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5661), 
+    ACE_NTOHL (0x6c756544), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e3a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDescription:1.0
+        17,
+    ACE_NTOHL (0x56616c75), 
+    ACE_NTOHL (0x65446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x0),  // name = ValueDescription
+    10, // member count
+        5,
+    ACE_NTOHL (0x6e616d65), 
+    ACE_NTOHL (0x0),  // name = name
+        0xffffffff, // indirection
+    0xfffffe40, // negative offset (-448)
+    3,
+    ACE_NTOHL (0x69640000),  // name = id
+        0xffffffff, // indirection
+    0xfffffe84, // negative offset (-380)
+    12,
+    ACE_NTOHL (0x69735f61), 
+    ACE_NTOHL (0x62737472), 
+    ACE_NTOHL (0x61637400),  // name = is_abstract
+        CORBA::tk_boolean,
 
+    10,
+    ACE_NTOHL (0x69735f63), 
+    ACE_NTOHL (0x7573746f), 
+    ACE_NTOHL (0x6d000000),  // name = is_custom
+        CORBA::tk_boolean,
 
-  8,
-  ACE_NTOHL (0x66696e64), 
-  ACE_NTOHL (0x65727300),  // name = finders
-  CORBA::tk_alias, // typecode kind for typedefs
-  140, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49522f46), 
-    ACE_NTOHL (0x696e6465), 
-    ACE_NTOHL (0x72446566), 
-    ACE_NTOHL (0x5365713a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/FinderDefSeq:1.0
-    13,
-    ACE_NTOHL (0x46696e64), 
-    ACE_NTOHL (0x65724465), 
-    ACE_NTOHL (0x66536571), 
-    ACE_NTOHL (0x0),  // name = FinderDefSeq
-    CORBA::tk_sequence, // typecode kind
-    72, // encapsulation length
+    11,
+    ACE_NTOHL (0x64656669), 
+    ACE_NTOHL (0x6e65645f), 
+    ACE_NTOHL (0x696e0000),  // name = defined_in
+        0xffffffff, // indirection
+    0xfffffe44, // negative offset (-444)
+    8,
+    ACE_NTOHL (0x76657273), 
+    ACE_NTOHL (0x696f6e00),  // name = version
+        0xffffffff, // indirection
+    0xfffffea4, // negative offset (-348)
+    21,
+    ACE_NTOHL (0x73757070), 
+    ACE_NTOHL (0x6f727465), 
+    ACE_NTOHL (0x645f696e), 
+    ACE_NTOHL (0x74657266), 
+    ACE_NTOHL (0x61636573), 
+    ACE_NTOHL (0x0),  // name = supported_interfaces
+        CORBA::tk_alias, // typecode kind for typedefs
+    92, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_objref, // typecode kind
-      56, // encapsulation length
+      38,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x49645365), 
+      ACE_NTOHL (0x713a312e), 
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
+            16,
+      ACE_NTOHL (0x5265706f), 
+      ACE_NTOHL (0x7369746f), 
+      ACE_NTOHL (0x72794964), 
+      ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
+            CORBA::tk_sequence, // typecode kind
+      16, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        29,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49522f46), 
-        ACE_NTOHL (0x696e6465), 
-        ACE_NTOHL (0x72446566), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FinderDef:1.0
-        10,
-        ACE_NTOHL (0x46696e64), 
-        ACE_NTOHL (0x65724465), 
-        ACE_NTOHL (0x66000000),  // name = FinderDef
+        0xffffffff, // indirection
+        0xfffffdb4, // negative offset (-588)
+        0U,
 
-      0U,
 
+    21,
+    ACE_NTOHL (0x61627374), 
+    ACE_NTOHL (0x72616374), 
+    ACE_NTOHL (0x5f626173), 
+    ACE_NTOHL (0x655f7661), 
+    ACE_NTOHL (0x6c756573), 
+    ACE_NTOHL (0x0),  // name = abstract_base_values
+        0xffffffff, // indirection
+    0xffffff7c, // negative offset (-132)
+    15,
+    ACE_NTOHL (0x69735f74), 
+    ACE_NTOHL (0x72756e63), 
+    ACE_NTOHL (0x61746162), 
+    ACE_NTOHL (0x6c650000),  // name = is_truncatable
+        CORBA::tk_boolean,
 
-  11,
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e730000),  // name = operations
-  CORBA::tk_alias, // typecode kind for typedefs
-  1548, // encapsulation length
+    11,
+    ACE_NTOHL (0x62617365), 
+    ACE_NTOHL (0x5f76616c), 
+    ACE_NTOHL (0x75650000),  // name = base_value
+        0xffffffff, // indirection
+    0xfffffd5c, // negative offset (-676)
+
+  10,
+  ACE_NTOHL (0x66616374), 
+  ACE_NTOHL (0x6f726965), 
+  ACE_NTOHL (0x73000000),  // name = factories
+    CORBA::tk_alias, // typecode kind for typedefs
+  1340, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
     ACE_NTOHL (0x49444c3a), 
@@ -22640,17 +21388,17 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
-    17,
+        17,
     ACE_NTOHL (0x4f704465), 
     ACE_NTOHL (0x73637269), 
     ACE_NTOHL (0x7074696f), 
     ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
-    1468, // encapsulation length
+        CORBA::tk_sequence, // typecode kind
+    1260, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
-      1452, // encapsulation length
+      1244, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
         ACE_NTOHL (0x49444c3a), 
@@ -22664,7 +21412,7 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
         ACE_NTOHL (0x69707469), 
         ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
-        21,
+                21,
         ACE_NTOHL (0x4f706572), 
         ACE_NTOHL (0x6174696f), 
         ACE_NTOHL (0x6e446573), 
@@ -22672,90 +21420,35 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
         ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
-        5,
+                5,
         ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
-          ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
+                0xffffffff, // indirection
+        0xfffffc2c, // negative offset (-980)
         3,
         ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
-          ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
+                0xffffffff, // indirection
+        0xfffffc70, // negative offset (-912)
         11,
         ACE_NTOHL (0x64656669), 
         ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
-        0xffffffff, // indirection
-        0xffffff9c, // negative offset (-100)
+                0xffffffff, // indirection
+        0xfffffc58, // negative offset (-936)
         8,
         ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
-          ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
-
+                0xffffffff, // indirection
+        0xfffffcb8, // negative offset (-840)
         7,
         ACE_NTOHL (0x72657375), 
         ACE_NTOHL (0x6c740000),  // name = result
-        CORBA::tk_TypeCode,
+                CORBA::tk_TypeCode,
 
         5,
         ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
+                CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
@@ -22768,26 +21461,26 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           ACE_NTOHL (0x696f6e4d), 
           ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-14,
+          14,
           ACE_NTOHL (0x4f706572), 
           ACE_NTOHL (0x6174696f), 
           ACE_NTOHL (0x6e4d6f64), 
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
-10,
+          10,
           ACE_NTOHL (0x4f505f4e), 
           ACE_NTOHL (0x4f524d41), 
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-10,
+          10,
           ACE_NTOHL (0x4f505f4f), 
           ACE_NTOHL (0x4e455741), 
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
+          
         9,
         ACE_NTOHL (0x636f6e74), 
         ACE_NTOHL (0x65787473), 
         ACE_NTOHL (0x0),  // name = contexts
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         168, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
@@ -22800,12 +21493,12 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           ACE_NTOHL (0x74496453), 
           ACE_NTOHL (0x65713a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-          13,
+                    13,
           ACE_NTOHL (0x436f6e74), 
           ACE_NTOHL (0x65787449), 
           ACE_NTOHL (0x64536571), 
           ACE_NTOHL (0x0),  // name = ContextIdSeq
-          CORBA::tk_sequence, // typecode kind
+                    CORBA::tk_sequence, // typecode kind
           96, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_alias, // typecode kind for typedefs
@@ -22822,14 +21515,14 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               ACE_NTOHL (0x6e746966), 
               ACE_NTOHL (0x6965723a), 
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-              18,
+                            18,
               ACE_NTOHL (0x436f6e74), 
               ACE_NTOHL (0x65787449), 
               ACE_NTOHL (0x64656e74), 
               ACE_NTOHL (0x69666965), 
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-              0xffffffff, // indirection
-              0xfffffdac, // negative offset (-596)
+                            0xffffffff, // indirection
+              0xfffffaac, // negative offset (-1364)
 
             0U,
 
@@ -22838,7 +21531,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x70617261), 
         ACE_NTOHL (0x6d657465), 
         ACE_NTOHL (0x72730000),  // name = parameters
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         428, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
@@ -22852,13 +21545,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           ACE_NTOHL (0x74696f6e), 
           ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-          18,
+                    18,
           ACE_NTOHL (0x50617244), 
           ACE_NTOHL (0x65736372), 
           ACE_NTOHL (0x69707469), 
           ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
+                    CORBA::tk_sequence, // typecode kind
           348, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
@@ -22876,7 +21569,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               ACE_NTOHL (0x69707469), 
               ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-              21,
+                            21,
               ACE_NTOHL (0x50617261), 
               ACE_NTOHL (0x6d657465), 
               ACE_NTOHL (0x72446573), 
@@ -22884,21 +21577,21 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
-              5,
+                            5,
               ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-              0xffffffff, // indirection
-              0xfffffccc, // negative offset (-820)
+                            0xffffffff, // indirection
+              0xfffff9cc, // negative offset (-1588)
               5,
               ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
+                            CORBA::tk_TypeCode,
 
               9,
               ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x5f646566), 
               ACE_NTOHL (0x0),  // name = type_def
-              CORBA::tk_objref, // typecode kind
+                            CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
@@ -22910,14 +21603,14 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 ACE_NTOHL (0x4c547970), 
                 ACE_NTOHL (0x653a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                8,
+                                8,
                 ACE_NTOHL (0x49444c54), 
                 ACE_NTOHL (0x79706500),  // name = IDLType
-
+                
               5,
               ACE_NTOHL (0x6d6f6465), 
               ACE_NTOHL (0x0),  // name = mode
-              CORBA::tk_enum, // typecode kind
+                            CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
@@ -22930,25 +21623,25 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 ACE_NTOHL (0x7465724d), 
                 ACE_NTOHL (0x6f64653a), 
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-14,
+                14,
                 ACE_NTOHL (0x50617261), 
                 ACE_NTOHL (0x6d657465), 
                 ACE_NTOHL (0x724d6f64), 
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
-9,
+                9,
                 ACE_NTOHL (0x50415241), 
                 ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x0),  // name = PARAM_IN
-10,
+                10,
                 ACE_NTOHL (0x50415241), 
                 ACE_NTOHL (0x4d5f4f55), 
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-12,
+                12,
                 ACE_NTOHL (0x50415241), 
                 ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+                
 
             0U,
 
@@ -22957,7 +21650,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x65786365), 
         ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = exceptions
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         276, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
@@ -22971,13 +21664,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           ACE_NTOHL (0x74696f6e), 
           ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-          18,
+                    18,
           ACE_NTOHL (0x45786344), 
           ACE_NTOHL (0x65736372), 
           ACE_NTOHL (0x69707469), 
           ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
+                    CORBA::tk_sequence, // typecode kind
           196, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
@@ -22995,7 +21688,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               ACE_NTOHL (0x69707469), 
               ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-              21,
+                            21,
               ACE_NTOHL (0x45786365), 
               ACE_NTOHL (0x7074696f), 
               ACE_NTOHL (0x6e446573), 
@@ -23003,30 +21696,30 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
-              5,
+                            5,
               ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-              0xffffffff, // indirection
-              0xfffffb08, // negative offset (-1272)
+                            0xffffffff, // indirection
+              0xfffff808, // negative offset (-2040)
               3,
               ACE_NTOHL (0x69640000),  // name = id
-              0xffffffff, // indirection
-              0xfffffb4c, // negative offset (-1204)
+                            0xffffffff, // indirection
+              0xfffff84c, // negative offset (-1972)
               11,
               ACE_NTOHL (0x64656669), 
               ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
-              0xffffffff, // indirection
-              0xfffffb34, // negative offset (-1228)
+                            0xffffffff, // indirection
+              0xfffff834, // negative offset (-1996)
               8,
               ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
-              0xffffffff, // indirection
-              0xfffffb94, // negative offset (-1132)
+                            0xffffffff, // indirection
+              0xfffff894, // negative offset (-1900)
               5,
               ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
+                            CORBA::tk_TypeCode,
 
 
             0U,
@@ -23036,86 +21729,99 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       0U,
 
 
+  8,
+  ACE_NTOHL (0x66696e64), 
+  ACE_NTOHL (0x65727300),  // name = finders
+    0xffffffff, // indirection
+  0xfffffaac, // negative offset (-1364)
+  11,
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e730000),  // name = operations
+    0xffffffff, // indirection
+  0xfffffa94, // negative offset (-1388)
   11,
   ACE_NTOHL (0x61747472), 
   ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65730000),  // name = attributes
-  CORBA::tk_alias, // typecode kind for typedefs
-  404, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  468, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    41,
+    44,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
     ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4174), 
-    ACE_NTOHL (0x74724465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
-    19,
-    ACE_NTOHL (0x41747472), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
-    320, // encapsulation length
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x74417474), 
+    ACE_NTOHL (0x72446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
+        22,
+    ACE_NTOHL (0x45787441), 
+    ACE_NTOHL (0x74747244), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
+        CORBA::tk_sequence, // typecode kind
+    380, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
-      304, // encapsulation length
+      364, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        43,
+        46,
         ACE_NTOHL (0x49444c3a), 
         ACE_NTOHL (0x6f6d672e), 
         ACE_NTOHL (0x6f72672f), 
         ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4174), 
-        ACE_NTOHL (0x74726962), 
-        ACE_NTOHL (0x75746544), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-        21,
-        ACE_NTOHL (0x41747472), 
-        ACE_NTOHL (0x69627574), 
-        ACE_NTOHL (0x65446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
-        ACE_NTOHL (0x0),  // name = AttributeDescription
-        6, // member count
-        5,
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x74417474), 
+        ACE_NTOHL (0x72696275), 
+        ACE_NTOHL (0x74654465), 
+        ACE_NTOHL (0x73637269), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e3a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
+                24,
+        ACE_NTOHL (0x45787441), 
+        ACE_NTOHL (0x74747269), 
+        ACE_NTOHL (0x62757465), 
+        ACE_NTOHL (0x44657363), 
+        ACE_NTOHL (0x72697074), 
+        ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
+        8, // member count
+                5,
         ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        0xffffffff, // indirection
-        0xfffff9d4, // negative offset (-1580)
+                0xffffffff, // indirection
+        0xfffff6a0, // negative offset (-2400)
         3,
         ACE_NTOHL (0x69640000),  // name = id
-        0xffffffff, // indirection
-        0xfffffa18, // negative offset (-1512)
+                0xffffffff, // indirection
+        0xfffff6e4, // negative offset (-2332)
         11,
         ACE_NTOHL (0x64656669), 
         ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
-        0xffffffff, // indirection
-        0xfffffa00, // negative offset (-1536)
+                0xffffffff, // indirection
+        0xfffff6cc, // negative offset (-2356)
         8,
         ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
-        0xffffffff, // indirection
-        0xfffffa60, // negative offset (-1440)
+                0xffffffff, // indirection
+        0xfffff72c, // negative offset (-2260)
         5,
         ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
+                CORBA::tk_TypeCode,
 
         5,
         ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
+                CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
@@ -23128,788 +21834,429 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           ACE_NTOHL (0x7574654d), 
           ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-14,
+          14,
           ACE_NTOHL (0x41747472), 
           ACE_NTOHL (0x69627574), 
           ACE_NTOHL (0x654d6f64), 
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
-12,
+          12,
           ACE_NTOHL (0x41545452), 
           ACE_NTOHL (0x5f4e4f52), 
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-14,
+          14,
           ACE_NTOHL (0x41545452), 
           ACE_NTOHL (0x5f524541), 
           ACE_NTOHL (0x444f4e4c), 
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+          
+        15,
+        ACE_NTOHL (0x6765745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = get_exceptions
+                0xffffffff, // indirection
+        0xfffffcec, // negative offset (-788)
+        15,
+        ACE_NTOHL (0x7075745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = put_exceptions
+                0xffffffff, // indirection
+        0xfffffcd0, // negative offset (-816)
 
       0U,
 
 
-  9,
-  ACE_NTOHL (0x69735f62), 
-  ACE_NTOHL (0x61736963), 
-  ACE_NTOHL (0x0),  // name = is_basic
-  CORBA::tk_boolean,
+  5,
+  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x0),  // name = type
+    CORBA::tk_TypeCode,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_IR_HomeDescription (
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_HomeDescription (
     CORBA::tk_struct,
-    sizeof (_oc_IR_HomeDescription),
-    (char *) &_oc_IR_HomeDescription,
+    sizeof (_oc_CORBA_ComponentIR_HomeDescription),
+    (char *) &_oc_CORBA_ComponentIR_HomeDescription,
     0,
-    sizeof (IR::HomeDescription)
+    sizeof (CORBA::ComponentIR::HomeDescription)
   );
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_BEGIN (ComponentIR)
 TAO_NAMESPACE_DEFINE (
     ::CORBA::TypeCode_ptr,
     _tc_HomeDescription,
-    &_tc_TAO_tc_IR_HomeDescription
+    &_tc_TAO_tc_CORBA_ComponentIR_HomeDescription
   )
 TAO_NAMESPACE_END
+TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void IR::HomeDescription::_tao_any_destructor (void *_tao_void_pointer)
+void CORBA::ComponentIR::HomeDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
   HomeDescription *tmp = ACE_static_cast (HomeDescription*, _tao_void_pointer);
   delete tmp;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (CORBA::Any &_tao_any, IR::DefinitionKind _tao_elem)
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      IR::_tc_DefinitionKind,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::DefinitionKind &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result = type->equivalent (IR::_tc_DefinitionKind ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      return 0; // not equivalent
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
-      );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
 // Copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    const IR::RepositoryIdSeq &_tao_elem
+    CORBA::ComponentIR::EventDef_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_RepositoryIdSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  CORBA::ComponentIR::EventDef_ptr _tao_objptr =
+    CORBA::ComponentIR::EventDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
 // Non-copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    IR::RepositoryIdSeq *_tao_elem
+    CORBA::ComponentIR::EventDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_RepositoryIdSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::RepositoryIdSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EventDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EventDef,
+      *_tao_elem
+    );
 }
 
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
-    IR::RepositoryIdSeq *&_tao_elem
+    CORBA::ComponentIR::EventDef_ptr &_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IR::RepositoryIdSeq*&,
-      _tao_elem
-    );
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EventDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_EventDef,
+        _tao_elem
+      );
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IR::RepositoryIdSeq *&_tao_elem
-  )
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_RepositoryIdSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IR::RepositoryIdSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::RepositoryIdSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::RepositoryIdSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_RepositoryIdSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::RepositoryIdSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO_Object_Manager<CORBA::ComponentIR::EventDef,CORBA::ComponentIR::EventDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::EventDef, CORBA::ComponentIR::EventDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
 // Copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    const IR::ComponentDefSeq &_tao_elem
+    CORBA::ComponentIR::Container_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ComponentDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  CORBA::ComponentIR::Container_ptr _tao_objptr =
+    CORBA::ComponentIR::Container::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
 // Non-copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    IR::ComponentDefSeq *_tao_elem
+    CORBA::ComponentIR::Container_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ComponentDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::ComponentDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::Container>::insert (
+      _tao_any,
+      CORBA::ComponentIR::Container::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_Container,
+      *_tao_elem
+    );
 }
 
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
-    IR::ComponentDefSeq *&_tao_elem
+    CORBA::ComponentIR::Container_ptr &_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IR::ComponentDefSeq*&,
-      _tao_elem
-    );
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::Container>::extract (
+        _tao_any,
+        CORBA::ComponentIR::Container::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_Container,
+        _tao_elem
+      );
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IR::ComponentDefSeq *&_tao_elem
-  )
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::Container>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_ComponentDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IR::ComponentDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::ComponentDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::ComponentDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_ComponentDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::ComponentDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO_Object_Manager<CORBA::ComponentIR::Container,CORBA::ComponentIR::Container_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::Container>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::Container, CORBA::ComponentIR::Container_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::Container>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
 // Copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    const IR::ProvidesDefSeq &_tao_elem
+    CORBA::ComponentIR::ModuleDef_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ProvidesDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  CORBA::ComponentIR::ModuleDef_ptr _tao_objptr =
+    CORBA::ComponentIR::ModuleDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
 // Non-copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    IR::ProvidesDefSeq *_tao_elem
+    CORBA::ComponentIR::ModuleDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ProvidesDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::ProvidesDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ModuleDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ModuleDef,
+      *_tao_elem
+    );
 }
 
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
-    IR::ProvidesDefSeq *&_tao_elem
+    CORBA::ComponentIR::ModuleDef_ptr &_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IR::ProvidesDefSeq*&,
-      _tao_elem
-    );
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ModuleDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ModuleDef,
+        _tao_elem
+      );
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IR::ProvidesDefSeq *&_tao_elem
-  )
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_ProvidesDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IR::ProvidesDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::ProvidesDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::ProvidesDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_ProvidesDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::ProvidesDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO_Object_Manager<CORBA::ComponentIR::ModuleDef,CORBA::ComponentIR::ModuleDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::ModuleDef, CORBA::ComponentIR::ModuleDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
 // Copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    const IR::UsesDefSeq &_tao_elem
+    CORBA::ComponentIR::Repository_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_UsesDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  CORBA::ComponentIR::Repository_ptr _tao_objptr =
+    CORBA::ComponentIR::Repository::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
 // Non-copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    IR::UsesDefSeq *_tao_elem
+    CORBA::ComponentIR::Repository_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_UsesDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::UsesDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::insert (
+      _tao_any,
+      CORBA::ComponentIR::Repository::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_Repository,
+      *_tao_elem
+    );
 }
 
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
-    IR::UsesDefSeq *&_tao_elem
+    CORBA::ComponentIR::Repository_ptr &_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IR::UsesDefSeq*&,
-      _tao_elem
-    );
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::extract (
+        _tao_any,
+        CORBA::ComponentIR::Repository::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_Repository,
+        _tao_elem
+      );
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IR::UsesDefSeq *&_tao_elem
-  )
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_UsesDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IR::UsesDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::UsesDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::UsesDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_UsesDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::UsesDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO_Object_Manager<CORBA::ComponentIR::Repository,CORBA::ComponentIR::Repository_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::Repository>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::Repository, CORBA::ComponentIR::Repository_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::Repository>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
 // Copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    const IR::HomeDefSeq &_tao_elem
+    CORBA::ComponentIR::ProvidesDef_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_HomeDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  CORBA::ComponentIR::ProvidesDef_ptr _tao_objptr =
+    CORBA::ComponentIR::ProvidesDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
 // Non-copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    IR::HomeDefSeq *_tao_elem
+    CORBA::ComponentIR::ProvidesDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_HomeDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::HomeDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ProvidesDef,
+      *_tao_elem
+    );
 }
 
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
-    IR::HomeDefSeq *&_tao_elem
+    CORBA::ComponentIR::ProvidesDef_ptr &_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IR::HomeDefSeq*&,
-      _tao_elem
-    );
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ProvidesDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ProvidesDef,
+        _tao_elem
+      );
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IR::HomeDefSeq *&_tao_elem
-  )
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_HomeDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IR::HomeDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::HomeDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::HomeDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_HomeDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::HomeDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  _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::ComponentIR::ProvidesDef,CORBA::ComponentIR::ProvidesDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::ProvidesDef, CORBA::ComponentIR::ProvidesDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const IR::EmitsDefSeq &_tao_elem
+    const CORBA::ComponentIR::ProvidesDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_EmitsDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ProvidesDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    IR::EmitsDefSeq *_tao_elem
+    CORBA::ComponentIR::ProvidesDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_EmitsDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::EmitsDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ProvidesDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    IR::EmitsDefSeq *&_tao_elem
+    CORBA::ComponentIR::ProvidesDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IR::EmitsDefSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ComponentIR::ProvidesDescription *&,
       _tao_elem
     );
 }
@@ -23917,253 +22264,127 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const IR::EmitsDefSeq *&_tao_elem
+    const CORBA::ComponentIR::ProvidesDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_EmitsDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IR::EmitsDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::EmitsDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::EmitsDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_EmitsDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::EmitsDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ProvidesDescription,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
 // Copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    const IR::PublishesDefSeq &_tao_elem
+    CORBA::ComponentIR::UsesDef_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_PublishesDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  CORBA::ComponentIR::UsesDef_ptr _tao_objptr =
+    CORBA::ComponentIR::UsesDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
 // Non-copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    IR::PublishesDefSeq *_tao_elem
+    CORBA::ComponentIR::UsesDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_PublishesDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::PublishesDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::UsesDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_UsesDef,
+      *_tao_elem
+    );
 }
 
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
-    IR::PublishesDefSeq *&_tao_elem
+    CORBA::ComponentIR::UsesDef_ptr &_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IR::PublishesDefSeq*&,
-      _tao_elem
-    );
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::UsesDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_UsesDef,
+        _tao_elem
+      );
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IR::PublishesDefSeq *&_tao_elem
-  )
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_PublishesDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IR::PublishesDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::PublishesDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::PublishesDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_PublishesDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::PublishesDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  _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::ComponentIR::UsesDef,CORBA::ComponentIR::UsesDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::UsesDef, CORBA::ComponentIR::UsesDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const IR::ConsumesDefSeq &_tao_elem
+    const CORBA::ComponentIR::UsesDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ConsumesDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::UsesDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_UsesDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    IR::ConsumesDefSeq *_tao_elem
+    CORBA::ComponentIR::UsesDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ConsumesDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::ConsumesDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>::insert (
+      _tao_any,
+      CORBA::ComponentIR::UsesDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_UsesDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    IR::ConsumesDefSeq *&_tao_elem
+    CORBA::ComponentIR::UsesDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IR::ConsumesDefSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ComponentIR::UsesDescription *&,
       _tao_elem
     );
 }
@@ -24171,253 +22392,127 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const IR::ConsumesDefSeq *&_tao_elem
+    const CORBA::ComponentIR::UsesDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_ConsumesDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IR::ConsumesDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::ConsumesDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::ConsumesDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_ConsumesDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::ConsumesDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>::extract (
+        _tao_any,
+        CORBA::ComponentIR::UsesDescription::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_UsesDescription,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
 // Copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    const IR::FactoryDefSeq &_tao_elem
+    CORBA::ComponentIR::EventPortDef_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_FactoryDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  CORBA::ComponentIR::EventPortDef_ptr _tao_objptr =
+    CORBA::ComponentIR::EventPortDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
 // Non-copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    IR::FactoryDefSeq *_tao_elem
+    CORBA::ComponentIR::EventPortDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_FactoryDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::FactoryDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EventPortDef,
+      *_tao_elem
+    );
 }
 
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
-    IR::FactoryDefSeq *&_tao_elem
+    CORBA::ComponentIR::EventPortDef_ptr &_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IR::FactoryDefSeq*&,
-      _tao_elem
-    );
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EventPortDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_EventPortDef,
+        _tao_elem
+      );
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IR::FactoryDefSeq *&_tao_elem
-  )
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_FactoryDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IR::FactoryDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::FactoryDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::FactoryDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_FactoryDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::FactoryDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  _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::ComponentIR::EventPortDef,CORBA::ComponentIR::EventPortDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::EventPortDef, CORBA::ComponentIR::EventPortDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const IR::FinderDefSeq &_tao_elem
+    const CORBA::ComponentIR::EventPortDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_FinderDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EventPortDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    IR::FinderDefSeq *_tao_elem
+    CORBA::ComponentIR::EventPortDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_FinderDefSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::FinderDefSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EventPortDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    IR::FinderDefSeq *&_tao_elem
+    CORBA::ComponentIR::EventPortDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IR::FinderDefSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ComponentIR::EventPortDescription *&,
       _tao_elem
     );
 }
@@ -24425,538 +22520,316 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const IR::FinderDefSeq *&_tao_elem
+    const CORBA::ComponentIR::EventPortDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_FinderDefSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IR::FinderDefSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::FinderDefSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::FinderDefSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_FinderDefSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::FinderDefSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_EventPortDescription,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
-    IR::ComponentRepository_ptr _tao_elem
+    CORBA::ComponentIR::EmitsDef_ptr _tao_elem
   )
 {
-  IR::ComponentRepository_ptr _tao_objptr =
-    IR::ComponentRepository::_duplicate (_tao_elem);
+  CORBA::ComponentIR::EmitsDef_ptr _tao_objptr =
+    CORBA::ComponentIR::EmitsDef::_duplicate (_tao_elem);
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
-    IR::ComponentRepository_ptr *_tao_elem
+    CORBA::ComponentIR::EmitsDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ComponentRepository, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          IR::ComponentRepository::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EmitsDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EmitsDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
 operator>>= (
     const CORBA::Any &_tao_any,
-    IR::ComponentRepository_ptr &_tao_elem
+    CORBA::ComponentIR::EmitsDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = IR::ComponentRepository::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_ComponentRepository
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EmitsDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_EmitsDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IR::_tc_ComponentRepository,
-            1,
-            _tao_elem,
-            IR::ComponentRepository::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = IR::ComponentRepository::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = IR::ComponentRepository::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::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<IR::ComponentRepository,IR::ComponentRepository_var>;
+  template class TAO_Object_Manager<CORBA::ComponentIR::EmitsDef,CORBA::ComponentIR::EmitsDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR::ComponentRepository,IR::ComponentRepository_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::EmitsDef, CORBA::ComponentIR::EmitsDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
-    IR::ProvidesDef_ptr _tao_elem
+    CORBA::ComponentIR::PublishesDef_ptr _tao_elem
   )
 {
-  IR::ProvidesDef_ptr _tao_objptr =
-    IR::ProvidesDef::_duplicate (_tao_elem);
+  CORBA::ComponentIR::PublishesDef_ptr _tao_objptr =
+    CORBA::ComponentIR::PublishesDef::_duplicate (_tao_elem);
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
-    IR::ProvidesDef_ptr *_tao_elem
+    CORBA::ComponentIR::PublishesDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ProvidesDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          IR::ProvidesDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::PublishesDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_PublishesDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
 operator>>= (
     const CORBA::Any &_tao_any,
-    IR::ProvidesDef_ptr &_tao_elem
+    CORBA::ComponentIR::PublishesDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = IR::ProvidesDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_ProvidesDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::PublishesDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_PublishesDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IR::_tc_ProvidesDef,
-            1,
-            _tao_elem,
-            IR::ProvidesDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = IR::ProvidesDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = IR::ProvidesDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::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<IR::ProvidesDef,IR::ProvidesDef_var>;
+  template class TAO_Object_Manager<CORBA::ComponentIR::PublishesDef,CORBA::ComponentIR::PublishesDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::PublishesDef, CORBA::ComponentIR::PublishesDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
 // Copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    const IR::ProvidesDescription &_tao_elem
+    CORBA::ComponentIR::ConsumesDef_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ProvidesDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  CORBA::ComponentIR::ConsumesDef_ptr _tao_objptr =
+    CORBA::ComponentIR::ConsumesDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
 // Non-copying insertion.
-void operator<<= (
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    IR::ProvidesDescription *_tao_elem
+    CORBA::ComponentIR::ConsumesDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ProvidesDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::ProvidesDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ConsumesDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ConsumesDef,
+      *_tao_elem
+    );
 }
 
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
-    IR::ProvidesDescription *&_tao_elem
+    CORBA::ComponentIR::ConsumesDef_ptr &_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IR::ProvidesDescription *&,
-      _tao_elem
-    );
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ConsumesDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ConsumesDef,
+        _tao_elem
+      );
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IR::ProvidesDescription *&_tao_elem
-  )
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_ProvidesDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const IR::ProvidesDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::ProvidesDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::ProvidesDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_ProvidesDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::ProvidesDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  _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::ComponentIR::ConsumesDef,CORBA::ComponentIR::ConsumesDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::ConsumesDef, CORBA::ComponentIR::ConsumesDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
-    IR::UsesDef_ptr _tao_elem
+    CORBA::ComponentIR::ComponentDef_ptr _tao_elem
   )
 {
-  IR::UsesDef_ptr _tao_objptr =
-    IR::UsesDef::_duplicate (_tao_elem);
+  CORBA::ComponentIR::ComponentDef_ptr _tao_objptr =
+    CORBA::ComponentIR::ComponentDef::_duplicate (_tao_elem);
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
-    IR::UsesDef_ptr *_tao_elem
+    CORBA::ComponentIR::ComponentDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_UsesDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          IR::UsesDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ComponentDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ComponentDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
 operator>>= (
     const CORBA::Any &_tao_any,
-    IR::UsesDef_ptr &_tao_elem
+    CORBA::ComponentIR::ComponentDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = IR::UsesDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_UsesDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ComponentDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ComponentDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IR::_tc_UsesDef,
-            1,
-            _tao_elem,
-            IR::UsesDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = IR::UsesDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = IR::UsesDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::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<IR::UsesDef,IR::UsesDef_var>;
+  template class TAO_Object_Manager<CORBA::ComponentIR::ComponentDef,CORBA::ComponentIR::ComponentDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::ComponentDef, CORBA::ComponentIR::ComponentDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const IR::UsesDescription &_tao_elem
+    const CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_UsesDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ProvidesDescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    IR::UsesDescription *_tao_elem
+    CORBA::ComponentIR::ProvidesDescriptionSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_UsesDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::UsesDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ProvidesDescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    IR::UsesDescription *&_tao_elem
+    CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
   )
 {
   return _tao_any >>= ACE_const_cast (
-      const IR::UsesDescription *&,
+      const CORBA::ComponentIR::ProvidesDescriptionSeq *&,
       _tao_elem
     );
 }
@@ -24964,126 +22837,57 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const IR::UsesDescription *&_tao_elem
+    const CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_UsesDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const IR::UsesDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::UsesDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::UsesDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_UsesDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::UsesDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ProvidesDescriptionSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const IR::ProvidesDescSeq &_tao_elem
+    const CORBA::ComponentIR::UsesDescriptionSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ProvidesDescSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_UsesDescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    IR::ProvidesDescSeq *_tao_elem
+    CORBA::ComponentIR::UsesDescriptionSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ProvidesDescSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::ProvidesDescSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_UsesDescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    IR::ProvidesDescSeq *&_tao_elem
+    CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IR::ProvidesDescSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ComponentIR::UsesDescriptionSeq *&,
       _tao_elem
     );
 }
@@ -25091,126 +22895,57 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const IR::ProvidesDescSeq *&_tao_elem
+    const CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_ProvidesDescSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IR::ProvidesDescSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::ProvidesDescSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::ProvidesDescSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_ProvidesDescSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::ProvidesDescSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_UsesDescriptionSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const IR::UsesDescSeq &_tao_elem
+    const CORBA::ComponentIR::EventPortDescriptionSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_UsesDescSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EventPortDescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    IR::UsesDescSeq *_tao_elem
+    CORBA::ComponentIR::EventPortDescriptionSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_UsesDescSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::UsesDescSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EventPortDescriptionSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    IR::UsesDescSeq *&_tao_elem
+    CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IR::UsesDescSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ComponentIR::EventPortDescriptionSeq *&,
       _tao_elem
     );
 }
@@ -25218,221 +22953,57 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const IR::UsesDescSeq *&_tao_elem
+    const CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_UsesDescSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IR::UsesDescSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::UsesDescSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::UsesDescSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_UsesDescSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::UsesDescSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
-
-// Copying version.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IR::EventDef_ptr _tao_elem
-  )
-{
-  IR::EventDef_ptr _tao_objptr =
-    IR::EventDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying version.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IR::EventDef_ptr *_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_EventDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          IR::EventDef::_tao_any_destructor
-        );
-    }
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    IR::EventDef_ptr &_tao_elem
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = IR::EventDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_EventDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_EventPortDescriptionSeq,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IR::_tc_EventDef,
-            1,
-            _tao_elem,
-            IR::EventDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = IR::EventDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = IR::EventDef::_nil ();
-  return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<IR::EventDef,IR::EventDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR::EventDef,IR::EventDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const IR::EventDescription &_tao_elem
+    const CORBA::ComponentIR::ComponentDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_EventDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ComponentDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    IR::EventDescription *_tao_elem
+    CORBA::ComponentIR::ComponentDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_EventDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::EventDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ComponentDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    IR::EventDescription *&_tao_elem
+    CORBA::ComponentIR::ComponentDescription *&_tao_elem
   )
 {
   return _tao_any >>= ACE_const_cast (
-      const IR::EventDescription *&,
+      const CORBA::ComponentIR::ComponentDescription *&,
       _tao_elem
     );
 }
@@ -25440,506 +23011,253 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const IR::EventDescription *&_tao_elem
-  )
-{
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_EventDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const IR::EventDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::EventDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::EventDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_EventDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::EventDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
-
-// Copying version.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IR::EmitsDef_ptr _tao_elem
-  )
-{
-  IR::EmitsDef_ptr _tao_objptr =
-    IR::EmitsDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying version.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IR::EmitsDef_ptr *_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_EmitsDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          IR::EmitsDef::_tao_any_destructor
-        );
-    }
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    IR::EmitsDef_ptr &_tao_elem
+    const CORBA::ComponentIR::ComponentDescription *&_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = IR::EmitsDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_EmitsDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ComponentDescription,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IR::_tc_EmitsDef,
-            1,
-            _tao_elem,
-            IR::EmitsDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = IR::EmitsDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = IR::EmitsDef::_nil ();
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var>;
+  template class TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var>
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
-    IR::PublishesDef_ptr _tao_elem
+    CORBA::ComponentIR::FactoryDef_ptr _tao_elem
   )
 {
-  IR::PublishesDef_ptr _tao_objptr =
-    IR::PublishesDef::_duplicate (_tao_elem);
+  CORBA::ComponentIR::FactoryDef_ptr _tao_objptr =
+    CORBA::ComponentIR::FactoryDef::_duplicate (_tao_elem);
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
-    IR::PublishesDef_ptr *_tao_elem
+    CORBA::ComponentIR::FactoryDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_PublishesDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          IR::PublishesDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::FactoryDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_FactoryDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
 operator>>= (
     const CORBA::Any &_tao_any,
-    IR::PublishesDef_ptr &_tao_elem
+    CORBA::ComponentIR::FactoryDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = IR::PublishesDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_PublishesDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::FactoryDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_FactoryDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IR::_tc_PublishesDef,
-            1,
-            _tao_elem,
-            IR::PublishesDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = IR::PublishesDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = IR::PublishesDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::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<IR::PublishesDef,IR::PublishesDef_var>;
+  template class TAO_Object_Manager<CORBA::ComponentIR::FactoryDef,CORBA::ComponentIR::FactoryDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::FactoryDef, CORBA::ComponentIR::FactoryDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
-    IR::ConsumesDef_ptr _tao_elem
+    CORBA::ComponentIR::FinderDef_ptr _tao_elem
   )
 {
-  IR::ConsumesDef_ptr _tao_objptr =
-    IR::ConsumesDef::_duplicate (_tao_elem);
+  CORBA::ComponentIR::FinderDef_ptr _tao_objptr =
+    CORBA::ComponentIR::FinderDef::_duplicate (_tao_elem);
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
-    IR::ConsumesDef_ptr *_tao_elem
+    CORBA::ComponentIR::FinderDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ConsumesDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          IR::ConsumesDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::FinderDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_FinderDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
 operator>>= (
     const CORBA::Any &_tao_any,
-    IR::ConsumesDef_ptr &_tao_elem
+    CORBA::ComponentIR::FinderDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = IR::ConsumesDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_ConsumesDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::FinderDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_FinderDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IR::_tc_ConsumesDef,
-            1,
-            _tao_elem,
-            IR::ConsumesDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = IR::ConsumesDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = IR::ConsumesDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::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<IR::ConsumesDef,IR::ConsumesDef_var>;
+  template class TAO_Object_Manager<CORBA::ComponentIR::FinderDef,CORBA::ComponentIR::FinderDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::FinderDef, CORBA::ComponentIR::FinderDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
-    IR::ComponentDef_ptr _tao_elem
+    CORBA::ComponentIR::HomeDef_ptr _tao_elem
   )
 {
-  IR::ComponentDef_ptr _tao_objptr =
-    IR::ComponentDef::_duplicate (_tao_elem);
+  CORBA::ComponentIR::HomeDef_ptr _tao_objptr =
+    CORBA::ComponentIR::HomeDef::_duplicate (_tao_elem);
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
-    IR::ComponentDef_ptr *_tao_elem
+    CORBA::ComponentIR::HomeDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ComponentDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          IR::ComponentDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::HomeDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_HomeDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
 operator>>= (
     const CORBA::Any &_tao_any,
-    IR::ComponentDef_ptr &_tao_elem
+    CORBA::ComponentIR::HomeDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = IR::ComponentDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_ComponentDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::HomeDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_HomeDef,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IR::_tc_ComponentDef,
-            1,
-            _tao_elem,
-            IR::ComponentDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = IR::ComponentDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = IR::ComponentDef::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::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<IR::ComponentDef,IR::ComponentDef_var>;
+  template class TAO_Object_Manager<CORBA::ComponentIR::HomeDef,CORBA::ComponentIR::HomeDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ComponentIR::HomeDef, CORBA::ComponentIR::HomeDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const IR::ComponentDescription &_tao_elem
+    const CORBA::ComponentIR::HomeDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ComponentDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_HomeDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    IR::ComponentDescription *_tao_elem
+    CORBA::ComponentIR::HomeDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_ComponentDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::ComponentDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::insert (
+      _tao_any,
+      CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_HomeDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    IR::ComponentDescription *&_tao_elem
+    CORBA::ComponentIR::HomeDescription *&_tao_elem
   )
 {
   return _tao_any >>= ACE_const_cast (
-      const IR::ComponentDescription *&,
+      const CORBA::ComponentIR::HomeDescription *&,
       _tao_elem
     );
 }
@@ -25947,1376 +23265,375 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const IR::ComponentDescription *&_tao_elem
+    const CORBA::ComponentIR::HomeDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_ComponentDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const IR::ComponentDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::ComponentDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::ComponentDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_ComponentDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::ComponentDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::extract (
+        _tao_any,
+        CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_HomeDescription,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// Copying version.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IR::PrimaryKeyDef_ptr _tao_elem
-  )
-{
-  IR::PrimaryKeyDef_ptr _tao_objptr =
-    IR::PrimaryKeyDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
-// Non-copying version.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IR::PrimaryKeyDef_ptr *_tao_elem
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ComponentIR::EventDef_ptr _tao_objref
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_PrimaryKeyDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          IR::PrimaryKeyDef::_tao_any_destructor
-        );
-    }
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    IR::PrimaryKeyDef_ptr &_tao_elem
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ComponentIR::EventDef_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = IR::PrimaryKeyDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_PrimaryKeyDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
+    CORBA::Object_var obj;
     
-    if (!_tao_result)
+    if ((strm >> obj.inout ()) == 0)
       {
-        return 0; // not equivalent
+        return 0;
       }
     
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
-      );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IR::_tc_PrimaryKeyDef,
-            1,
-            _tao_elem,
-            IR::PrimaryKeyDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::ComponentIR::EventDef::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
   ACE_CATCHANY
   {
-    _tao_elem = IR::PrimaryKeyDef::_nil ();
-    return 0;
+    // do nothing
   }
   ACE_ENDTRY;
-  
-  _tao_elem = IR::PrimaryKeyDef::_nil ();
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<IR::PrimaryKeyDef,IR::PrimaryKeyDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR::PrimaryKeyDef,IR::PrimaryKeyDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IR::PrimaryKeyDescription &_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_PrimaryKeyDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IR::PrimaryKeyDescription *_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_PrimaryKeyDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::PrimaryKeyDescription::_tao_any_destructor
-        );
-    }
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IR::PrimaryKeyDescription *&_tao_elem
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ComponentIR::Container_ptr _tao_objref
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IR::PrimaryKeyDescription *&,
-      _tao_elem
-    );
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IR::PrimaryKeyDescription *&_tao_elem
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ComponentIR::Container_ptr &_tao_objref
   )
 {
-  _tao_elem = 0;
-  
   ACE_TRY_NEW_ENV
   {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_PrimaryKeyDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
+    CORBA::Object_var obj;
     
-    if (_tao_result == 0)
+    if ((strm >> obj.inout ()) == 0)
       {
-        return 0; // not equivalent
+        return 0;
       }
     
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const IR::PrimaryKeyDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::PrimaryKeyDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::PrimaryKeyDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_PrimaryKeyDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::PrimaryKeyDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::ComponentIR::Container::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
   ACE_CATCHANY
   {
+    // do nothing
   }
   ACE_ENDTRY;
-  
   return 0;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
-// Copying version.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IR::FactoryDef_ptr _tao_elem
-  )
-{
-  IR::FactoryDef_ptr _tao_objptr =
-    IR::FactoryDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying version.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IR::FactoryDef_ptr *_tao_elem
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ComponentIR::ModuleDef_ptr _tao_objref
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_FactoryDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          IR::FactoryDef::_tao_any_destructor
-        );
-    }
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    IR::FactoryDef_ptr &_tao_elem
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ComponentIR::ModuleDef_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = IR::FactoryDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_FactoryDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
+    CORBA::Object_var obj;
     
-    if (!_tao_result)
+    if ((strm >> obj.inout ()) == 0)
       {
-        return 0; // not equivalent
+        return 0;
       }
     
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
-      );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IR::_tc_FactoryDef,
-            1,
-            _tao_elem,
-            IR::FactoryDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::ComponentIR::ModuleDef::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
   ACE_CATCHANY
   {
-    _tao_elem = IR::FactoryDef::_nil ();
-    return 0;
+    // do nothing
   }
   ACE_ENDTRY;
-  
-  _tao_elem = IR::FactoryDef::_nil ();
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
-
-// Copying version.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IR::FinderDef_ptr _tao_elem
-  )
-{
-  IR::FinderDef_ptr _tao_objptr =
-    IR::FinderDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
-// Non-copying version.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IR::FinderDef_ptr *_tao_elem
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ComponentIR::Repository_ptr _tao_objref
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_FinderDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          IR::FinderDef::_tao_any_destructor
-        );
-    }
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    IR::FinderDef_ptr &_tao_elem
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ComponentIR::Repository_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = IR::FinderDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_FinderDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
+    CORBA::Object_var obj;
     
-    if (!_tao_result)
+    if ((strm >> obj.inout ()) == 0)
       {
-        return 0; // not equivalent
+        return 0;
       }
     
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
-      );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IR::_tc_FinderDef,
-            1,
-            _tao_elem,
-            IR::FinderDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::ComponentIR::Repository::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
   ACE_CATCHANY
   {
-    _tao_elem = IR::FinderDef::_nil ();
-    return 0;
+    // do nothing
   }
   ACE_ENDTRY;
-  
-  _tao_elem = IR::FinderDef::_nil ();
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
-// Copying version.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IR::HomeDef_ptr _tao_elem
-  )
-{
-  IR::HomeDef_ptr _tao_objptr =
-    IR::HomeDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying version.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IR::HomeDef_ptr *_tao_elem
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ComponentIR::ProvidesDef_ptr _tao_objref
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_HomeDef, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          IR::HomeDef::_tao_any_destructor
-        );
-    }
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    IR::HomeDef_ptr &_tao_elem
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ComponentIR::ProvidesDef_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = IR::HomeDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_HomeDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
+    CORBA::Object_var obj;
     
-    if (!_tao_result)
+    if ((strm >> obj.inout ()) == 0)
       {
-        return 0; // not equivalent
+        return 0;
       }
     
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
-      );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IR::_tc_HomeDef,
-            1,
-            _tao_elem,
-            IR::HomeDef::_tao_any_destructor
-          );
-        
-        return 1;
-      }
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::ComponentIR::ProvidesDef::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
   ACE_CATCHANY
   {
-    _tao_elem = IR::HomeDef::_nil ();
-    return 0;
+    // do nothing
   }
   ACE_ENDTRY;
-  
-  _tao_elem = IR::HomeDef::_nil ();
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IR::HomeDescription &_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_HomeDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IR::HomeDescription *_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IR::_tc_HomeDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IR::HomeDescription::_tao_any_destructor
-        );
-    }
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IR::HomeDescription *&_tao_elem
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ComponentIR::UsesDef_ptr _tao_objref
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IR::HomeDescription *&,
-      _tao_elem
-    );
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IR::HomeDescription *&_tao_elem
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ComponentIR::UsesDef_ptr &_tao_objref
   )
 {
-  _tao_elem = 0;
-  
   ACE_TRY_NEW_ENV
   {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          IR::_tc_HomeDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
+    CORBA::Object_var obj;
     
-    if (_tao_result == 0)
+    if ((strm >> obj.inout ()) == 0)
       {
-        return 0; // not equivalent
+        return 0;
       }
     
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const IR::HomeDescription*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        IR::HomeDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            IR::HomeDescription,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IR::_tc_HomeDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                IR::HomeDescription::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::ComponentIR::UsesDef::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
   ACE_CATCHANY
   {
+    // do nothing
   }
   ACE_ENDTRY;
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::RepositoryIdSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::RepositoryIdSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::ComponentDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::ComponentDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
   return 0;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::ProvidesDefSeq &_tao_sequence
+    const CORBA::ComponentIR::EventPortDef_ptr _tao_objref
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::ProvidesDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::UsesDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::UsesDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::HomeDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::HomeDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::EmitsDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::EmitsDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::PublishesDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::PublishesDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::ConsumesDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::ConsumesDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::FactoryDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::FactoryDefSeq &_tao_sequence
+    CORBA::ComponentIR::EventPortDef_ptr &_tao_objref
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    
+    if ((strm >> obj.inout ()) == 0)
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::ComponentIR::EventPortDef::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
   return 0;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::FinderDefSeq &_tao_sequence
+    const CORBA::ComponentIR::EmitsDef_ptr _tao_objref
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::FinderDefSeq &_tao_sequence
+    CORBA::ComponentIR::EmitsDef_ptr &_tao_objref
   )
 {
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    
+    if ((strm >> obj.inout ()) == 0)
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::ComponentIR::EmitsDef::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
   return 0;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::ComponentRepository_ptr _tao_objref
+    const CORBA::ComponentIR::PublishesDef_ptr _tao_objref
   )
 {
   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
@@ -27325,7 +23642,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::ComponentRepository_ptr &_tao_objref
+    CORBA::ComponentIR::PublishesDef_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
@@ -27339,7 +23656,7 @@ CORBA::Boolean operator>> (
     
     // Narrow to the right type.
     _tao_objref =
-      IR::ComponentRepository::_unchecked_narrow (
+      CORBA::ComponentIR::PublishesDef::_unchecked_narrow (
           obj.in ()
           ACE_ENV_ARG_PARAMETER
         );
@@ -27355,11 +23672,11 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::ProvidesDef_ptr _tao_objref
+    const CORBA::ComponentIR::ConsumesDef_ptr _tao_objref
   )
 {
   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
@@ -27368,7 +23685,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::ProvidesDef_ptr &_tao_objref
+    CORBA::ComponentIR::ConsumesDef_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
@@ -27382,7 +23699,7 @@ CORBA::Boolean operator>> (
     
     // Narrow to the right type.
     _tao_objref =
-      IR::ProvidesDef::_unchecked_narrow (
+      CORBA::ComponentIR::ConsumesDef::_unchecked_narrow (
           obj.in ()
           ACE_ENV_ARG_PARAMETER
         );
@@ -27398,11 +23715,11 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::UsesDef_ptr _tao_objref
+    const CORBA::ComponentIR::ComponentDef_ptr _tao_objref
   )
 {
   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
@@ -27411,7 +23728,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::UsesDef_ptr &_tao_objref
+    CORBA::ComponentIR::ComponentDef_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
@@ -27425,7 +23742,7 @@ CORBA::Boolean operator>> (
     
     // Narrow to the right type.
     _tao_objref =
-      IR::UsesDef::_unchecked_narrow (
+      CORBA::ComponentIR::ComponentDef::_unchecked_narrow (
           obj.in ()
           ACE_ENV_ARG_PARAMETER
         );
@@ -27441,11 +23758,11 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::ProvidesDescSeq &_tao_sequence
+    const CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
@@ -27468,7 +23785,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::ProvidesDescSeq &_tao_sequence
+    CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -27507,11 +23824,11 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::UsesDescSeq &_tao_sequence
+    const CORBA::ComponentIR::UsesDescriptionSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
@@ -27534,7 +23851,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::UsesDescSeq &_tao_sequence
+    CORBA::ComponentIR::UsesDescriptionSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -27573,226 +23890,77 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::EventDef_ptr _tao_objref
+    const CORBA::ComponentIR::EventPortDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::EventDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    
-    if ((strm >> obj.inout ()) == 0)
-      {
-        return 0;
-      }
-    
-    // Narrow to the right type.
-    _tao_objref =
-      IR::EventDef::_unchecked_narrow (
-          obj.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::EmitsDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::EmitsDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    
-    if ((strm >> obj.inout ()) == 0)
-      {
-        return 0;
-      }
-    
-    // Narrow to the right type.
-    _tao_objref =
-      IR::EmitsDef::_unchecked_narrow (
-          obj.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::PublishesDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::PublishesDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    
-    if ((strm >> obj.inout ()) == 0)
-      {
-        return 0;
-      }
-    
-    // Narrow to the right type.
-    _tao_objref =
-      IR::PublishesDef::_unchecked_narrow (
-          obj.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::ConsumesDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::ConsumesDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    
-    if ((strm >> obj.inout ()) == 0)
-      {
-        return 0;
-      }
-    
-    // Narrow to the right type.
-    _tao_objref =
-      IR::ConsumesDef::_unchecked_narrow (
-          obj.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
   return 0;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::ComponentDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::ComponentDef_ptr &_tao_objref
+    CORBA::ComponentIR::EventPortDescriptionSeq &_tao_sequence
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    
-    if ((strm >> obj.inout ()) == 0)
-      {
-        return 0;
-      }
-    
-    // Narrow to the right type.
-    _tao_objref =
-      IR::ComponentDef::_unchecked_narrow (
-          obj.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
   return 0;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::PrimaryKeyDef_ptr _tao_objref
+    const CORBA::ComponentIR::FactoryDef_ptr _tao_objref
   )
 {
   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
@@ -27801,7 +23969,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::PrimaryKeyDef_ptr &_tao_objref
+    CORBA::ComponentIR::FactoryDef_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
@@ -27815,7 +23983,7 @@ CORBA::Boolean operator>> (
     
     // Narrow to the right type.
     _tao_objref =
-      IR::PrimaryKeyDef::_unchecked_narrow (
+      CORBA::ComponentIR::FactoryDef::_unchecked_narrow (
           obj.in ()
           ACE_ENV_ARG_PARAMETER
         );
@@ -27831,11 +23999,11 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::FactoryDef_ptr _tao_objref
+    const CORBA::ComponentIR::FinderDef_ptr _tao_objref
   )
 {
   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
@@ -27844,7 +24012,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::FactoryDef_ptr &_tao_objref
+    CORBA::ComponentIR::FinderDef_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
@@ -27858,7 +24026,7 @@ CORBA::Boolean operator>> (
     
     // Narrow to the right type.
     _tao_objref =
-      IR::FactoryDef::_unchecked_narrow (
+      CORBA::ComponentIR::FinderDef::_unchecked_narrow (
           obj.in ()
           ACE_ENV_ARG_PARAMETER
         );
@@ -27874,11 +24042,11 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::FinderDef_ptr _tao_objref
+    const CORBA::ComponentIR::HomeDef_ptr _tao_objref
   )
 {
   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
@@ -27887,7 +24055,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::FinderDef_ptr &_tao_objref
+    CORBA::ComponentIR::HomeDef_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
@@ -27901,7 +24069,7 @@ CORBA::Boolean operator>> (
     
     // Narrow to the right type.
     _tao_objref =
-      IR::FinderDef::_unchecked_narrow (
+      CORBA::ComponentIR::HomeDef::_unchecked_narrow (
           obj.in ()
           ACE_ENV_ARG_PARAMETER
         );
@@ -27916,46 +24084,4 @@ CORBA::Boolean operator>> (
   return 0;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::HomeDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::HomeDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    
-    if ((strm >> obj.inout ()) == 0)
-      {
-        return 0;
-      }
-    
-    // Narrow to the right type.
-    _tao_objref =
-      IR::HomeDef::_unchecked_narrow (
-          obj.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
 
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index 118a618dc47..f33922b2e5c 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -20,19 +20,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSC_H_
 #define _TAO_IDL_ORIG_IFR_COMPONENTSC_H_
 
 #include "ace/pre.h"
 
-#include "ifr_client_export.h"
+#include "tao/corba.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+#include "ifr_client_export.h"
+
 #include "IFR_ExtendedC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -59,8760 +62,6674 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
-TAO_NAMESPACE  IR
+TAO_NAMESPACE  CORBA
 {
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_enum/enum_ch.cpp:57
-
-  enum DefinitionKind
-  {
-    dk_none,
-    dk_all,
-    dk_Attribute,
-    dk_Constant,
-    dk_Exception,
-    dk_Interface,
-    dk_Module,
-    dk_Operation,
-    dk_Typedef,
-    dk_Alias,
-    dk_Struct,
-    dk_Union,
-    dk_Enum,
-    dk_Primitive,
-    dk_String,
-    dk_Sequence,
-    dk_Array,
-    dk_Repository,
-    dk_Wstring,
-    dk_Fixed,
-    dk_Value,
-    dk_ValueBox,
-    dk_ValueMember,
-    dk_Native,
-    dk_Component,
-    dk_Home,
-    dk_Factory,
-    dk_Finder,
-    dk_PrimaryKey,
-    dk_Emits,
-    dk_Publishes,
-    dk_Consumes,
-    dk_Provides,
-    dk_Uses
-  };
-
-  typedef DefinitionKind &DefinitionKind_out;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DefinitionKind;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:368
-
-  typedef char * Identifier;
-  typedef CORBA::String_var Identifier_var;
-  typedef CORBA::String_out Identifier_out;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Identifier;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:368
-
-  typedef char * ScopedName;
-  typedef CORBA::String_var ScopedName_var;
-  typedef CORBA::String_out ScopedName_out;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ScopedName;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:368
-
-  typedef char * RepositoryId;
-  typedef CORBA::String_var RepositoryId_var;
-  typedef CORBA::String_out RepositoryId_out;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RepositoryId;
-
-#if !defined (_IR_REPOSITORYIDSEQ_CH_)
-#define _IR_REPOSITORYIDSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class RepositoryIdSeq;
-  class RepositoryIdSeq_var;
-
-  // *************************************************************
-  // IR::RepositoryIdSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export RepositoryIdSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    RepositoryIdSeq (void);
-    RepositoryIdSeq (CORBA::ULong max);
-    RepositoryIdSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        char * *buffer,
-        CORBA::Boolean release = 0
-      );
-    RepositoryIdSeq (const RepositoryIdSeq &);
-    ~RepositoryIdSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef RepositoryIdSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_REPOSITORYIDSEQ___VAR_CH_)
-#define _IR_REPOSITORYIDSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class IR::RepositoryIdSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export RepositoryIdSeq_var
-  {
-  public:
-    RepositoryIdSeq_var (void);
-    RepositoryIdSeq_var (RepositoryIdSeq *);
-    RepositoryIdSeq_var (const RepositoryIdSeq_var &);
-    ~RepositoryIdSeq_var (void);
-
-    RepositoryIdSeq_var &operator= (RepositoryIdSeq *);
-    RepositoryIdSeq_var &operator= (const RepositoryIdSeq_var &);
-    RepositoryIdSeq *operator-> (void);
-    const RepositoryIdSeq *operator-> (void) const;
-
-    operator const RepositoryIdSeq &() const;
-    operator RepositoryIdSeq &();
-    operator RepositoryIdSeq &() const;
-
-    // Variable-size base types only.
-    operator RepositoryIdSeq *&();
-
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
-    const RepositoryIdSeq &in (void) const;
-    RepositoryIdSeq &inout (void);
-    RepositoryIdSeq *&out (void);
-    RepositoryIdSeq *_retn (void);
-    RepositoryIdSeq *ptr (void) const;
-
-  private:
-    RepositoryIdSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_REPOSITORYIDSEQ___OUT_CH_)
-#define _IR_REPOSITORYIDSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export RepositoryIdSeq_out
-  {
-  public:
-    RepositoryIdSeq_out (RepositoryIdSeq *&);
-    RepositoryIdSeq_out (RepositoryIdSeq_var &);
-    RepositoryIdSeq_out (const RepositoryIdSeq_out &);
-    RepositoryIdSeq_out &operator= (const RepositoryIdSeq_out &);
-    RepositoryIdSeq_out &operator= (RepositoryIdSeq *);
-    operator RepositoryIdSeq *&();
-    RepositoryIdSeq *&ptr (void);
-    RepositoryIdSeq *operator-> (void);
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
-  private:
-    RepositoryIdSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const RepositoryIdSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:368
-
-  typedef char * VersionSpec;
-  typedef CORBA::String_var VersionSpec_var;
-  typedef CORBA::String_out VersionSpec_out;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_VersionSpec;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
-  class ComponentDef;
-
-#if !defined (_IR_COMPONENTDEF___PTR_CH_)
-#define _IR_COMPONENTDEF___PTR_CH_
-
-  typedef ComponentDef *ComponentDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_COMPONENTDEF___VAR_CH_)
-#define _IR_COMPONENTDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ComponentDef_var : private TAO_Base_var
-  {
-  public:
-    ComponentDef_var (void); // default constructor
-    ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {}
-    ComponentDef_var (const ComponentDef_var &); // copy constructor
-    ~ComponentDef_var (void); // destructor
-
-    ComponentDef_var &operator= (ComponentDef_ptr);
-    ComponentDef_var &operator= (const ComponentDef_var &);
-    ComponentDef_ptr operator-> (void) const;
-
-    operator const ComponentDef_ptr &() const;
-    operator ComponentDef_ptr &();
-    // in, inout, out, _retn
-    ComponentDef_ptr in (void) const;
-    ComponentDef_ptr &inout (void);
-    ComponentDef_ptr &out (void);
-    ComponentDef_ptr _retn (void);
-    ComponentDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static ComponentDef_ptr tao_duplicate (ComponentDef_ptr);
-    static void tao_release (ComponentDef_ptr);
-    static ComponentDef_ptr tao_nil (void);
-    static ComponentDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    ComponentDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ComponentDef_var (const TAO_Base_var & rhs);
-    ComponentDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_COMPONENTDEF___OUT_CH_)
-#define _IR_COMPONENTDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export ComponentDef_out
-  {
-  public:
-    ComponentDef_out (ComponentDef_ptr &);
-    ComponentDef_out (ComponentDef_var &);
-    ComponentDef_out (const ComponentDef_out &);
-    ComponentDef_out &operator= (const ComponentDef_out &);
-    ComponentDef_out &operator= (const ComponentDef_var &);
-    ComponentDef_out &operator= (ComponentDef_ptr);
-    operator ComponentDef_ptr &();
-    ComponentDef_ptr &ptr (void);
-    ComponentDef_ptr operator-> (void);
-
-  private:
-    ComponentDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ComponentDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (
-        const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void);
-
-    // = Accessors.
-    TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var> operator[] (CORBA::ULong index) const;
-
-    // = Static operations.
-    static ComponentDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (ComponentDef **buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ComponentDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const ComponentDef* *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 (_IR_COMPONENTDEFSEQ_CH_)
-#define _IR_COMPONENTDEFSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class ComponentDefSeq;
-  class ComponentDefSeq_var;
-
-  // *************************************************************
-  // IR::ComponentDefSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export ComponentDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<ComponentDef,ComponentDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    ComponentDefSeq (void);
-    ComponentDefSeq (CORBA::ULong max);
-    ComponentDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ComponentDef_ptr *buffer,
-        CORBA::Boolean release = 0
-      );
-    ComponentDefSeq (const ComponentDefSeq &);
-    ~ComponentDefSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef ComponentDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_COMPONENTDEFSEQ___VAR_CH_)
-#define _IR_COMPONENTDEFSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class IR::ComponentDefSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export ComponentDefSeq_var
-  {
-  public:
-    ComponentDefSeq_var (void);
-    ComponentDefSeq_var (ComponentDefSeq *);
-    ComponentDefSeq_var (const ComponentDefSeq_var &);
-    ~ComponentDefSeq_var (void);
-
-    ComponentDefSeq_var &operator= (ComponentDefSeq *);
-    ComponentDefSeq_var &operator= (const ComponentDefSeq_var &);
-    ComponentDefSeq *operator-> (void);
-    const ComponentDefSeq *operator-> (void) const;
-
-    operator const ComponentDefSeq &() const;
-    operator ComponentDefSeq &();
-    operator ComponentDefSeq &() const;
-
-    // Variable-size base types only.
-    operator ComponentDefSeq *&();
-
-    TAO_Object_Manager<ComponentDef, ComponentDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
-    const ComponentDefSeq &in (void) const;
-    ComponentDefSeq &inout (void);
-    ComponentDefSeq *&out (void);
-    ComponentDefSeq *_retn (void);
-    ComponentDefSeq *ptr (void) const;
-
-  private:
-    ComponentDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_COMPONENTDEFSEQ___OUT_CH_)
-#define _IR_COMPONENTDEFSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export ComponentDefSeq_out
-  {
-  public:
-    ComponentDefSeq_out (ComponentDefSeq *&);
-    ComponentDefSeq_out (ComponentDefSeq_var &);
-    ComponentDefSeq_out (const ComponentDefSeq_out &);
-    ComponentDefSeq_out &operator= (const ComponentDefSeq_out &);
-    ComponentDefSeq_out &operator= (ComponentDefSeq *);
-    operator ComponentDefSeq *&();
-    ComponentDefSeq *&ptr (void);
-    ComponentDefSeq *operator-> (void);
-    TAO_Object_Manager<ComponentDef, ComponentDef_var> operator[] (CORBA::ULong index);
-
-  private:
-    ComponentDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ComponentDefSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentDefSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
-  class ProvidesDef;
-
-#if !defined (_IR_PROVIDESDEF___PTR_CH_)
-#define _IR_PROVIDESDEF___PTR_CH_
-
-  typedef ProvidesDef *ProvidesDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PROVIDESDEF___VAR_CH_)
-#define _IR_PROVIDESDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ProvidesDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+  
+  TAO_NAMESPACE  ComponentIR
   {
-  public:
-    ProvidesDef_var (void); // default constructor
-    ProvidesDef_var (ProvidesDef_ptr p) : ptr_ (p) {}
-    ProvidesDef_var (const ProvidesDef_var &); // copy constructor
-    ~ProvidesDef_var (void); // destructor
-
-    ProvidesDef_var &operator= (ProvidesDef_ptr);
-    ProvidesDef_var &operator= (const ProvidesDef_var &);
-    ProvidesDef_ptr operator-> (void) const;
-
-    operator const ProvidesDef_ptr &() const;
-    operator ProvidesDef_ptr &();
-    // in, inout, out, _retn
-    ProvidesDef_ptr in (void) const;
-    ProvidesDef_ptr &inout (void);
-    ProvidesDef_ptr &out (void);
-    ProvidesDef_ptr _retn (void);
-    ProvidesDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static ProvidesDef_ptr tao_duplicate (ProvidesDef_ptr);
-    static void tao_release (ProvidesDef_ptr);
-    static ProvidesDef_ptr tao_nil (void);
-    static ProvidesDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    ProvidesDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ProvidesDef_var (const TAO_Base_var & rhs);
-    ProvidesDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PROVIDESDEF___OUT_CH_)
-#define _IR_PROVIDESDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export ProvidesDef_out
-  {
-  public:
-    ProvidesDef_out (ProvidesDef_ptr &);
-    ProvidesDef_out (ProvidesDef_var &);
-    ProvidesDef_out (const ProvidesDef_out &);
-    ProvidesDef_out &operator= (const ProvidesDef_out &);
-    ProvidesDef_out &operator= (const ProvidesDef_var &);
-    ProvidesDef_out &operator= (ProvidesDef_ptr);
-    operator ProvidesDef_ptr &();
-    ProvidesDef_ptr &ptr (void);
-    ProvidesDef_ptr operator-> (void);
-
-  private:
-    ProvidesDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ProvidesDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (
-        const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void);
-
-    // = Accessors.
-    TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var> operator[] (CORBA::ULong index) const;
-
-    // = Static operations.
-    static ProvidesDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (ProvidesDef **buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ProvidesDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const ProvidesDef* *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 (_IR_PROVIDESDEFSEQ_CH_)
-#define _IR_PROVIDESDEFSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class ProvidesDefSeq;
-  class ProvidesDefSeq_var;
-
-  // *************************************************************
-  // IR::ProvidesDefSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export ProvidesDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<ProvidesDef,ProvidesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    ProvidesDefSeq (void);
-    ProvidesDefSeq (CORBA::ULong max);
-    ProvidesDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ProvidesDef_ptr *buffer,
-        CORBA::Boolean release = 0
-      );
-    ProvidesDefSeq (const ProvidesDefSeq &);
-    ~ProvidesDefSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef ProvidesDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PROVIDESDEFSEQ___VAR_CH_)
-#define _IR_PROVIDESDEFSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class IR::ProvidesDefSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export ProvidesDefSeq_var
-  {
-  public:
-    ProvidesDefSeq_var (void);
-    ProvidesDefSeq_var (ProvidesDefSeq *);
-    ProvidesDefSeq_var (const ProvidesDefSeq_var &);
-    ~ProvidesDefSeq_var (void);
-
-    ProvidesDefSeq_var &operator= (ProvidesDefSeq *);
-    ProvidesDefSeq_var &operator= (const ProvidesDefSeq_var &);
-    ProvidesDefSeq *operator-> (void);
-    const ProvidesDefSeq *operator-> (void) const;
-
-    operator const ProvidesDefSeq &() const;
-    operator ProvidesDefSeq &();
-    operator ProvidesDefSeq &() const;
-
-    // Variable-size base types only.
-    operator ProvidesDefSeq *&();
-
-    TAO_Object_Manager<ProvidesDef, ProvidesDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
-    const ProvidesDefSeq &in (void) const;
-    ProvidesDefSeq &inout (void);
-    ProvidesDefSeq *&out (void);
-    ProvidesDefSeq *_retn (void);
-    ProvidesDefSeq *ptr (void) const;
-
-  private:
-    ProvidesDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PROVIDESDEFSEQ___OUT_CH_)
-#define _IR_PROVIDESDEFSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export ProvidesDefSeq_out
-  {
-  public:
-    ProvidesDefSeq_out (ProvidesDefSeq *&);
-    ProvidesDefSeq_out (ProvidesDefSeq_var &);
-    ProvidesDefSeq_out (const ProvidesDefSeq_out &);
-    ProvidesDefSeq_out &operator= (const ProvidesDefSeq_out &);
-    ProvidesDefSeq_out &operator= (ProvidesDefSeq *);
-    operator ProvidesDefSeq *&();
-    ProvidesDefSeq *&ptr (void);
-    ProvidesDefSeq *operator-> (void);
-    TAO_Object_Manager<ProvidesDef, ProvidesDef_var> operator[] (CORBA::ULong index);
-
-  private:
-    ProvidesDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ProvidesDefSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProvidesDefSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
-  class UsesDef;
-
-#if !defined (_IR_USESDEF___PTR_CH_)
-#define _IR_USESDEF___PTR_CH_
-
-  typedef UsesDef *UsesDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_USESDEF___VAR_CH_)
-#define _IR_USESDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export UsesDef_var : private TAO_Base_var
-  {
-  public:
-    UsesDef_var (void); // default constructor
-    UsesDef_var (UsesDef_ptr p) : ptr_ (p) {}
-    UsesDef_var (const UsesDef_var &); // copy constructor
-    ~UsesDef_var (void); // destructor
-
-    UsesDef_var &operator= (UsesDef_ptr);
-    UsesDef_var &operator= (const UsesDef_var &);
-    UsesDef_ptr operator-> (void) const;
-
-    operator const UsesDef_ptr &() const;
-    operator UsesDef_ptr &();
-    // in, inout, out, _retn
-    UsesDef_ptr in (void) const;
-    UsesDef_ptr &inout (void);
-    UsesDef_ptr &out (void);
-    UsesDef_ptr _retn (void);
-    UsesDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static UsesDef_ptr tao_duplicate (UsesDef_ptr);
-    static void tao_release (UsesDef_ptr);
-    static UsesDef_ptr tao_nil (void);
-    static UsesDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    UsesDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    UsesDef_var (const TAO_Base_var & rhs);
-    UsesDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_USESDEF___OUT_CH_)
-#define _IR_USESDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export UsesDef_out
-  {
-  public:
-    UsesDef_out (UsesDef_ptr &);
-    UsesDef_out (UsesDef_var &);
-    UsesDef_out (const UsesDef_out &);
-    UsesDef_out &operator= (const UsesDef_out &);
-    UsesDef_out &operator= (const UsesDef_var &);
-    UsesDef_out &operator= (UsesDef_ptr);
-    operator UsesDef_ptr &();
-    UsesDef_ptr &ptr (void);
-    UsesDef_ptr operator-> (void);
-
-  private:
-    UsesDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        UsesDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (
-        const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void);
-
-    // = Accessors.
-    TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var> operator[] (CORBA::ULong index) const;
-
-    // = Static operations.
-    static UsesDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (UsesDef **buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    UsesDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const UsesDef* *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 (_IR_USESDEFSEQ_CH_)
-#define _IR_USESDEFSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class UsesDefSeq;
-  class UsesDefSeq_var;
-
-  // *************************************************************
-  // IR::UsesDefSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export UsesDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<UsesDef,UsesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    UsesDefSeq (void);
-    UsesDefSeq (CORBA::ULong max);
-    UsesDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        UsesDef_ptr *buffer,
-        CORBA::Boolean release = 0
-      );
-    UsesDefSeq (const UsesDefSeq &);
-    ~UsesDefSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef UsesDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_USESDEFSEQ___VAR_CH_)
-#define _IR_USESDEFSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class IR::UsesDefSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export UsesDefSeq_var
-  {
-  public:
-    UsesDefSeq_var (void);
-    UsesDefSeq_var (UsesDefSeq *);
-    UsesDefSeq_var (const UsesDefSeq_var &);
-    ~UsesDefSeq_var (void);
-
-    UsesDefSeq_var &operator= (UsesDefSeq *);
-    UsesDefSeq_var &operator= (const UsesDefSeq_var &);
-    UsesDefSeq *operator-> (void);
-    const UsesDefSeq *operator-> (void) const;
-
-    operator const UsesDefSeq &() const;
-    operator UsesDefSeq &();
-    operator UsesDefSeq &() const;
-
-    // Variable-size base types only.
-    operator UsesDefSeq *&();
-
-    TAO_Object_Manager<UsesDef, UsesDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
-    const UsesDefSeq &in (void) const;
-    UsesDefSeq &inout (void);
-    UsesDefSeq *&out (void);
-    UsesDefSeq *_retn (void);
-    UsesDefSeq *ptr (void) const;
-
-  private:
-    UsesDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_USESDEFSEQ___OUT_CH_)
-#define _IR_USESDEFSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export UsesDefSeq_out
-  {
-  public:
-    UsesDefSeq_out (UsesDefSeq *&);
-    UsesDefSeq_out (UsesDefSeq_var &);
-    UsesDefSeq_out (const UsesDefSeq_out &);
-    UsesDefSeq_out &operator= (const UsesDefSeq_out &);
-    UsesDefSeq_out &operator= (UsesDefSeq *);
-    operator UsesDefSeq *&();
-    UsesDefSeq *&ptr (void);
-    UsesDefSeq *operator-> (void);
-    TAO_Object_Manager<UsesDef, UsesDef_var> operator[] (CORBA::ULong index);
-
-  private:
-    UsesDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const UsesDefSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UsesDefSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
-  class HomeDef;
-
-#if !defined (_IR_HOMEDEF___PTR_CH_)
-#define _IR_HOMEDEF___PTR_CH_
-
-  typedef HomeDef *HomeDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_HOMEDEF___VAR_CH_)
-#define _IR_HOMEDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export HomeDef_var : private TAO_Base_var
-  {
-  public:
-    HomeDef_var (void); // default constructor
-    HomeDef_var (HomeDef_ptr p) : ptr_ (p) {}
-    HomeDef_var (const HomeDef_var &); // copy constructor
-    ~HomeDef_var (void); // destructor
-
-    HomeDef_var &operator= (HomeDef_ptr);
-    HomeDef_var &operator= (const HomeDef_var &);
-    HomeDef_ptr operator-> (void) const;
-
-    operator const HomeDef_ptr &() const;
-    operator HomeDef_ptr &();
-    // in, inout, out, _retn
-    HomeDef_ptr in (void) const;
-    HomeDef_ptr &inout (void);
-    HomeDef_ptr &out (void);
-    HomeDef_ptr _retn (void);
-    HomeDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static HomeDef_ptr tao_duplicate (HomeDef_ptr);
-    static void tao_release (HomeDef_ptr);
-    static HomeDef_ptr tao_nil (void);
-    static HomeDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    HomeDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    HomeDef_var (const TAO_Base_var & rhs);
-    HomeDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_HOMEDEF___OUT_CH_)
-#define _IR_HOMEDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export HomeDef_out
-  {
-  public:
-    HomeDef_out (HomeDef_ptr &);
-    HomeDef_out (HomeDef_var &);
-    HomeDef_out (const HomeDef_out &);
-    HomeDef_out &operator= (const HomeDef_out &);
-    HomeDef_out &operator= (const HomeDef_var &);
-    HomeDef_out &operator= (HomeDef_ptr);
-    operator HomeDef_ptr &();
-    HomeDef_ptr &ptr (void);
-    HomeDef_ptr operator-> (void);
-
-  private:
-    HomeDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        HomeDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (
-        const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void);
-
-    // = Accessors.
-    TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var> operator[] (CORBA::ULong index) const;
-
-    // = Static operations.
-    static HomeDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (HomeDef **buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    HomeDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const HomeDef* *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 (_IR_HOMEDEFSEQ_CH_)
-#define _IR_HOMEDEFSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class HomeDefSeq;
-  class HomeDefSeq_var;
-
-  // *************************************************************
-  // IR::HomeDefSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export HomeDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<HomeDef,HomeDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    HomeDefSeq (void);
-    HomeDefSeq (CORBA::ULong max);
-    HomeDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        HomeDef_ptr *buffer,
-        CORBA::Boolean release = 0
-      );
-    HomeDefSeq (const HomeDefSeq &);
-    ~HomeDefSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef HomeDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_HOMEDEFSEQ___VAR_CH_)
-#define _IR_HOMEDEFSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class IR::HomeDefSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export HomeDefSeq_var
-  {
-  public:
-    HomeDefSeq_var (void);
-    HomeDefSeq_var (HomeDefSeq *);
-    HomeDefSeq_var (const HomeDefSeq_var &);
-    ~HomeDefSeq_var (void);
-
-    HomeDefSeq_var &operator= (HomeDefSeq *);
-    HomeDefSeq_var &operator= (const HomeDefSeq_var &);
-    HomeDefSeq *operator-> (void);
-    const HomeDefSeq *operator-> (void) const;
-
-    operator const HomeDefSeq &() const;
-    operator HomeDefSeq &();
-    operator HomeDefSeq &() const;
-
-    // Variable-size base types only.
-    operator HomeDefSeq *&();
-
-    TAO_Object_Manager<HomeDef, HomeDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
-    const HomeDefSeq &in (void) const;
-    HomeDefSeq &inout (void);
-    HomeDefSeq *&out (void);
-    HomeDefSeq *_retn (void);
-    HomeDefSeq *ptr (void) const;
-
-  private:
-    HomeDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_HOMEDEFSEQ___OUT_CH_)
-#define _IR_HOMEDEFSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export HomeDefSeq_out
-  {
-  public:
-    HomeDefSeq_out (HomeDefSeq *&);
-    HomeDefSeq_out (HomeDefSeq_var &);
-    HomeDefSeq_out (const HomeDefSeq_out &);
-    HomeDefSeq_out &operator= (const HomeDefSeq_out &);
-    HomeDefSeq_out &operator= (HomeDefSeq *);
-    operator HomeDefSeq *&();
-    HomeDefSeq *&ptr (void);
-    HomeDefSeq *operator-> (void);
-    TAO_Object_Manager<HomeDef, HomeDef_var> operator[] (CORBA::ULong index);
-
-  private:
-    HomeDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const HomeDefSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_HomeDefSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
-  class EventDef;
-
-#if !defined (_IR_EVENTDEF___PTR_CH_)
-#define _IR_EVENTDEF___PTR_CH_
-
-  typedef EventDef *EventDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_EVENTDEF___VAR_CH_)
-#define _IR_EVENTDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export EventDef_var : private TAO_Base_var
-  {
-  public:
-    EventDef_var (void); // default constructor
-    EventDef_var (EventDef_ptr p) : ptr_ (p) {}
-    EventDef_var (const EventDef_var &); // copy constructor
-    ~EventDef_var (void); // destructor
-
-    EventDef_var &operator= (EventDef_ptr);
-    EventDef_var &operator= (const EventDef_var &);
-    EventDef_ptr operator-> (void) const;
-
-    operator const EventDef_ptr &() const;
-    operator EventDef_ptr &();
-    // in, inout, out, _retn
-    EventDef_ptr in (void) const;
-    EventDef_ptr &inout (void);
-    EventDef_ptr &out (void);
-    EventDef_ptr _retn (void);
-    EventDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static EventDef_ptr tao_duplicate (EventDef_ptr);
-    static void tao_release (EventDef_ptr);
-    static EventDef_ptr tao_nil (void);
-    static EventDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    EventDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    EventDef_var (const TAO_Base_var & rhs);
-    EventDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_EVENTDEF___OUT_CH_)
-#define _IR_EVENTDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export EventDef_out
-  {
-  public:
-    EventDef_out (EventDef_ptr &);
-    EventDef_out (EventDef_var &);
-    EventDef_out (const EventDef_out &);
-    EventDef_out &operator= (const EventDef_out &);
-    EventDef_out &operator= (const EventDef_var &);
-    EventDef_out &operator= (EventDef_ptr);
-    operator EventDef_ptr &();
-    EventDef_ptr &ptr (void);
-    EventDef_ptr operator-> (void);
-
-  private:
-    EventDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
-  class EmitsDef;
-
-#if !defined (_IR_EMITSDEF___PTR_CH_)
-#define _IR_EMITSDEF___PTR_CH_
-
-  typedef EmitsDef *EmitsDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_EMITSDEF___VAR_CH_)
-#define _IR_EMITSDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export EmitsDef_var : private TAO_Base_var
-  {
-  public:
-    EmitsDef_var (void); // default constructor
-    EmitsDef_var (EmitsDef_ptr p) : ptr_ (p) {}
-    EmitsDef_var (const EmitsDef_var &); // copy constructor
-    ~EmitsDef_var (void); // destructor
-
-    EmitsDef_var &operator= (EmitsDef_ptr);
-    EmitsDef_var &operator= (const EmitsDef_var &);
-    EmitsDef_ptr operator-> (void) const;
-
-    operator const EmitsDef_ptr &() const;
-    operator EmitsDef_ptr &();
-    // in, inout, out, _retn
-    EmitsDef_ptr in (void) const;
-    EmitsDef_ptr &inout (void);
-    EmitsDef_ptr &out (void);
-    EmitsDef_ptr _retn (void);
-    EmitsDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static EmitsDef_ptr tao_duplicate (EmitsDef_ptr);
-    static void tao_release (EmitsDef_ptr);
-    static EmitsDef_ptr tao_nil (void);
-    static EmitsDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    EmitsDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    EmitsDef_var (const TAO_Base_var & rhs);
-    EmitsDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_EMITSDEF___OUT_CH_)
-#define _IR_EMITSDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export EmitsDef_out
-  {
-  public:
-    EmitsDef_out (EmitsDef_ptr &);
-    EmitsDef_out (EmitsDef_var &);
-    EmitsDef_out (const EmitsDef_out &);
-    EmitsDef_out &operator= (const EmitsDef_out &);
-    EmitsDef_out &operator= (const EmitsDef_var &);
-    EmitsDef_out &operator= (EmitsDef_ptr);
-    operator EmitsDef_ptr &();
-    EmitsDef_ptr &ptr (void);
-    EmitsDef_ptr operator-> (void);
-
-  private:
-    EmitsDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        EmitsDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (
-        const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void);
-
-    // = Accessors.
-    TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var> operator[] (CORBA::ULong index) const;
-
-    // = Static operations.
-    static EmitsDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (EmitsDef **buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    EmitsDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const EmitsDef* *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 (_IR_EMITSDEFSEQ_CH_)
-#define _IR_EMITSDEFSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class EmitsDefSeq;
-  class EmitsDefSeq_var;
-
-  // *************************************************************
-  // IR::EmitsDefSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export EmitsDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<EmitsDef,EmitsDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    EmitsDefSeq (void);
-    EmitsDefSeq (CORBA::ULong max);
-    EmitsDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        EmitsDef_ptr *buffer,
-        CORBA::Boolean release = 0
-      );
-    EmitsDefSeq (const EmitsDefSeq &);
-    ~EmitsDefSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef EmitsDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_EMITSDEFSEQ___VAR_CH_)
-#define _IR_EMITSDEFSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class IR::EmitsDefSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export EmitsDefSeq_var
-  {
-  public:
-    EmitsDefSeq_var (void);
-    EmitsDefSeq_var (EmitsDefSeq *);
-    EmitsDefSeq_var (const EmitsDefSeq_var &);
-    ~EmitsDefSeq_var (void);
-
-    EmitsDefSeq_var &operator= (EmitsDefSeq *);
-    EmitsDefSeq_var &operator= (const EmitsDefSeq_var &);
-    EmitsDefSeq *operator-> (void);
-    const EmitsDefSeq *operator-> (void) const;
-
-    operator const EmitsDefSeq &() const;
-    operator EmitsDefSeq &();
-    operator EmitsDefSeq &() const;
-
-    // Variable-size base types only.
-    operator EmitsDefSeq *&();
-
-    TAO_Object_Manager<EmitsDef, EmitsDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
-    const EmitsDefSeq &in (void) const;
-    EmitsDefSeq &inout (void);
-    EmitsDefSeq *&out (void);
-    EmitsDefSeq *_retn (void);
-    EmitsDefSeq *ptr (void) const;
-
-  private:
-    EmitsDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_EMITSDEFSEQ___OUT_CH_)
-#define _IR_EMITSDEFSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export EmitsDefSeq_out
-  {
-  public:
-    EmitsDefSeq_out (EmitsDefSeq *&);
-    EmitsDefSeq_out (EmitsDefSeq_var &);
-    EmitsDefSeq_out (const EmitsDefSeq_out &);
-    EmitsDefSeq_out &operator= (const EmitsDefSeq_out &);
-    EmitsDefSeq_out &operator= (EmitsDefSeq *);
-    operator EmitsDefSeq *&();
-    EmitsDefSeq *&ptr (void);
-    EmitsDefSeq *operator-> (void);
-    TAO_Object_Manager<EmitsDef, EmitsDef_var> operator[] (CORBA::ULong index);
-
-  private:
-    EmitsDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const EmitsDefSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EmitsDefSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
-  class PublishesDef;
-
-#if !defined (_IR_PUBLISHESDEF___PTR_CH_)
-#define _IR_PUBLISHESDEF___PTR_CH_
-
-  typedef PublishesDef *PublishesDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PUBLISHESDEF___VAR_CH_)
-#define _IR_PUBLISHESDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export PublishesDef_var : private TAO_Base_var
-  {
-  public:
-    PublishesDef_var (void); // default constructor
-    PublishesDef_var (PublishesDef_ptr p) : ptr_ (p) {}
-    PublishesDef_var (const PublishesDef_var &); // copy constructor
-    ~PublishesDef_var (void); // destructor
-
-    PublishesDef_var &operator= (PublishesDef_ptr);
-    PublishesDef_var &operator= (const PublishesDef_var &);
-    PublishesDef_ptr operator-> (void) const;
-
-    operator const PublishesDef_ptr &() const;
-    operator PublishesDef_ptr &();
-    // in, inout, out, _retn
-    PublishesDef_ptr in (void) const;
-    PublishesDef_ptr &inout (void);
-    PublishesDef_ptr &out (void);
-    PublishesDef_ptr _retn (void);
-    PublishesDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static PublishesDef_ptr tao_duplicate (PublishesDef_ptr);
-    static void tao_release (PublishesDef_ptr);
-    static PublishesDef_ptr tao_nil (void);
-    static PublishesDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    PublishesDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PublishesDef_var (const TAO_Base_var & rhs);
-    PublishesDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PUBLISHESDEF___OUT_CH_)
-#define _IR_PUBLISHESDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export PublishesDef_out
-  {
-  public:
-    PublishesDef_out (PublishesDef_ptr &);
-    PublishesDef_out (PublishesDef_var &);
-    PublishesDef_out (const PublishesDef_out &);
-    PublishesDef_out &operator= (const PublishesDef_out &);
-    PublishesDef_out &operator= (const PublishesDef_var &);
-    PublishesDef_out &operator= (PublishesDef_ptr);
-    operator PublishesDef_ptr &();
-    PublishesDef_ptr &ptr (void);
-    PublishesDef_ptr operator-> (void);
-
-  private:
-    PublishesDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        PublishesDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (
-        const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void);
-
-    // = Accessors.
-    TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var> operator[] (CORBA::ULong index) const;
-
-    // = Static operations.
-    static PublishesDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (PublishesDef **buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    PublishesDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const PublishesDef* *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 (_IR_PUBLISHESDEFSEQ_CH_)
-#define _IR_PUBLISHESDEFSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class PublishesDefSeq;
-  class PublishesDefSeq_var;
-
-  // *************************************************************
-  // IR::PublishesDefSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export PublishesDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<PublishesDef,PublishesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    PublishesDefSeq (void);
-    PublishesDefSeq (CORBA::ULong max);
-    PublishesDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        PublishesDef_ptr *buffer,
-        CORBA::Boolean release = 0
-      );
-    PublishesDefSeq (const PublishesDefSeq &);
-    ~PublishesDefSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef PublishesDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PUBLISHESDEFSEQ___VAR_CH_)
-#define _IR_PUBLISHESDEFSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class IR::PublishesDefSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export PublishesDefSeq_var
-  {
-  public:
-    PublishesDefSeq_var (void);
-    PublishesDefSeq_var (PublishesDefSeq *);
-    PublishesDefSeq_var (const PublishesDefSeq_var &);
-    ~PublishesDefSeq_var (void);
-
-    PublishesDefSeq_var &operator= (PublishesDefSeq *);
-    PublishesDefSeq_var &operator= (const PublishesDefSeq_var &);
-    PublishesDefSeq *operator-> (void);
-    const PublishesDefSeq *operator-> (void) const;
-
-    operator const PublishesDefSeq &() const;
-    operator PublishesDefSeq &();
-    operator PublishesDefSeq &() const;
-
-    // Variable-size base types only.
-    operator PublishesDefSeq *&();
-
-    TAO_Object_Manager<PublishesDef, PublishesDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
-    const PublishesDefSeq &in (void) const;
-    PublishesDefSeq &inout (void);
-    PublishesDefSeq *&out (void);
-    PublishesDefSeq *_retn (void);
-    PublishesDefSeq *ptr (void) const;
-
-  private:
-    PublishesDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PUBLISHESDEFSEQ___OUT_CH_)
-#define _IR_PUBLISHESDEFSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export PublishesDefSeq_out
-  {
-  public:
-    PublishesDefSeq_out (PublishesDefSeq *&);
-    PublishesDefSeq_out (PublishesDefSeq_var &);
-    PublishesDefSeq_out (const PublishesDefSeq_out &);
-    PublishesDefSeq_out &operator= (const PublishesDefSeq_out &);
-    PublishesDefSeq_out &operator= (PublishesDefSeq *);
-    operator PublishesDefSeq *&();
-    PublishesDefSeq *&ptr (void);
-    PublishesDefSeq *operator-> (void);
-    TAO_Object_Manager<PublishesDef, PublishesDef_var> operator[] (CORBA::ULong index);
-
-  private:
-    PublishesDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const PublishesDefSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PublishesDefSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
-  class ConsumesDef;
-
-#if !defined (_IR_CONSUMESDEF___PTR_CH_)
-#define _IR_CONSUMESDEF___PTR_CH_
-
-  typedef ConsumesDef *ConsumesDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_CONSUMESDEF___VAR_CH_)
-#define _IR_CONSUMESDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ConsumesDef_var : private TAO_Base_var
-  {
-  public:
-    ConsumesDef_var (void); // default constructor
-    ConsumesDef_var (ConsumesDef_ptr p) : ptr_ (p) {}
-    ConsumesDef_var (const ConsumesDef_var &); // copy constructor
-    ~ConsumesDef_var (void); // destructor
-
-    ConsumesDef_var &operator= (ConsumesDef_ptr);
-    ConsumesDef_var &operator= (const ConsumesDef_var &);
-    ConsumesDef_ptr operator-> (void) const;
-
-    operator const ConsumesDef_ptr &() const;
-    operator ConsumesDef_ptr &();
-    // in, inout, out, _retn
-    ConsumesDef_ptr in (void) const;
-    ConsumesDef_ptr &inout (void);
-    ConsumesDef_ptr &out (void);
-    ConsumesDef_ptr _retn (void);
-    ConsumesDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static ConsumesDef_ptr tao_duplicate (ConsumesDef_ptr);
-    static void tao_release (ConsumesDef_ptr);
-    static ConsumesDef_ptr tao_nil (void);
-    static ConsumesDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    ConsumesDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ConsumesDef_var (const TAO_Base_var & rhs);
-    ConsumesDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_CONSUMESDEF___OUT_CH_)
-#define _IR_CONSUMESDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export ConsumesDef_out
-  {
-  public:
-    ConsumesDef_out (ConsumesDef_ptr &);
-    ConsumesDef_out (ConsumesDef_var &);
-    ConsumesDef_out (const ConsumesDef_out &);
-    ConsumesDef_out &operator= (const ConsumesDef_out &);
-    ConsumesDef_out &operator= (const ConsumesDef_var &);
-    ConsumesDef_out &operator= (ConsumesDef_ptr);
-    operator ConsumesDef_ptr &();
-    ConsumesDef_ptr &ptr (void);
-    ConsumesDef_ptr operator-> (void);
-
-  private:
-    ConsumesDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ConsumesDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (
-        const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void);
-
-    // = Accessors.
-    TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var> operator[] (CORBA::ULong index) const;
-
-    // = Static operations.
-    static ConsumesDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (ConsumesDef **buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ConsumesDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const ConsumesDef* *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 (_IR_CONSUMESDEFSEQ_CH_)
-#define _IR_CONSUMESDEFSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class ConsumesDefSeq;
-  class ConsumesDefSeq_var;
-
-  // *************************************************************
-  // IR::ConsumesDefSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export ConsumesDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<ConsumesDef,ConsumesDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    ConsumesDefSeq (void);
-    ConsumesDefSeq (CORBA::ULong max);
-    ConsumesDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ConsumesDef_ptr *buffer,
-        CORBA::Boolean release = 0
-      );
-    ConsumesDefSeq (const ConsumesDefSeq &);
-    ~ConsumesDefSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef ConsumesDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_CONSUMESDEFSEQ___VAR_CH_)
-#define _IR_CONSUMESDEFSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class IR::ConsumesDefSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export ConsumesDefSeq_var
-  {
-  public:
-    ConsumesDefSeq_var (void);
-    ConsumesDefSeq_var (ConsumesDefSeq *);
-    ConsumesDefSeq_var (const ConsumesDefSeq_var &);
-    ~ConsumesDefSeq_var (void);
-
-    ConsumesDefSeq_var &operator= (ConsumesDefSeq *);
-    ConsumesDefSeq_var &operator= (const ConsumesDefSeq_var &);
-    ConsumesDefSeq *operator-> (void);
-    const ConsumesDefSeq *operator-> (void) const;
-
-    operator const ConsumesDefSeq &() const;
-    operator ConsumesDefSeq &();
-    operator ConsumesDefSeq &() const;
-
-    // Variable-size base types only.
-    operator ConsumesDefSeq *&();
-
-    TAO_Object_Manager<ConsumesDef, ConsumesDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
-    const ConsumesDefSeq &in (void) const;
-    ConsumesDefSeq &inout (void);
-    ConsumesDefSeq *&out (void);
-    ConsumesDefSeq *_retn (void);
-    ConsumesDefSeq *ptr (void) const;
-
-  private:
-    ConsumesDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_CONSUMESDEFSEQ___OUT_CH_)
-#define _IR_CONSUMESDEFSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export ConsumesDefSeq_out
-  {
-  public:
-    ConsumesDefSeq_out (ConsumesDefSeq *&);
-    ConsumesDefSeq_out (ConsumesDefSeq_var &);
-    ConsumesDefSeq_out (const ConsumesDefSeq_out &);
-    ConsumesDefSeq_out &operator= (const ConsumesDefSeq_out &);
-    ConsumesDefSeq_out &operator= (ConsumesDefSeq *);
-    operator ConsumesDefSeq *&();
-    ConsumesDefSeq *&ptr (void);
-    ConsumesDefSeq *operator-> (void);
-    TAO_Object_Manager<ConsumesDef, ConsumesDef_var> operator[] (CORBA::ULong index);
-
-  private:
-    ConsumesDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ConsumesDefSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConsumesDefSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
-  class FactoryDef;
-
-#if !defined (_IR_FACTORYDEF___PTR_CH_)
-#define _IR_FACTORYDEF___PTR_CH_
-
-  typedef FactoryDef *FactoryDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_FACTORYDEF___VAR_CH_)
-#define _IR_FACTORYDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export FactoryDef_var : private TAO_Base_var
-  {
-  public:
-    FactoryDef_var (void); // default constructor
-    FactoryDef_var (FactoryDef_ptr p) : ptr_ (p) {}
-    FactoryDef_var (const FactoryDef_var &); // copy constructor
-    ~FactoryDef_var (void); // destructor
-
-    FactoryDef_var &operator= (FactoryDef_ptr);
-    FactoryDef_var &operator= (const FactoryDef_var &);
-    FactoryDef_ptr operator-> (void) const;
-
-    operator const FactoryDef_ptr &() const;
-    operator FactoryDef_ptr &();
-    // in, inout, out, _retn
-    FactoryDef_ptr in (void) const;
-    FactoryDef_ptr &inout (void);
-    FactoryDef_ptr &out (void);
-    FactoryDef_ptr _retn (void);
-    FactoryDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static FactoryDef_ptr tao_duplicate (FactoryDef_ptr);
-    static void tao_release (FactoryDef_ptr);
-    static FactoryDef_ptr tao_nil (void);
-    static FactoryDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    FactoryDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    FactoryDef_var (const TAO_Base_var & rhs);
-    FactoryDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_FACTORYDEF___OUT_CH_)
-#define _IR_FACTORYDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export FactoryDef_out
-  {
-  public:
-    FactoryDef_out (FactoryDef_ptr &);
-    FactoryDef_out (FactoryDef_var &);
-    FactoryDef_out (const FactoryDef_out &);
-    FactoryDef_out &operator= (const FactoryDef_out &);
-    FactoryDef_out &operator= (const FactoryDef_var &);
-    FactoryDef_out &operator= (FactoryDef_ptr);
-    operator FactoryDef_ptr &();
-    FactoryDef_ptr &ptr (void);
-    FactoryDef_ptr operator-> (void);
-
-  private:
-    FactoryDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        FactoryDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (
-        const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void);
-
-    // = Accessors.
-    TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var> operator[] (CORBA::ULong index) const;
-
-    // = Static operations.
-    static FactoryDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (FactoryDef **buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    FactoryDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const FactoryDef* *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 (_IR_FACTORYDEFSEQ_CH_)
-#define _IR_FACTORYDEFSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class FactoryDefSeq;
-  class FactoryDefSeq_var;
-
-  // *************************************************************
-  // IR::FactoryDefSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export FactoryDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<FactoryDef,FactoryDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    FactoryDefSeq (void);
-    FactoryDefSeq (CORBA::ULong max);
-    FactoryDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        FactoryDef_ptr *buffer,
-        CORBA::Boolean release = 0
-      );
-    FactoryDefSeq (const FactoryDefSeq &);
-    ~FactoryDefSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef FactoryDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_FACTORYDEFSEQ___VAR_CH_)
-#define _IR_FACTORYDEFSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class IR::FactoryDefSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export FactoryDefSeq_var
-  {
-  public:
-    FactoryDefSeq_var (void);
-    FactoryDefSeq_var (FactoryDefSeq *);
-    FactoryDefSeq_var (const FactoryDefSeq_var &);
-    ~FactoryDefSeq_var (void);
-
-    FactoryDefSeq_var &operator= (FactoryDefSeq *);
-    FactoryDefSeq_var &operator= (const FactoryDefSeq_var &);
-    FactoryDefSeq *operator-> (void);
-    const FactoryDefSeq *operator-> (void) const;
-
-    operator const FactoryDefSeq &() const;
-    operator FactoryDefSeq &();
-    operator FactoryDefSeq &() const;
-
-    // Variable-size base types only.
-    operator FactoryDefSeq *&();
-
-    TAO_Object_Manager<FactoryDef, FactoryDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
-    const FactoryDefSeq &in (void) const;
-    FactoryDefSeq &inout (void);
-    FactoryDefSeq *&out (void);
-    FactoryDefSeq *_retn (void);
-    FactoryDefSeq *ptr (void) const;
-
-  private:
-    FactoryDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_FACTORYDEFSEQ___OUT_CH_)
-#define _IR_FACTORYDEFSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export FactoryDefSeq_out
-  {
-  public:
-    FactoryDefSeq_out (FactoryDefSeq *&);
-    FactoryDefSeq_out (FactoryDefSeq_var &);
-    FactoryDefSeq_out (const FactoryDefSeq_out &);
-    FactoryDefSeq_out &operator= (const FactoryDefSeq_out &);
-    FactoryDefSeq_out &operator= (FactoryDefSeq *);
-    operator FactoryDefSeq *&();
-    FactoryDefSeq *&ptr (void);
-    FactoryDefSeq *operator-> (void);
-    TAO_Object_Manager<FactoryDef, FactoryDef_var> operator[] (CORBA::ULong index);
-
-  private:
-    FactoryDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const FactoryDefSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FactoryDefSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
-  class FinderDef;
-
-#if !defined (_IR_FINDERDEF___PTR_CH_)
-#define _IR_FINDERDEF___PTR_CH_
-
-  typedef FinderDef *FinderDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_FINDERDEF___VAR_CH_)
-#define _IR_FINDERDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export FinderDef_var : private TAO_Base_var
-  {
-  public:
-    FinderDef_var (void); // default constructor
-    FinderDef_var (FinderDef_ptr p) : ptr_ (p) {}
-    FinderDef_var (const FinderDef_var &); // copy constructor
-    ~FinderDef_var (void); // destructor
-
-    FinderDef_var &operator= (FinderDef_ptr);
-    FinderDef_var &operator= (const FinderDef_var &);
-    FinderDef_ptr operator-> (void) const;
-
-    operator const FinderDef_ptr &() const;
-    operator FinderDef_ptr &();
-    // in, inout, out, _retn
-    FinderDef_ptr in (void) const;
-    FinderDef_ptr &inout (void);
-    FinderDef_ptr &out (void);
-    FinderDef_ptr _retn (void);
-    FinderDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static FinderDef_ptr tao_duplicate (FinderDef_ptr);
-    static void tao_release (FinderDef_ptr);
-    static FinderDef_ptr tao_nil (void);
-    static FinderDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    FinderDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    FinderDef_var (const TAO_Base_var & rhs);
-    FinderDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_FINDERDEF___OUT_CH_)
-#define _IR_FINDERDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export FinderDef_out
-  {
-  public:
-    FinderDef_out (FinderDef_ptr &);
-    FinderDef_out (FinderDef_var &);
-    FinderDef_out (const FinderDef_out &);
-    FinderDef_out &operator= (const FinderDef_out &);
-    FinderDef_out &operator= (const FinderDef_var &);
-    FinderDef_out &operator= (FinderDef_ptr);
-    operator FinderDef_ptr &();
-    FinderDef_ptr &ptr (void);
-    FinderDef_ptr operator-> (void);
-
-  private:
-    FinderDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        FinderDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (
-        const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void);
-
-    // = Accessors.
-    TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var> operator[] (CORBA::ULong index) const;
-
-    // = Static operations.
-    static FinderDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (FinderDef **buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    FinderDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const FinderDef* *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 (_IR_FINDERDEFSEQ_CH_)
-#define _IR_FINDERDEFSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class FinderDefSeq;
-  class FinderDefSeq_var;
-
-  // *************************************************************
-  // IR::FinderDefSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export FinderDefSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<FinderDef,FinderDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    FinderDefSeq (void);
-    FinderDefSeq (CORBA::ULong max);
-    FinderDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        FinderDef_ptr *buffer,
-        CORBA::Boolean release = 0
-      );
-    FinderDefSeq (const FinderDefSeq &);
-    ~FinderDefSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef FinderDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_FINDERDEFSEQ___VAR_CH_)
-#define _IR_FINDERDEFSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class IR::FinderDefSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export FinderDefSeq_var
-  {
-  public:
-    FinderDefSeq_var (void);
-    FinderDefSeq_var (FinderDefSeq *);
-    FinderDefSeq_var (const FinderDefSeq_var &);
-    ~FinderDefSeq_var (void);
-
-    FinderDefSeq_var &operator= (FinderDefSeq *);
-    FinderDefSeq_var &operator= (const FinderDefSeq_var &);
-    FinderDefSeq *operator-> (void);
-    const FinderDefSeq *operator-> (void) const;
-
-    operator const FinderDefSeq &() const;
-    operator FinderDefSeq &();
-    operator FinderDefSeq &() const;
-
-    // Variable-size base types only.
-    operator FinderDefSeq *&();
-
-    TAO_Object_Manager<FinderDef, FinderDef_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
-    const FinderDefSeq &in (void) const;
-    FinderDefSeq &inout (void);
-    FinderDefSeq *&out (void);
-    FinderDefSeq *_retn (void);
-    FinderDefSeq *ptr (void) const;
-
-  private:
-    FinderDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_FINDERDEFSEQ___OUT_CH_)
-#define _IR_FINDERDEFSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export FinderDefSeq_out
-  {
-  public:
-    FinderDefSeq_out (FinderDefSeq *&);
-    FinderDefSeq_out (FinderDefSeq_var &);
-    FinderDefSeq_out (const FinderDefSeq_out &);
-    FinderDefSeq_out &operator= (const FinderDefSeq_out &);
-    FinderDefSeq_out &operator= (FinderDefSeq *);
-    operator FinderDefSeq *&();
-    FinderDefSeq *&ptr (void);
-    FinderDefSeq *operator-> (void);
-    TAO_Object_Manager<FinderDef, FinderDef_var> operator[] (CORBA::ULong index);
-
-  private:
-    FinderDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const FinderDefSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FinderDefSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
-  class PrimaryKeyDef;
-
-#if !defined (_IR_PRIMARYKEYDEF___PTR_CH_)
-#define _IR_PRIMARYKEYDEF___PTR_CH_
-
-  typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PRIMARYKEYDEF___VAR_CH_)
-#define _IR_PRIMARYKEYDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export PrimaryKeyDef_var : private TAO_Base_var
-  {
-  public:
-    PrimaryKeyDef_var (void); // default constructor
-    PrimaryKeyDef_var (PrimaryKeyDef_ptr p) : ptr_ (p) {}
-    PrimaryKeyDef_var (const PrimaryKeyDef_var &); // copy constructor
-    ~PrimaryKeyDef_var (void); // destructor
-
-    PrimaryKeyDef_var &operator= (PrimaryKeyDef_ptr);
-    PrimaryKeyDef_var &operator= (const PrimaryKeyDef_var &);
-    PrimaryKeyDef_ptr operator-> (void) const;
-
-    operator const PrimaryKeyDef_ptr &() const;
-    operator PrimaryKeyDef_ptr &();
-    // in, inout, out, _retn
-    PrimaryKeyDef_ptr in (void) const;
-    PrimaryKeyDef_ptr &inout (void);
-    PrimaryKeyDef_ptr &out (void);
-    PrimaryKeyDef_ptr _retn (void);
-    PrimaryKeyDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static PrimaryKeyDef_ptr tao_duplicate (PrimaryKeyDef_ptr);
-    static void tao_release (PrimaryKeyDef_ptr);
-    static PrimaryKeyDef_ptr tao_nil (void);
-    static PrimaryKeyDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    PrimaryKeyDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PrimaryKeyDef_var (const TAO_Base_var & rhs);
-    PrimaryKeyDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PRIMARYKEYDEF___OUT_CH_)
-#define _IR_PRIMARYKEYDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export PrimaryKeyDef_out
-  {
-  public:
-    PrimaryKeyDef_out (PrimaryKeyDef_ptr &);
-    PrimaryKeyDef_out (PrimaryKeyDef_var &);
-    PrimaryKeyDef_out (const PrimaryKeyDef_out &);
-    PrimaryKeyDef_out &operator= (const PrimaryKeyDef_out &);
-    PrimaryKeyDef_out &operator= (const PrimaryKeyDef_var &);
-    PrimaryKeyDef_out &operator= (PrimaryKeyDef_ptr);
-    operator PrimaryKeyDef_ptr &();
-    PrimaryKeyDef_ptr &ptr (void);
-    PrimaryKeyDef_ptr operator-> (void);
-
-  private:
-    PrimaryKeyDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IR_COMPONENTREPOSITORY___PTR_CH_)
-#define _IR_COMPONENTREPOSITORY___PTR_CH_
-
-  class ComponentRepository;
-  typedef ComponentRepository *ComponentRepository_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_COMPONENTREPOSITORY___VAR_CH_)
-#define _IR_COMPONENTREPOSITORY___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+    
+    class ComponentDef;
 
-  class TAO_IFR_Client_Export ComponentRepository_var : private TAO_Base_var
-  {
-  public:
-    ComponentRepository_var (void); // default constructor
-    ComponentRepository_var (ComponentRepository_ptr p) : ptr_ (p) {}
-    ComponentRepository_var (const ComponentRepository_var &); // copy constructor
-    ~ComponentRepository_var (void); // destructor
-
-    ComponentRepository_var &operator= (ComponentRepository_ptr);
-    ComponentRepository_var &operator= (const ComponentRepository_var &);
-    ComponentRepository_ptr operator-> (void) const;
-
-    operator const ComponentRepository_ptr &() const;
-    operator ComponentRepository_ptr &();
-    // in, inout, out, _retn
-    ComponentRepository_ptr in (void) const;
-    ComponentRepository_ptr &inout (void);
-    ComponentRepository_ptr &out (void);
-    ComponentRepository_ptr _retn (void);
-    ComponentRepository_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static ComponentRepository_ptr tao_duplicate (ComponentRepository_ptr);
-    static void tao_release (ComponentRepository_ptr);
-    static ComponentRepository_ptr tao_nil (void);
-    static ComponentRepository_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    ComponentRepository_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ComponentRepository_var (const TAO_Base_var & rhs);
-    ComponentRepository_var & operator= (const TAO_Base_var & rhs);
-  };
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF___PTR_CH_
+    
+    typedef ComponentDef *ComponentDef_ptr;
 
 #endif /* end #if !defined */
 
-#if !defined (_IR_COMPONENTREPOSITORY___OUT_CH_)
-#define _IR_COMPONENTREPOSITORY___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export ComponentRepository_out
-  {
-  public:
-    ComponentRepository_out (ComponentRepository_ptr &);
-    ComponentRepository_out (ComponentRepository_var &);
-    ComponentRepository_out (const ComponentRepository_out &);
-    ComponentRepository_out &operator= (const ComponentRepository_out &);
-    ComponentRepository_out &operator= (const ComponentRepository_var &);
-    ComponentRepository_out &operator= (ComponentRepository_ptr);
-    operator ComponentRepository_ptr &();
-    ComponentRepository_ptr &ptr (void);
-    ComponentRepository_ptr operator-> (void);
-
-  private:
-    ComponentRepository_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
-
-#if !defined (_IR_COMPONENTREPOSITORY_CH_)
-#define _IR_COMPONENTREPOSITORY_CH_
-
-  class _TAO_ComponentRepository_Proxy_Impl;
-  class _TAO_ComponentRepository_Remote_Proxy_Impl;
-  class _TAO_ComponentRepository_Proxy_Broker;
-  class _TAO_ComponentRepository_Remote_Proxy_Broker;
-
-  class TAO_IFR_Client_Export ComponentRepository
-    : public virtual CORBA::Repository
-  {
-  public:
-    typedef ComponentRepository_ptr _ptr_type;
-    typedef ComponentRepository_var _var_type;
-    static int _tao_class_id;
-
-    // The static operations.
-    static ComponentRepository_ptr _duplicate (ComponentRepository_ptr obj);
-
-    static ComponentRepository_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ComponentRepository_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ComponentRepository_ptr _nil (void)
-      {
-        return (ComponentRepository_ptr)0;
-      }
-
-    static void _tao_any_destructor (void *);
-
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::ComponentDef_ptr create_component (
-        const char * id,
-        const char * name,
-        const char * version,
-        IR::ComponentDef_ptr base_component,
-        const CORBA::InterfaceDefSeq & supports_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export ComponentDef_var : public TAO_Base_var
+    {
+    public:
+      ComponentDef_var (void); // default constructor
+      ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {} 
+      ComponentDef_var (const ComponentDef_var &); // copy constructor
+      ~ComponentDef_var (void); // destructor
+      
+      ComponentDef_var &operator= (ComponentDef_ptr);
+      ComponentDef_var &operator= (const ComponentDef_var &);
+      ComponentDef_ptr operator-> (void) const;
+      
+      operator const ComponentDef_ptr &() const;
+      operator ComponentDef_ptr &();
+      // in, inout, out, _retn 
+      ComponentDef_ptr in (void) const;
+      ComponentDef_ptr &inout (void);
+      ComponentDef_ptr &out (void);
+      ComponentDef_ptr _retn (void);
+      ComponentDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static ComponentDef_ptr tao_duplicate (ComponentDef_ptr);
+      static void tao_release (ComponentDef_ptr);
+      static ComponentDef_ptr tao_nil (void);
+      static ComponentDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      ComponentDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      ComponentDef_var (const TAO_Base_var &rhs);
+      ComponentDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF___OUT_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::HomeDef_ptr create_home (
-        const char * id,
-        const char * name,
-        const char * version,
-        IR::HomeDef_ptr base_home,
-        IR::ComponentDef_ptr managed_component,
-        CORBA::ValueDef_ptr primary_key
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export ComponentDef_out
+    {
+    public:
+      ComponentDef_out (ComponentDef_ptr &);
+      ComponentDef_out (ComponentDef_var &);
+      ComponentDef_out (const ComponentDef_out &);
+      ComponentDef_out &operator= (const ComponentDef_out &);
+      ComponentDef_out &operator= (const ComponentDef_var &);
+      ComponentDef_out &operator= (ComponentDef_ptr);
+      operator ComponentDef_ptr &();
+      ComponentDef_ptr &ptr (void);
+      ComponentDef_ptr operator-> (void);
+    
+    private:
+      ComponentDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-    virtual const char* _interface_repository_id (void) const;
-  private:
-    _TAO_ComponentRepository_Proxy_Broker *the_TAO_ComponentRepository_Proxy_Broker_;
-
-  protected:
-    ComponentRepository (int collocated = 0);
-
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void IR_ComponentRepository_setup_collocation (int collocated);
-
-    ComponentRepository (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-      );
-    virtual ~ComponentRepository (void);
-
-    friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
-    friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
-
-  private:
-    ComponentRepository (const ComponentRepository &);
-    void operator= (const ComponentRepository &);
-  };
-
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Impl
-    : public virtual CORBA::_TAO_Repository_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_ComponentRepository_Proxy_Impl (void) {}
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::ComponentDef_ptr create_component (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR::ComponentDef_ptr base_component,
-        const CORBA::InterfaceDefSeq & supports_interfaces
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::HomeDef_ptr create_home (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR::HomeDef_ptr base_home,
-        IR::ComponentDef_ptr managed_component,
-        CORBA::ValueDef_ptr primary_key
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-  protected:
-    _TAO_ComponentRepository_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Impl
-    : public virtual _TAO_ComponentRepository_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual CORBA::_TAO_Repository_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_ComponentRepository_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_ComponentRepository_Remote_Proxy_Impl (void) {}
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::ComponentDef_ptr create_component (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR::ComponentDef_ptr base_component,
-        const CORBA::InterfaceDefSeq & supports_interfaces
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::HomeDef_ptr create_home (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR::HomeDef_ptr base_home,
-        IR::ComponentDef_ptr managed_component,
-        CORBA::ValueDef_ptr primary_key
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_ComponentRepository_Proxy_Broker (void);
-    virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
-        ComponentRepository *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_ComponentRepository_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Broker
-    : public virtual _TAO_ComponentRepository_Proxy_Broker
-  {
-  public:
-    _TAO_ComponentRepository_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_ComponentRepository_Remote_Proxy_Broker (void);
-
-    virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
-        ComponentRepository *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_ComponentRepository_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_ComponentRepository_Remote_Proxy_Broker *the_TAO_ComponentRepository_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentRepository;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IR_PROVIDESDEF___PTR_CH_)
-#define _IR_PROVIDESDEF___PTR_CH_
-
-  class ProvidesDef;
-  typedef ProvidesDef *ProvidesDef_ptr;
-
-#endif /* end #if !defined */
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+    
+    class HomeDef;
 
-#if !defined (_IR_PROVIDESDEF___VAR_CH_)
-#define _IR_PROVIDESDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ProvidesDef_var : private TAO_Base_var
-  {
-  public:
-    ProvidesDef_var (void); // default constructor
-    ProvidesDef_var (ProvidesDef_ptr p) : ptr_ (p) {}
-    ProvidesDef_var (const ProvidesDef_var &); // copy constructor
-    ~ProvidesDef_var (void); // destructor
-
-    ProvidesDef_var &operator= (ProvidesDef_ptr);
-    ProvidesDef_var &operator= (const ProvidesDef_var &);
-    ProvidesDef_ptr operator-> (void) const;
-
-    operator const ProvidesDef_ptr &() const;
-    operator ProvidesDef_ptr &();
-    // in, inout, out, _retn
-    ProvidesDef_ptr in (void) const;
-    ProvidesDef_ptr &inout (void);
-    ProvidesDef_ptr &out (void);
-    ProvidesDef_ptr _retn (void);
-    ProvidesDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static ProvidesDef_ptr tao_duplicate (ProvidesDef_ptr);
-    static void tao_release (ProvidesDef_ptr);
-    static ProvidesDef_ptr tao_nil (void);
-    static ProvidesDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    ProvidesDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ProvidesDef_var (const TAO_Base_var & rhs);
-    ProvidesDef_var & operator= (const TAO_Base_var & rhs);
-  };
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_HOMEDEF___PTR_CH_
+    
+    typedef HomeDef *HomeDef_ptr;
 
 #endif /* end #if !defined */
 
-#if !defined (_IR_PROVIDESDEF___OUT_CH_)
-#define _IR_PROVIDESDEF___OUT_CH_
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_HOMEDEF___VAR_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export HomeDef_var : public TAO_Base_var
+    {
+    public:
+      HomeDef_var (void); // default constructor
+      HomeDef_var (HomeDef_ptr p) : ptr_ (p) {} 
+      HomeDef_var (const HomeDef_var &); // copy constructor
+      ~HomeDef_var (void); // destructor
+      
+      HomeDef_var &operator= (HomeDef_ptr);
+      HomeDef_var &operator= (const HomeDef_var &);
+      HomeDef_ptr operator-> (void) const;
+      
+      operator const HomeDef_ptr &() const;
+      operator HomeDef_ptr &();
+      // in, inout, out, _retn 
+      HomeDef_ptr in (void) const;
+      HomeDef_ptr &inout (void);
+      HomeDef_ptr &out (void);
+      HomeDef_ptr _retn (void);
+      HomeDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static HomeDef_ptr tao_duplicate (HomeDef_ptr);
+      static void tao_release (HomeDef_ptr);
+      static HomeDef_ptr tao_nil (void);
+      static HomeDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      HomeDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      HomeDef_var (const TAO_Base_var &rhs);
+      HomeDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_HOMEDEF___OUT_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export HomeDef_out
+    {
+    public:
+      HomeDef_out (HomeDef_ptr &);
+      HomeDef_out (HomeDef_var &);
+      HomeDef_out (const HomeDef_out &);
+      HomeDef_out &operator= (const HomeDef_out &);
+      HomeDef_out &operator= (const HomeDef_var &);
+      HomeDef_out &operator= (HomeDef_ptr);
+      operator HomeDef_ptr &();
+      HomeDef_ptr &ptr (void);
+      HomeDef_ptr operator-> (void);
+    
+    private:
+      HomeDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export ProvidesDef_out
-  {
-  public:
-    ProvidesDef_out (ProvidesDef_ptr &);
-    ProvidesDef_out (ProvidesDef_var &);
-    ProvidesDef_out (const ProvidesDef_out &);
-    ProvidesDef_out &operator= (const ProvidesDef_out &);
-    ProvidesDef_out &operator= (const ProvidesDef_var &);
-    ProvidesDef_out &operator= (ProvidesDef_ptr);
-    operator ProvidesDef_ptr &();
-    ProvidesDef_ptr &ptr (void);
-    ProvidesDef_ptr operator-> (void);
-
-  private:
-    ProvidesDef_ptr &ptr_;
-  };
+#if !defined (_CORBA_COMPONENTIR_EVENTDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_EVENTDEF___PTR_CH_
+    
+    class EventDef;
+    typedef EventDef *EventDef_ptr;
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
-
-#if !defined (_IR_PROVIDESDEF_CH_)
-#define _IR_PROVIDESDEF_CH_
-
-  class _TAO_ProvidesDef_Proxy_Impl;
-  class _TAO_ProvidesDef_Remote_Proxy_Impl;
-  class _TAO_ProvidesDef_Proxy_Broker;
-  class _TAO_ProvidesDef_Remote_Proxy_Broker;
-
-  class TAO_IFR_Client_Export ProvidesDef
-    : public virtual CORBA::Contained
-  {
-  public:
-    typedef ProvidesDef_ptr _ptr_type;
-    typedef ProvidesDef_var _var_type;
-    static int _tao_class_id;
-
-    // The static operations.
-    static ProvidesDef_ptr _duplicate (ProvidesDef_ptr obj);
-
-    static ProvidesDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ProvidesDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ProvidesDef_ptr _nil (void)
-      {
-        return (ProvidesDef_ptr)0;
-      }
-
-    static void _tao_any_destructor (void *);
-
+#if !defined (_CORBA_COMPONENTIR_EVENTDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_EVENTDEF___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::InterfaceDef_ptr interface_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export EventDef_var : public TAO_Base_var
+    {
+    public:
+      EventDef_var (void); // default constructor
+      EventDef_var (EventDef_ptr p) : ptr_ (p) {} 
+      EventDef_var (const EventDef_var &); // copy constructor
+      ~EventDef_var (void); // destructor
+      
+      EventDef_var &operator= (EventDef_ptr);
+      EventDef_var &operator= (const EventDef_var &);
+      EventDef_ptr operator-> (void) const;
+      
+      operator const EventDef_ptr &() const;
+      operator EventDef_ptr &();
+      // in, inout, out, _retn 
+      EventDef_ptr in (void) const;
+      EventDef_ptr &inout (void);
+      EventDef_ptr &out (void);
+      EventDef_ptr _retn (void);
+      EventDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static EventDef_ptr tao_duplicate (EventDef_ptr);
+      static void tao_release (EventDef_ptr);
+      static EventDef_ptr tao_nil (void);
+      static EventDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      EventDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      EventDef_var (const TAO_Base_var &rhs);
+      EventDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_EVENTDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_EVENTDEF___OUT_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-    virtual const char* _interface_repository_id (void) const;
-  private:
-    _TAO_ProvidesDef_Proxy_Broker *the_TAO_ProvidesDef_Proxy_Broker_;
-
-  protected:
-    ProvidesDef (int collocated = 0);
-
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void IR_ProvidesDef_setup_collocation (int collocated);
-
-    ProvidesDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-      );
-    virtual ~ProvidesDef (void);
-
-    friend class _TAO_ProvidesDef_Remote_Proxy_Impl;
-    friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ProvidesDef_Direct_Proxy_Impl;
-
-  private:
-    ProvidesDef (const ProvidesDef &);
-    void operator= (const ProvidesDef &);
-  };
-
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Contained_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_ProvidesDef_Proxy_Impl (void) {}
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export EventDef_out
+    {
+    public:
+      EventDef_out (EventDef_ptr &);
+      EventDef_out (EventDef_var &);
+      EventDef_out (const EventDef_out &);
+      EventDef_out &operator= (const EventDef_out &);
+      EventDef_out &operator= (const EventDef_var &);
+      EventDef_out &operator= (EventDef_ptr);
+      operator EventDef_ptr &();
+      EventDef_ptr &ptr (void);
+      EventDef_ptr operator-> (void);
+    
+    private:
+      EventDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::CORBA::InterfaceDef_ptr interface_type (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-  protected:
-    _TAO_ProvidesDef_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Impl
-    : public virtual _TAO_ProvidesDef_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual CORBA::_TAO_Contained_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_ProvidesDef_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_ProvidesDef_Remote_Proxy_Impl (void) {}
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_EVENTDEF_CH_)
+#define _CORBA_COMPONENTIR_EVENTDEF_CH_
+    
+    class _TAO_EventDef_Proxy_Impl;
+    class _TAO_EventDef_Remote_Proxy_Impl;
+    class _TAO_EventDef_Proxy_Broker;
+    class _TAO_EventDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export EventDef
+      : public virtual CORBA::ExtValueDef
+    {
+    public:
+      typedef EventDef_ptr _ptr_type;
+      typedef EventDef_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static EventDef_ptr _duplicate (EventDef_ptr obj);
+      
+      static EventDef_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static EventDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static EventDef_ptr _nil (void)
+        {
+          return (EventDef_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
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_EventDef_Proxy_Broker *the_TAO_EventDef_Proxy_Broker_;
+    
+    protected:
+      EventDef (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_EventDef_setup_collocation (int collocated);
+      
+      EventDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~EventDef (void);
+      
+      friend class _TAO_EventDef_Remote_Proxy_Impl;
+      friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_EventDef_Direct_Proxy_Impl;
+    
+    private:
+      EventDef (const EventDef &);
+      void operator= (const EventDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::CORBA::InterfaceDef_ptr interface_type (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_ProvidesDef_Proxy_Broker (void);
-    virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
-        ProvidesDef *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_ProvidesDef_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Broker
-    : public virtual _TAO_ProvidesDef_Proxy_Broker
-  {
-  public:
-    _TAO_ProvidesDef_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_ProvidesDef_Remote_Proxy_Broker (void);
-
-    virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
-        ProvidesDef *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_ProvidesDef_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProvidesDef;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
-  class ProvidesDescription_var;
-
-  struct TAO_IFR_Client_Export ProvidesDescription
-  {
-    typedef ProvidesDescription_var _var_type;
-
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::InterfaceDef_var interface_type;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
-  class TAO_IFR_Client_Export ProvidesDescription_var
-  {
-  public:
-    ProvidesDescription_var (void);
-    ProvidesDescription_var (ProvidesDescription *);
-    ProvidesDescription_var (const ProvidesDescription_var &);
-    ~ProvidesDescription_var (void);
-
-    ProvidesDescription_var &operator= (ProvidesDescription *);
-    ProvidesDescription_var &operator= (const ProvidesDescription_var &);
-    ProvidesDescription *operator-> (void);
-    const ProvidesDescription *operator-> (void) const;
-
-    operator const ProvidesDescription &() const;
-    operator ProvidesDescription &();
-    operator ProvidesDescription &() const;
-
-    // Variable-size types only.
-    operator ProvidesDescription *&();
-
-    // in, inout, out, _retn
-    const ProvidesDescription &in (void) const;
-    ProvidesDescription &inout (void);
-    ProvidesDescription *&out (void);
-    ProvidesDescription *_retn (void);
-    ProvidesDescription *ptr (void) const;
-
-  private:
-    ProvidesDescription *ptr_;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
-  class TAO_IFR_Client_Export ProvidesDescription_out
-  {
-  public:
-    ProvidesDescription_out (ProvidesDescription *&);
-    ProvidesDescription_out (ProvidesDescription_var &);
-    ProvidesDescription_out (const ProvidesDescription_out &);
-    ProvidesDescription_out &operator= (const ProvidesDescription_out &);
-    ProvidesDescription_out &operator= (ProvidesDescription *);
-    operator ProvidesDescription *&();
-    ProvidesDescription *&ptr (void);
-    ProvidesDescription *operator-> (void);
-
-  private:
-    ProvidesDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ProvidesDescription_var &);
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProvidesDescription;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IR_USESDEF___PTR_CH_)
-#define _IR_USESDEF___PTR_CH_
-
-  class UsesDef;
-  typedef UsesDef *UsesDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_USESDEF___VAR_CH_)
-#define _IR_USESDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export UsesDef_var : private TAO_Base_var
-  {
-  public:
-    UsesDef_var (void); // default constructor
-    UsesDef_var (UsesDef_ptr p) : ptr_ (p) {}
-    UsesDef_var (const UsesDef_var &); // copy constructor
-    ~UsesDef_var (void); // destructor
-
-    UsesDef_var &operator= (UsesDef_ptr);
-    UsesDef_var &operator= (const UsesDef_var &);
-    UsesDef_ptr operator-> (void) const;
-
-    operator const UsesDef_ptr &() const;
-    operator UsesDef_ptr &();
-    // in, inout, out, _retn
-    UsesDef_ptr in (void) const;
-    UsesDef_ptr &inout (void);
-    UsesDef_ptr &out (void);
-    UsesDef_ptr _retn (void);
-    UsesDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static UsesDef_ptr tao_duplicate (UsesDef_ptr);
-    static void tao_release (UsesDef_ptr);
-    static UsesDef_ptr tao_nil (void);
-    static UsesDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    UsesDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    UsesDef_var (const TAO_Base_var & rhs);
-    UsesDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_USESDEF___OUT_CH_)
-#define _IR_USESDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Impl
+      : public virtual CORBA::_TAO_ExtValueDef_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_EventDef_Proxy_Impl (void) {}
+    
+    protected:
+      _TAO_EventDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Impl
+      : public virtual _TAO_EventDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_EventDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_EventDef_Remote_Proxy_Impl (void) {}
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_EventDef_Proxy_Broker (void);
+      virtual _TAO_EventDef_Proxy_Impl &select_proxy (
+          EventDef *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_EventDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Broker
+      : public virtual _TAO_EventDef_Proxy_Broker
+    {
+    public: 
+      _TAO_EventDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_EventDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_EventDef_Proxy_Impl &select_proxy (
+          EventDef *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_EventDef_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
+    // 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_EventDef;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-  class TAO_IFR_Client_Export UsesDef_out
-  {
-  public:
-    UsesDef_out (UsesDef_ptr &);
-    UsesDef_out (UsesDef_var &);
-    UsesDef_out (const UsesDef_out &);
-    UsesDef_out &operator= (const UsesDef_out &);
-    UsesDef_out &operator= (const UsesDef_var &);
-    UsesDef_out &operator= (UsesDef_ptr);
-    operator UsesDef_ptr &();
-    UsesDef_ptr &ptr (void);
-    UsesDef_ptr operator-> (void);
-
-  private:
-    UsesDef_ptr &ptr_;
-  };
+#if !defined (_CORBA_COMPONENTIR_CONTAINER___PTR_CH_)
+#define _CORBA_COMPONENTIR_CONTAINER___PTR_CH_
+    
+    class Container;
+    typedef Container *Container_ptr;
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
-
-#if !defined (_IR_USESDEF_CH_)
-#define _IR_USESDEF_CH_
-
-  class _TAO_UsesDef_Proxy_Impl;
-  class _TAO_UsesDef_Remote_Proxy_Impl;
-  class _TAO_UsesDef_Proxy_Broker;
-  class _TAO_UsesDef_Remote_Proxy_Broker;
-
-  class TAO_IFR_Client_Export UsesDef
-    : public virtual CORBA::Contained
-  {
-  public:
-    typedef UsesDef_ptr _ptr_type;
-    typedef UsesDef_var _var_type;
-    static int _tao_class_id;
-
-    // The static operations.
-    static UsesDef_ptr _duplicate (UsesDef_ptr obj);
-
-    static UsesDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static UsesDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static UsesDef_ptr _nil (void)
-      {
-        return (UsesDef_ptr)0;
-      }
-
-    static void _tao_any_destructor (void *);
-
+#if !defined (_CORBA_COMPONENTIR_CONTAINER___VAR_CH_)
+#define _CORBA_COMPONENTIR_CONTAINER___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::InterfaceDef_ptr interface_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export Container_var : public TAO_Base_var
+    {
+    public:
+      Container_var (void); // default constructor
+      Container_var (Container_ptr p) : ptr_ (p) {} 
+      Container_var (const Container_var &); // copy constructor
+      ~Container_var (void); // destructor
+      
+      Container_var &operator= (Container_ptr);
+      Container_var &operator= (const Container_var &);
+      Container_ptr operator-> (void) const;
+      
+      operator const Container_ptr &() const;
+      operator Container_ptr &();
+      // in, inout, out, _retn 
+      Container_ptr in (void) const;
+      Container_ptr &inout (void);
+      Container_ptr &out (void);
+      Container_ptr _retn (void);
+      Container_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static Container_ptr tao_duplicate (Container_ptr);
+      static void tao_release (Container_ptr);
+      static Container_ptr tao_nil (void);
+      static Container_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      Container_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      Container_var (const TAO_Base_var &rhs);
+      Container_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_CONTAINER___OUT_CH_)
+#define _CORBA_COMPONENTIR_CONTAINER___OUT_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean is_multiple (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export Container_out
+    {
+    public:
+      Container_out (Container_ptr &);
+      Container_out (Container_var &);
+      Container_out (const Container_out &);
+      Container_out &operator= (const Container_out &);
+      Container_out &operator= (const Container_var &);
+      Container_out &operator= (Container_ptr);
+      operator Container_ptr &();
+      Container_ptr &ptr (void);
+      Container_ptr operator-> (void);
+    
+    private:
+      Container_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-    virtual const char* _interface_repository_id (void) const;
-  private:
-    _TAO_UsesDef_Proxy_Broker *the_TAO_UsesDef_Proxy_Broker_;
-
-  protected:
-    UsesDef (int collocated = 0);
-
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void IR_UsesDef_setup_collocation (int collocated);
-
-    UsesDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-      );
-    virtual ~UsesDef (void);
-
-    friend class _TAO_UsesDef_Remote_Proxy_Impl;
-    friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_UsesDef_Direct_Proxy_Impl;
-
-  private:
-    UsesDef (const UsesDef &);
-    void operator= (const UsesDef &);
-  };
-
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Contained_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_UsesDef_Proxy_Impl (void) {}
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_CONTAINER_CH_)
+#define _CORBA_COMPONENTIR_CONTAINER_CH_
+    
+    class _TAO_Container_Proxy_Impl;
+    class _TAO_Container_Remote_Proxy_Impl;
+    class _TAO_Container_Proxy_Broker;
+    class _TAO_Container_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export Container
+      : public virtual CORBA::Object
+    {
+    public:
+      typedef Container_ptr _ptr_type;
+      typedef Container_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static Container_ptr _duplicate (Container_ptr obj);
+      
+      static Container_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static Container_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static Container_ptr _nil (void)
+        {
+          return (Container_ptr)0;
+        }
+      
+      static void _tao_any_destructor (void *);
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::ComponentDef_ptr create_component (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::ComponentDef_ptr base_component,
+          const CORBA::InterfaceDefSeq & supports_interfaces
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::HomeDef_ptr create_home (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::HomeDef_ptr base_home,
+          CORBA::ComponentIR::ComponentDef_ptr managed_component,
+          const CORBA::InterfaceDefSeq & supports_interfaces,
+          CORBA::ValueDef_ptr primary_key
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::EventDef_ptr create_event (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::Boolean is_custom,
+          CORBA::Boolean is_abstract,
+          CORBA::ValueDef_ptr base_value,
+          CORBA::Boolean is_truncatable,
+          const CORBA::ValueDefSeq & abstract_base_values,
+          const CORBA::InterfaceDefSeq & supported_interfaces,
+          const CORBA::ExtInitializerSeq & initializers
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_Container_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
+    
+    protected:
+      Container (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_Container_setup_collocation (int collocated);
+      
+      Container (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~Container (void);
+      
+      friend class _TAO_Container_Remote_Proxy_Impl;
+      friend class _TAO_Container_ThruPOA_Proxy_Impl;
+      friend class _TAO_Container_Direct_Proxy_Impl;
+    
+    private:
+      Container (const Container &);
+      void operator= (const Container &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::CORBA::InterfaceDef_ptr interface_type (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_Container_Proxy_Impl
+      : public virtual TAO_Object_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_Container_Proxy_Impl (void) {}
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::ComponentDef_ptr create_component (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::ComponentDef_ptr base_component,
+          const CORBA::InterfaceDefSeq & supports_interfaces
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::HomeDef_ptr create_home (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::HomeDef_ptr base_home,
+          CORBA::ComponentIR::ComponentDef_ptr managed_component,
+          const CORBA::InterfaceDefSeq & supports_interfaces,
+          CORBA::ValueDef_ptr primary_key
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::EventDef_ptr create_event (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::Boolean is_custom,
+          CORBA::Boolean is_abstract,
+          CORBA::ValueDef_ptr base_value,
+          CORBA::Boolean is_truncatable,
+          const CORBA::ValueDefSeq & abstract_base_values,
+          const CORBA::InterfaceDefSeq & supported_interfaces,
+          const CORBA::ExtInitializerSeq & initializers
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+    
+    protected:
+      _TAO_Container_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual CORBA::Boolean is_multiple (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-  protected:
-    _TAO_UsesDef_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Impl
-    : public virtual _TAO_UsesDef_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual CORBA::_TAO_Contained_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_UsesDef_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_UsesDef_Remote_Proxy_Impl (void) {}
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_Container_Remote_Proxy_Impl
+      : public virtual _TAO_Container_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl
+    {
+    public:
+      _TAO_Container_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_Container_Remote_Proxy_Impl (void) {}
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::ComponentDef_ptr create_component (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::ComponentDef_ptr base_component,
+          const CORBA::InterfaceDefSeq & supports_interfaces
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::HomeDef_ptr create_home (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::HomeDef_ptr base_home,
+          CORBA::ComponentIR::ComponentDef_ptr managed_component,
+          const CORBA::InterfaceDefSeq & supports_interfaces,
+          CORBA::ValueDef_ptr primary_key
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::EventDef_ptr create_event (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::Boolean is_custom,
+          CORBA::Boolean is_abstract,
+          CORBA::ValueDef_ptr base_value,
+          CORBA::Boolean is_truncatable,
+          const CORBA::ValueDefSeq & abstract_base_values,
+          const CORBA::InterfaceDefSeq & supported_interfaces,
+          const CORBA::ExtInitializerSeq & initializers
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::CORBA::InterfaceDef_ptr interface_type (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_Container_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_Container_Proxy_Broker (void);
+      virtual _TAO_Container_Proxy_Impl &select_proxy (
+          Container *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_Container_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual CORBA::Boolean is_multiple (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_UsesDef_Proxy_Broker (void);
-    virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
-        UsesDef *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_UsesDef_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Broker
-    : public virtual _TAO_UsesDef_Proxy_Broker
-  {
-  public:
-    _TAO_UsesDef_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_UsesDef_Remote_Proxy_Broker (void);
-
-    virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
-        UsesDef *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_UsesDef_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UsesDef;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
-  class UsesDescription_var;
-
-  struct TAO_IFR_Client_Export UsesDescription
-  {
-    typedef UsesDescription_var _var_type;
-
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::InterfaceDef_var interface_type;
-    CORBA::Boolean is_multiple;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
-  class TAO_IFR_Client_Export UsesDescription_var
-  {
-  public:
-    UsesDescription_var (void);
-    UsesDescription_var (UsesDescription *);
-    UsesDescription_var (const UsesDescription_var &);
-    ~UsesDescription_var (void);
-
-    UsesDescription_var &operator= (UsesDescription *);
-    UsesDescription_var &operator= (const UsesDescription_var &);
-    UsesDescription *operator-> (void);
-    const UsesDescription *operator-> (void) const;
-
-    operator const UsesDescription &() const;
-    operator UsesDescription &();
-    operator UsesDescription &() const;
-
-    // Variable-size types only.
-    operator UsesDescription *&();
-
-    // in, inout, out, _retn
-    const UsesDescription &in (void) const;
-    UsesDescription &inout (void);
-    UsesDescription *&out (void);
-    UsesDescription *_retn (void);
-    UsesDescription *ptr (void) const;
-
-  private:
-    UsesDescription *ptr_;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
-  class TAO_IFR_Client_Export UsesDescription_out
-  {
-  public:
-    UsesDescription_out (UsesDescription *&);
-    UsesDescription_out (UsesDescription_var &);
-    UsesDescription_out (const UsesDescription_out &);
-    UsesDescription_out &operator= (const UsesDescription_out &);
-    UsesDescription_out &operator= (UsesDescription *);
-    operator UsesDescription *&();
-    UsesDescription *&ptr (void);
-    UsesDescription *operator-> (void);
-
-  private:
-    UsesDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const UsesDescription_var &);
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UsesDescription;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void);
-    _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ProvidesDescription *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (
-        const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &operator= (
-        const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void);
-
-    // = Accessors.
-    ProvidesDescription &operator[] (CORBA::ULong i);
-    const ProvidesDescription &operator[] (CORBA::ULong i) const;
-
-    // = Static operations.
-    static ProvidesDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (ProvidesDescription *buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ProvidesDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const ProvidesDescription *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ProvidesDescription *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_PROVIDESDESCSEQ_CH_)
-#define _IR_PROVIDESDESCSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class ProvidesDescSeq;
-  class ProvidesDescSeq_var;
-
-  // *************************************************************
-  // IR::ProvidesDescSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export ProvidesDescSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ProvidesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    ProvidesDescSeq (void);
-    ProvidesDescSeq (CORBA::ULong max);
-    ProvidesDescSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ProvidesDescription *buffer,
-        CORBA::Boolean release = 0
-      );
-    ProvidesDescSeq (const ProvidesDescSeq &);
-    ~ProvidesDescSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef ProvidesDescSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PROVIDESDESCSEQ___VAR_CH_)
-#define _IR_PROVIDESDESCSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class IR::ProvidesDescSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export ProvidesDescSeq_var
-  {
-  public:
-    ProvidesDescSeq_var (void);
-    ProvidesDescSeq_var (ProvidesDescSeq *);
-    ProvidesDescSeq_var (const ProvidesDescSeq_var &);
-    ~ProvidesDescSeq_var (void);
-
-    ProvidesDescSeq_var &operator= (ProvidesDescSeq *);
-    ProvidesDescSeq_var &operator= (const ProvidesDescSeq_var &);
-    ProvidesDescSeq *operator-> (void);
-    const ProvidesDescSeq *operator-> (void) const;
-
-    operator const ProvidesDescSeq &() const;
-    operator ProvidesDescSeq &();
-    operator ProvidesDescSeq &() const;
-
-    // Variable-size base types only.
-    operator ProvidesDescSeq *&();
-
-    ProvidesDescription & operator[] (CORBA::ULong index);
-    const ProvidesDescription & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
-    const ProvidesDescSeq &in (void) const;
-    ProvidesDescSeq &inout (void);
-    ProvidesDescSeq *&out (void);
-    ProvidesDescSeq *_retn (void);
-    ProvidesDescSeq *ptr (void) const;
-
-  private:
-    ProvidesDescSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PROVIDESDESCSEQ___OUT_CH_)
-#define _IR_PROVIDESDESCSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export ProvidesDescSeq_out
-  {
-  public:
-    ProvidesDescSeq_out (ProvidesDescSeq *&);
-    ProvidesDescSeq_out (ProvidesDescSeq_var &);
-    ProvidesDescSeq_out (const ProvidesDescSeq_out &);
-    ProvidesDescSeq_out &operator= (const ProvidesDescSeq_out &);
-    ProvidesDescSeq_out &operator= (ProvidesDescSeq *);
-    operator ProvidesDescSeq *&();
-    ProvidesDescSeq *&ptr (void);
-    ProvidesDescSeq *operator-> (void);
-    ProvidesDescription & operator[] (CORBA::ULong index);
-
-  private:
-    ProvidesDescSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ProvidesDescSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProvidesDescSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CH_
-
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_IR_UsesDescSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_IR_UsesDescSeq (void);
-    _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Sequence_IR_UsesDescSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        UsesDescription *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_IR_UsesDescSeq (
-        const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_IR_UsesDescSeq &operator= (
-        const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void);
-
-    // = Accessors.
-    UsesDescription &operator[] (CORBA::ULong i);
-    const UsesDescription &operator[] (CORBA::ULong i) const;
-
-    // = Static operations.
-    static UsesDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (UsesDescription *buffer);
-
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    UsesDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const UsesDescription *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        UsesDescription *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_USESDESCSEQ_CH_)
-#define _IR_USESDESCSEQ_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
-  class UsesDescSeq;
-  class UsesDescSeq_var;
-
-  // *************************************************************
-  // IR::UsesDescSeq
-  // *************************************************************
-
-  class TAO_IFR_Client_Export UsesDescSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IR_UsesDescSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<UsesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    UsesDescSeq (void);
-    UsesDescSeq (CORBA::ULong max);
-    UsesDescSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        UsesDescription *buffer,
-        CORBA::Boolean release = 0
-      );
-    UsesDescSeq (const UsesDescSeq &);
-    ~UsesDescSeq (void);
-
-    static void _tao_any_destructor (void*);
-
-    typedef UsesDescSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_USESDESCSEQ___VAR_CH_)
-#define _IR_USESDESCSEQ___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class IR::UsesDescSeq_var
-  // *************************************************************
-
-  class TAO_IFR_Client_Export UsesDescSeq_var
-  {
-  public:
-    UsesDescSeq_var (void);
-    UsesDescSeq_var (UsesDescSeq *);
-    UsesDescSeq_var (const UsesDescSeq_var &);
-    ~UsesDescSeq_var (void);
-
-    UsesDescSeq_var &operator= (UsesDescSeq *);
-    UsesDescSeq_var &operator= (const UsesDescSeq_var &);
-    UsesDescSeq *operator-> (void);
-    const UsesDescSeq *operator-> (void) const;
-
-    operator const UsesDescSeq &() const;
-    operator UsesDescSeq &();
-    operator UsesDescSeq &() const;
-
-    // Variable-size base types only.
-    operator UsesDescSeq *&();
-
-    UsesDescription & operator[] (CORBA::ULong index);
-    const UsesDescription & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
-    const UsesDescSeq &in (void) const;
-    UsesDescSeq &inout (void);
-    UsesDescSeq *&out (void);
-    UsesDescSeq *_retn (void);
-    UsesDescSeq *ptr (void) const;
-
-  private:
-    UsesDescSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_USESDESCSEQ___OUT_CH_)
-#define _IR_USESDESCSEQ___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
-  class TAO_IFR_Client_Export UsesDescSeq_out
-  {
-  public:
-    UsesDescSeq_out (UsesDescSeq *&);
-    UsesDescSeq_out (UsesDescSeq_var &);
-    UsesDescSeq_out (const UsesDescSeq_out &);
-    UsesDescSeq_out &operator= (const UsesDescSeq_out &);
-    UsesDescSeq_out &operator= (UsesDescSeq *);
-    operator UsesDescSeq *&();
-    UsesDescSeq *&ptr (void);
-    UsesDescSeq *operator-> (void);
-    UsesDescription & operator[] (CORBA::ULong index);
-
-  private:
-    UsesDescSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const UsesDescSeq_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UsesDescSeq;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IR_EVENTDEF___PTR_CH_)
-#define _IR_EVENTDEF___PTR_CH_
-
-  class EventDef;
-  typedef EventDef *EventDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_EVENTDEF___VAR_CH_)
-#define _IR_EVENTDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export EventDef_var : private TAO_Base_var
-  {
-  public:
-    EventDef_var (void); // default constructor
-    EventDef_var (EventDef_ptr p) : ptr_ (p) {}
-    EventDef_var (const EventDef_var &); // copy constructor
-    ~EventDef_var (void); // destructor
-
-    EventDef_var &operator= (EventDef_ptr);
-    EventDef_var &operator= (const EventDef_var &);
-    EventDef_ptr operator-> (void) const;
-
-    operator const EventDef_ptr &() const;
-    operator EventDef_ptr &();
-    // in, inout, out, _retn
-    EventDef_ptr in (void) const;
-    EventDef_ptr &inout (void);
-    EventDef_ptr &out (void);
-    EventDef_ptr _retn (void);
-    EventDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static EventDef_ptr tao_duplicate (EventDef_ptr);
-    static void tao_release (EventDef_ptr);
-    static EventDef_ptr tao_nil (void);
-    static EventDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    EventDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    EventDef_var (const TAO_Base_var & rhs);
-    EventDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_EVENTDEF___OUT_CH_)
-#define _IR_EVENTDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_Container_Remote_Proxy_Broker
+      : public virtual _TAO_Container_Proxy_Broker
+    {
+    public: 
+      _TAO_Container_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_Container_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_Container_Proxy_Impl &select_proxy (
+          Container *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_Container_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_Container_Remote_Proxy_Broker *the_TAO_Container_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
+    // 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_Container;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-  class TAO_IFR_Client_Export EventDef_out
-  {
-  public:
-    EventDef_out (EventDef_ptr &);
-    EventDef_out (EventDef_var &);
-    EventDef_out (const EventDef_out &);
-    EventDef_out &operator= (const EventDef_out &);
-    EventDef_out &operator= (const EventDef_var &);
-    EventDef_out &operator= (EventDef_ptr);
-    operator EventDef_ptr &();
-    EventDef_ptr &ptr (void);
-    EventDef_ptr operator-> (void);
-
-  private:
-    EventDef_ptr &ptr_;
-  };
+#if !defined (_CORBA_COMPONENTIR_MODULEDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_MODULEDEF___PTR_CH_
+    
+    class ModuleDef;
+    typedef ModuleDef *ModuleDef_ptr;
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
-
-#if !defined (_IR_EVENTDEF_CH_)
-#define _IR_EVENTDEF_CH_
-
-  class _TAO_EventDef_Proxy_Impl;
-  class _TAO_EventDef_Remote_Proxy_Impl;
-  class _TAO_EventDef_Proxy_Broker;
-  class _TAO_EventDef_Remote_Proxy_Broker;
-
-  class TAO_IFR_Client_Export EventDef
-    : public virtual CORBA::Contained
-  {
-  public:
-    typedef EventDef_ptr _ptr_type;
-    typedef EventDef_var _var_type;
-    static int _tao_class_id;
-
-    // The static operations.
-    static EventDef_ptr _duplicate (EventDef_ptr obj);
-
-    static EventDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static EventDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static EventDef_ptr _nil (void)
-      {
-        return (EventDef_ptr)0;
-      }
-
-    static void _tao_any_destructor (void *);
-
+#if !defined (_CORBA_COMPONENTIR_MODULEDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_MODULEDEF___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean is_a (
-        const char * event_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export ModuleDef_var : public TAO_Base_var
+    {
+    public:
+      ModuleDef_var (void); // default constructor
+      ModuleDef_var (ModuleDef_ptr p) : ptr_ (p) {} 
+      ModuleDef_var (const ModuleDef_var &); // copy constructor
+      ~ModuleDef_var (void); // destructor
+      
+      ModuleDef_var &operator= (ModuleDef_ptr);
+      ModuleDef_var &operator= (const ModuleDef_var &);
+      ModuleDef_ptr operator-> (void) const;
+      
+      operator const ModuleDef_ptr &() const;
+      operator ModuleDef_ptr &();
+      // in, inout, out, _retn 
+      ModuleDef_ptr in (void) const;
+      ModuleDef_ptr &inout (void);
+      ModuleDef_ptr &out (void);
+      ModuleDef_ptr _retn (void);
+      ModuleDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static ModuleDef_ptr tao_duplicate (ModuleDef_ptr);
+      static void tao_release (ModuleDef_ptr);
+      static ModuleDef_ptr tao_nil (void);
+      static ModuleDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      ModuleDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      ModuleDef_var (const TAO_Base_var &rhs);
+      ModuleDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_MODULEDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_MODULEDEF___OUT_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::ValueDef_ptr event (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export ModuleDef_out
+    {
+    public:
+      ModuleDef_out (ModuleDef_ptr &);
+      ModuleDef_out (ModuleDef_var &);
+      ModuleDef_out (const ModuleDef_out &);
+      ModuleDef_out &operator= (const ModuleDef_out &);
+      ModuleDef_out &operator= (const ModuleDef_var &);
+      ModuleDef_out &operator= (ModuleDef_ptr);
+      operator ModuleDef_ptr &();
+      ModuleDef_ptr &ptr (void);
+      ModuleDef_ptr operator-> (void);
+    
+    private:
+      ModuleDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-    virtual const char* _interface_repository_id (void) const;
-  private:
-    _TAO_EventDef_Proxy_Broker *the_TAO_EventDef_Proxy_Broker_;
-
-  protected:
-    EventDef (int collocated = 0);
-
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void IR_EventDef_setup_collocation (int collocated);
-
-    EventDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-      );
-    virtual ~EventDef (void);
-
-    friend class _TAO_EventDef_Remote_Proxy_Impl;
-    friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_EventDef_Direct_Proxy_Impl;
-
-  private:
-    EventDef (const EventDef &);
-    void operator= (const EventDef &);
-  };
-
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Contained_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_EventDef_Proxy_Impl (void) {}
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_MODULEDEF_CH_)
+#define _CORBA_COMPONENTIR_MODULEDEF_CH_
+    
+    class _TAO_ModuleDef_Proxy_Impl;
+    class _TAO_ModuleDef_Remote_Proxy_Impl;
+    class _TAO_ModuleDef_Proxy_Broker;
+    class _TAO_ModuleDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export ModuleDef
+      : public virtual CORBA::ModuleDef,
+        public virtual CORBA::ComponentIR::Container
+    {
+    public:
+      typedef ModuleDef_ptr _ptr_type;
+      typedef ModuleDef_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static ModuleDef_ptr _duplicate (ModuleDef_ptr obj);
+      
+      static ModuleDef_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static ModuleDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static ModuleDef_ptr _nil (void)
+        {
+          return (ModuleDef_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
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_ModuleDef_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_;
+    
+    protected:
+      ModuleDef (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_ModuleDef_setup_collocation (int collocated);
+      
+      ModuleDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~ModuleDef (void);
+      
+      friend class _TAO_ModuleDef_Remote_Proxy_Impl;
+      friend class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_ModuleDef_Direct_Proxy_Impl;
+    
+    private:
+      ModuleDef (const ModuleDef &);
+      void operator= (const ModuleDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual CORBA::Boolean is_a (
-        CORBA::Object *_collocated_tao_target_,
-        const char * event_id
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Impl
+      : public virtual CORBA::_TAO_ModuleDef_Proxy_Impl, 
+        public virtual CORBA::ComponentIR::_TAO_Container_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_ModuleDef_Proxy_Impl (void) {}
+    
+    protected:
+      _TAO_ModuleDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::CORBA::ValueDef_ptr event (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-  protected:
-    _TAO_EventDef_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Impl
-    : public virtual _TAO_EventDef_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual CORBA::_TAO_Contained_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_EventDef_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_EventDef_Remote_Proxy_Impl (void) {}
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_ModuleDef_Remote_Proxy_Impl
+      : public virtual _TAO_ModuleDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::_TAO_ModuleDef_Remote_Proxy_Impl,
+        public virtual CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_ModuleDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_ModuleDef_Remote_Proxy_Impl (void) {}
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual CORBA::Boolean is_a (
-        CORBA::Object *_collocated_tao_target_,
-        const char * event_id
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_ModuleDef_Proxy_Broker (void);
+      virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
+          ModuleDef *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_ModuleDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::CORBA::ValueDef_ptr event (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_EventDef_Proxy_Broker (void);
-    virtual _TAO_EventDef_Proxy_Impl &select_proxy (
-        EventDef *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_EventDef_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Broker
-    : public virtual _TAO_EventDef_Proxy_Broker
-  {
-  public:
-    _TAO_EventDef_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_EventDef_Remote_Proxy_Broker (void);
-
-    virtual _TAO_EventDef_Proxy_Impl &select_proxy (
-        EventDef *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_EventDef_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EventDef;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
-  class EventDescription_var;
-
-  struct TAO_IFR_Client_Export EventDescription
-  {
-    typedef EventDescription_var _var_type;
-
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::ValueDef_var value;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
-  class TAO_IFR_Client_Export EventDescription_var
-  {
-  public:
-    EventDescription_var (void);
-    EventDescription_var (EventDescription *);
-    EventDescription_var (const EventDescription_var &);
-    ~EventDescription_var (void);
-
-    EventDescription_var &operator= (EventDescription *);
-    EventDescription_var &operator= (const EventDescription_var &);
-    EventDescription *operator-> (void);
-    const EventDescription *operator-> (void) const;
-
-    operator const EventDescription &() const;
-    operator EventDescription &();
-    operator EventDescription &() const;
-
-    // Variable-size types only.
-    operator EventDescription *&();
-
-    // in, inout, out, _retn
-    const EventDescription &in (void) const;
-    EventDescription &inout (void);
-    EventDescription *&out (void);
-    EventDescription *_retn (void);
-    EventDescription *ptr (void) const;
-
-  private:
-    EventDescription *ptr_;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
-  class TAO_IFR_Client_Export EventDescription_out
-  {
-  public:
-    EventDescription_out (EventDescription *&);
-    EventDescription_out (EventDescription_var &);
-    EventDescription_out (const EventDescription_out &);
-    EventDescription_out &operator= (const EventDescription_out &);
-    EventDescription_out &operator= (EventDescription *);
-    operator EventDescription *&();
-    EventDescription *&ptr (void);
-    EventDescription *operator-> (void);
-
-  private:
-    EventDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const EventDescription_var &);
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EventDescription;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IR_EMITSDEF___PTR_CH_)
-#define _IR_EMITSDEF___PTR_CH_
-
-  class EmitsDef;
-  typedef EmitsDef *EmitsDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_EMITSDEF___VAR_CH_)
-#define _IR_EMITSDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export EmitsDef_var : private TAO_Base_var
-  {
-  public:
-    EmitsDef_var (void); // default constructor
-    EmitsDef_var (EmitsDef_ptr p) : ptr_ (p) {}
-    EmitsDef_var (const EmitsDef_var &); // copy constructor
-    ~EmitsDef_var (void); // destructor
-
-    EmitsDef_var &operator= (EmitsDef_ptr);
-    EmitsDef_var &operator= (const EmitsDef_var &);
-    EmitsDef_ptr operator-> (void) const;
-
-    operator const EmitsDef_ptr &() const;
-    operator EmitsDef_ptr &();
-    // in, inout, out, _retn
-    EmitsDef_ptr in (void) const;
-    EmitsDef_ptr &inout (void);
-    EmitsDef_ptr &out (void);
-    EmitsDef_ptr _retn (void);
-    EmitsDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static EmitsDef_ptr tao_duplicate (EmitsDef_ptr);
-    static void tao_release (EmitsDef_ptr);
-    static EmitsDef_ptr tao_nil (void);
-    static EmitsDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    EmitsDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    EmitsDef_var (const TAO_Base_var & rhs);
-    EmitsDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_EMITSDEF___OUT_CH_)
-#define _IR_EMITSDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export EmitsDef_out
-  {
-  public:
-    EmitsDef_out (EmitsDef_ptr &);
-    EmitsDef_out (EmitsDef_var &);
-    EmitsDef_out (const EmitsDef_out &);
-    EmitsDef_out &operator= (const EmitsDef_out &);
-    EmitsDef_out &operator= (const EmitsDef_var &);
-    EmitsDef_out &operator= (EmitsDef_ptr);
-    operator EmitsDef_ptr &();
-    EmitsDef_ptr &ptr (void);
-    EmitsDef_ptr operator-> (void);
-
-  private:
-    EmitsDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
-
-#if !defined (_IR_EMITSDEF_CH_)
-#define _IR_EMITSDEF_CH_
-
-  class _TAO_EmitsDef_Proxy_Impl;
-  class _TAO_EmitsDef_Remote_Proxy_Impl;
-  class _TAO_EmitsDef_Proxy_Broker;
-  class _TAO_EmitsDef_Remote_Proxy_Broker;
-
-  class TAO_IFR_Client_Export EmitsDef
-    : public virtual IR::EventDef
-  {
-  public:
-    typedef EmitsDef_ptr _ptr_type;
-    typedef EmitsDef_var _var_type;
-    static int _tao_class_id;
-
-    // The static operations.
-    static EmitsDef_ptr _duplicate (EmitsDef_ptr obj);
-
-    static EmitsDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static EmitsDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static EmitsDef_ptr _nil (void)
-      {
-        return (EmitsDef_ptr)0;
-      }
-
-    static void _tao_any_destructor (void *);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_ModuleDef_Remote_Proxy_Broker
+      : public virtual _TAO_ModuleDef_Proxy_Broker
+    {
+    public: 
+      _TAO_ModuleDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_ModuleDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
+          ModuleDef *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_ModuleDef_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_ModuleDef_Remote_Proxy_Broker *the_TAO_ModuleDef_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-    virtual const char* _interface_repository_id (void) const;
-  private:
-    _TAO_EmitsDef_Proxy_Broker *the_TAO_EmitsDef_Proxy_Broker_;
-
-  protected:
-    EmitsDef (int collocated = 0);
-
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void IR_EmitsDef_setup_collocation (int collocated);
-
-    EmitsDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-      );
-    virtual ~EmitsDef (void);
-
-    friend class _TAO_EmitsDef_Remote_Proxy_Impl;
-    friend class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_EmitsDef_Direct_Proxy_Impl;
-
-  private:
-    EmitsDef (const EmitsDef &);
-    void operator= (const EmitsDef &);
-  };
-
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Impl
-    : public virtual IR::_TAO_EventDef_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_EmitsDef_Proxy_Impl (void) {}
-
-  protected:
-    _TAO_EmitsDef_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Impl
-    : public virtual _TAO_EmitsDef_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_EmitsDef_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_EmitsDef_Remote_Proxy_Impl (void) {}
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_EmitsDef_Proxy_Broker (void);
-    virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
-        EmitsDef *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_EmitsDef_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Broker
-    : public virtual _TAO_EmitsDef_Proxy_Broker
-  {
-  public:
-    _TAO_EmitsDef_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_EmitsDef_Remote_Proxy_Broker (void);
-
-    virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
-        EmitsDef *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_EmitsDef_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EmitsDef;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IR_PUBLISHESDEF___PTR_CH_)
-#define _IR_PUBLISHESDEF___PTR_CH_
-
-  class PublishesDef;
-  typedef PublishesDef *PublishesDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PUBLISHESDEF___VAR_CH_)
-#define _IR_PUBLISHESDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export PublishesDef_var : private TAO_Base_var
-  {
-  public:
-    PublishesDef_var (void); // default constructor
-    PublishesDef_var (PublishesDef_ptr p) : ptr_ (p) {}
-    PublishesDef_var (const PublishesDef_var &); // copy constructor
-    ~PublishesDef_var (void); // destructor
-
-    PublishesDef_var &operator= (PublishesDef_ptr);
-    PublishesDef_var &operator= (const PublishesDef_var &);
-    PublishesDef_ptr operator-> (void) const;
-
-    operator const PublishesDef_ptr &() const;
-    operator PublishesDef_ptr &();
-    // in, inout, out, _retn
-    PublishesDef_ptr in (void) const;
-    PublishesDef_ptr &inout (void);
-    PublishesDef_ptr &out (void);
-    PublishesDef_ptr _retn (void);
-    PublishesDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static PublishesDef_ptr tao_duplicate (PublishesDef_ptr);
-    static void tao_release (PublishesDef_ptr);
-    static PublishesDef_ptr tao_nil (void);
-    static PublishesDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    PublishesDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PublishesDef_var (const TAO_Base_var & rhs);
-    PublishesDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PUBLISHESDEF___OUT_CH_)
-#define _IR_PUBLISHESDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export PublishesDef_out
-  {
-  public:
-    PublishesDef_out (PublishesDef_ptr &);
-    PublishesDef_out (PublishesDef_var &);
-    PublishesDef_out (const PublishesDef_out &);
-    PublishesDef_out &operator= (const PublishesDef_out &);
-    PublishesDef_out &operator= (const PublishesDef_var &);
-    PublishesDef_out &operator= (PublishesDef_ptr);
-    operator PublishesDef_ptr &();
-    PublishesDef_ptr &ptr (void);
-    PublishesDef_ptr operator-> (void);
-
-  private:
-    PublishesDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
-
-#if !defined (_IR_PUBLISHESDEF_CH_)
-#define _IR_PUBLISHESDEF_CH_
-
-  class _TAO_PublishesDef_Proxy_Impl;
-  class _TAO_PublishesDef_Remote_Proxy_Impl;
-  class _TAO_PublishesDef_Proxy_Broker;
-  class _TAO_PublishesDef_Remote_Proxy_Broker;
-
-  class TAO_IFR_Client_Export PublishesDef
-    : public virtual IR::EventDef
-  {
-  public:
-    typedef PublishesDef_ptr _ptr_type;
-    typedef PublishesDef_var _var_type;
-    static int _tao_class_id;
-
-    // The static operations.
-    static PublishesDef_ptr _duplicate (PublishesDef_ptr obj);
-
-    static PublishesDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static PublishesDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static PublishesDef_ptr _nil (void)
-      {
-        return (PublishesDef_ptr)0;
-      }
-
-    static void _tao_any_destructor (void *);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ModuleDef;
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-    virtual const char* _interface_repository_id (void) const;
-  private:
-    _TAO_PublishesDef_Proxy_Broker *the_TAO_PublishesDef_Proxy_Broker_;
-
-  protected:
-    PublishesDef (int collocated = 0);
-
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void IR_PublishesDef_setup_collocation (int collocated);
-
-    PublishesDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-      );
-    virtual ~PublishesDef (void);
-
-    friend class _TAO_PublishesDef_Remote_Proxy_Impl;
-    friend class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_PublishesDef_Direct_Proxy_Impl;
-
-  private:
-    PublishesDef (const PublishesDef &);
-    void operator= (const PublishesDef &);
-  };
-
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Impl
-    : public virtual IR::_TAO_EventDef_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_PublishesDef_Proxy_Impl (void) {}
-
-  protected:
-    _TAO_PublishesDef_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Impl
-    : public virtual _TAO_PublishesDef_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_PublishesDef_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_PublishesDef_Remote_Proxy_Impl (void) {}
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_PublishesDef_Proxy_Broker (void);
-    virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
-        PublishesDef *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_PublishesDef_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Broker
-    : public virtual _TAO_PublishesDef_Proxy_Broker
-  {
-  public:
-    _TAO_PublishesDef_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_PublishesDef_Remote_Proxy_Broker (void);
-
-    virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
-        PublishesDef *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_PublishesDef_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
+#if !defined (_CORBA_COMPONENTIR_REPOSITORY___PTR_CH_)
+#define _CORBA_COMPONENTIR_REPOSITORY___PTR_CH_
+    
+    class Repository;
+    typedef Repository *Repository_ptr;
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PublishesDef;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IR_CONSUMESDEF___PTR_CH_)
-#define _IR_CONSUMESDEF___PTR_CH_
-
-  class ConsumesDef;
-  typedef ConsumesDef *ConsumesDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_CONSUMESDEF___VAR_CH_)
-#define _IR_CONSUMESDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
+#if !defined (_CORBA_COMPONENTIR_REPOSITORY___VAR_CH_)
+#define _CORBA_COMPONENTIR_REPOSITORY___VAR_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export Repository_var : public TAO_Base_var
+    {
+    public:
+      Repository_var (void); // default constructor
+      Repository_var (Repository_ptr p) : ptr_ (p) {} 
+      Repository_var (const Repository_var &); // copy constructor
+      ~Repository_var (void); // destructor
+      
+      Repository_var &operator= (Repository_ptr);
+      Repository_var &operator= (const Repository_var &);
+      Repository_ptr operator-> (void) const;
+      
+      operator const Repository_ptr &() const;
+      operator Repository_ptr &();
+      // in, inout, out, _retn 
+      Repository_ptr in (void) const;
+      Repository_ptr &inout (void);
+      Repository_ptr &out (void);
+      Repository_ptr _retn (void);
+      Repository_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static Repository_ptr tao_duplicate (Repository_ptr);
+      static void tao_release (Repository_ptr);
+      static Repository_ptr tao_nil (void);
+      static Repository_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      Repository_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      Repository_var (const TAO_Base_var &rhs);
+      Repository_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_REPOSITORY___OUT_CH_)
+#define _CORBA_COMPONENTIR_REPOSITORY___OUT_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export Repository_out
+    {
+    public:
+      Repository_out (Repository_ptr &);
+      Repository_out (Repository_var &);
+      Repository_out (const Repository_out &);
+      Repository_out &operator= (const Repository_out &);
+      Repository_out &operator= (const Repository_var &);
+      Repository_out &operator= (Repository_ptr);
+      operator Repository_ptr &();
+      Repository_ptr &ptr (void);
+      Repository_ptr operator-> (void);
+    
+    private:
+      Repository_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_REPOSITORY_CH_)
+#define _CORBA_COMPONENTIR_REPOSITORY_CH_
+    
+    class _TAO_Repository_Proxy_Impl;
+    class _TAO_Repository_Remote_Proxy_Impl;
+    class _TAO_Repository_Proxy_Broker;
+    class _TAO_Repository_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export Repository
+      : public virtual CORBA::Repository,
+        public virtual CORBA::ComponentIR::Container
+    {
+    public:
+      typedef Repository_ptr _ptr_type;
+      typedef Repository_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static Repository_ptr _duplicate (Repository_ptr obj);
+      
+      static Repository_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static Repository_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static Repository_ptr _nil (void)
+        {
+          return (Repository_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
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_Repository_Proxy_Broker *the_TAO_Repository_Proxy_Broker_;
+    
+    protected:
+      Repository (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_Repository_setup_collocation (int collocated);
+      
+      Repository (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~Repository (void);
+      
+      friend class _TAO_Repository_Remote_Proxy_Impl;
+      friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+      friend class _TAO_Repository_Direct_Proxy_Impl;
+    
+    private:
+      Repository (const Repository &);
+      void operator= (const Repository &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_Repository_Proxy_Impl
+      : public virtual CORBA::_TAO_Repository_Proxy_Impl, 
+        public virtual CORBA::ComponentIR::_TAO_Container_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_Repository_Proxy_Impl (void) {}
+    
+    protected:
+      _TAO_Repository_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_Repository_Remote_Proxy_Impl
+      : public virtual _TAO_Repository_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::_TAO_Repository_Remote_Proxy_Impl,
+        public virtual CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_Repository_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_Repository_Remote_Proxy_Impl (void) {}
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_Repository_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_Repository_Proxy_Broker (void);
+      virtual _TAO_Repository_Proxy_Impl &select_proxy (
+          Repository *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_Repository_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_Repository_Remote_Proxy_Broker
+      : public virtual _TAO_Repository_Proxy_Broker
+    {
+    public: 
+      _TAO_Repository_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_Repository_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_Repository_Proxy_Impl &select_proxy (
+          Repository *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_Repository_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_Repository_Remote_Proxy_Broker *the_TAO_Repository_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
+    // 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_Repository;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-  class TAO_IFR_Client_Export ConsumesDef_var : private TAO_Base_var
-  {
-  public:
-    ConsumesDef_var (void); // default constructor
-    ConsumesDef_var (ConsumesDef_ptr p) : ptr_ (p) {}
-    ConsumesDef_var (const ConsumesDef_var &); // copy constructor
-    ~ConsumesDef_var (void); // destructor
-
-    ConsumesDef_var &operator= (ConsumesDef_ptr);
-    ConsumesDef_var &operator= (const ConsumesDef_var &);
-    ConsumesDef_ptr operator-> (void) const;
-
-    operator const ConsumesDef_ptr &() const;
-    operator ConsumesDef_ptr &();
-    // in, inout, out, _retn
-    ConsumesDef_ptr in (void) const;
-    ConsumesDef_ptr &inout (void);
-    ConsumesDef_ptr &out (void);
-    ConsumesDef_ptr _retn (void);
-    ConsumesDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static ConsumesDef_ptr tao_duplicate (ConsumesDef_ptr);
-    static void tao_release (ConsumesDef_ptr);
-    static ConsumesDef_ptr tao_nil (void);
-    static ConsumesDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    ConsumesDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ConsumesDef_var (const TAO_Base_var & rhs);
-    ConsumesDef_var & operator= (const TAO_Base_var & rhs);
-  };
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_PROVIDESDEF___PTR_CH_
+    
+    class ProvidesDef;
+    typedef ProvidesDef *ProvidesDef_ptr;
 
 #endif /* end #if !defined */
 
-#if !defined (_IR_CONSUMESDEF___OUT_CH_)
-#define _IR_CONSUMESDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_PROVIDESDEF___VAR_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export ProvidesDef_var : public TAO_Base_var
+    {
+    public:
+      ProvidesDef_var (void); // default constructor
+      ProvidesDef_var (ProvidesDef_ptr p) : ptr_ (p) {} 
+      ProvidesDef_var (const ProvidesDef_var &); // copy constructor
+      ~ProvidesDef_var (void); // destructor
+      
+      ProvidesDef_var &operator= (ProvidesDef_ptr);
+      ProvidesDef_var &operator= (const ProvidesDef_var &);
+      ProvidesDef_ptr operator-> (void) const;
+      
+      operator const ProvidesDef_ptr &() const;
+      operator ProvidesDef_ptr &();
+      // in, inout, out, _retn 
+      ProvidesDef_ptr in (void) const;
+      ProvidesDef_ptr &inout (void);
+      ProvidesDef_ptr &out (void);
+      ProvidesDef_ptr _retn (void);
+      ProvidesDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static ProvidesDef_ptr tao_duplicate (ProvidesDef_ptr);
+      static void tao_release (ProvidesDef_ptr);
+      static ProvidesDef_ptr tao_nil (void);
+      static ProvidesDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      ProvidesDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      ProvidesDef_var (const TAO_Base_var &rhs);
+      ProvidesDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_PROVIDESDEF___OUT_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export ProvidesDef_out
+    {
+    public:
+      ProvidesDef_out (ProvidesDef_ptr &);
+      ProvidesDef_out (ProvidesDef_var &);
+      ProvidesDef_out (const ProvidesDef_out &);
+      ProvidesDef_out &operator= (const ProvidesDef_out &);
+      ProvidesDef_out &operator= (const ProvidesDef_var &);
+      ProvidesDef_out &operator= (ProvidesDef_ptr);
+      operator ProvidesDef_ptr &();
+      ProvidesDef_ptr &ptr (void);
+      ProvidesDef_ptr operator-> (void);
+    
+    private:
+      ProvidesDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF_CH_)
+#define _CORBA_COMPONENTIR_PROVIDESDEF_CH_
+    
+    class _TAO_ProvidesDef_Proxy_Impl;
+    class _TAO_ProvidesDef_Remote_Proxy_Impl;
+    class _TAO_ProvidesDef_Proxy_Broker;
+    class _TAO_ProvidesDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export ProvidesDef
+      : public virtual CORBA::Contained
+    {
+    public:
+      typedef ProvidesDef_ptr _ptr_type;
+      typedef ProvidesDef_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static ProvidesDef_ptr _duplicate (ProvidesDef_ptr obj);
+      
+      static ProvidesDef_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static ProvidesDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static ProvidesDef_ptr _nil (void)
+        {
+          return (ProvidesDef_ptr)0;
+        }
+      
+      static void _tao_any_destructor (void *);
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::InterfaceDef_ptr interface_type (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual void interface_type (
+          CORBA::InterfaceDef_ptr interface_type
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_ProvidesDef_Proxy_Broker *the_TAO_ProvidesDef_Proxy_Broker_;
+    
+    protected:
+      ProvidesDef (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_ProvidesDef_setup_collocation (int collocated);
+      
+      ProvidesDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~ProvidesDef (void);
+      
+      friend class _TAO_ProvidesDef_Remote_Proxy_Impl;
+      friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_ProvidesDef_Direct_Proxy_Impl;
+    
+    private:
+      ProvidesDef (const ProvidesDef &);
+      void operator= (const ProvidesDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Impl
+      : public virtual CORBA::_TAO_Contained_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_ProvidesDef_Proxy_Impl (void) {}
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::InterfaceDef_ptr interface_type (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual void interface_type (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::InterfaceDef_ptr interface_type
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+    
+    protected:
+      _TAO_ProvidesDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Impl
+      : public virtual _TAO_ProvidesDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::_TAO_Contained_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_ProvidesDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_ProvidesDef_Remote_Proxy_Impl (void) {}
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::InterfaceDef_ptr interface_type (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual void interface_type (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::InterfaceDef_ptr interface_type
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_ProvidesDef_Proxy_Broker (void);
+      virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
+          ProvidesDef *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_ProvidesDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Broker
+      : public virtual _TAO_ProvidesDef_Proxy_Broker
+    {
+    public: 
+      _TAO_ProvidesDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_ProvidesDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
+          ProvidesDef *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_ProvidesDef_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
+    // 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_ProvidesDef;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    
+    class ProvidesDescription_var;
+    
+    struct TAO_IFR_Client_Export ProvidesDescription
+    {
+      typedef ProvidesDescription_var _var_type;
+      
+      static void _tao_any_destructor (void *);
+      TAO_String_Manager name;
+      TAO_String_Manager id;
+      TAO_String_Manager defined_in;
+      TAO_String_Manager version;
+      TAO_String_Manager interface_type;
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+    
+    class TAO_IFR_Client_Export ProvidesDescription_var
+    {
+    public:
+      ProvidesDescription_var (void);
+      ProvidesDescription_var (ProvidesDescription *);
+      ProvidesDescription_var (const ProvidesDescription_var &);
+      ~ProvidesDescription_var (void);
+      
+      ProvidesDescription_var &operator= (ProvidesDescription *);
+      ProvidesDescription_var &operator= (const ProvidesDescription_var &);
+      ProvidesDescription *operator-> (void);
+      const ProvidesDescription *operator-> (void) const;
+      
+      operator const ProvidesDescription &() const;
+      operator ProvidesDescription &();
+      operator ProvidesDescription &() const;
+      
+      // Variable-size types only.
+      operator ProvidesDescription *&();
+      
+      // in, inout, out, _retn 
+      const ProvidesDescription &in (void) const;
+      ProvidesDescription &inout (void);
+      ProvidesDescription *&out (void);
+      ProvidesDescription *_retn (void);
+      ProvidesDescription *ptr (void) const;
+    
+    private:
+      ProvidesDescription *ptr_;
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+    
+    class TAO_IFR_Client_Export ProvidesDescription_out
+    {
+    public:
+      ProvidesDescription_out (ProvidesDescription *&);
+      ProvidesDescription_out (ProvidesDescription_var &);
+      ProvidesDescription_out (const ProvidesDescription_out &);
+      ProvidesDescription_out &operator= (const ProvidesDescription_out &);
+      ProvidesDescription_out &operator= (ProvidesDescription *);
+      operator ProvidesDescription *&();
+      ProvidesDescription *&ptr (void);
+      ProvidesDescription *operator-> (void);
+      
+    private:
+      ProvidesDescription *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const ProvidesDescription_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_ProvidesDescription;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-  class TAO_IFR_Client_Export ConsumesDef_out
-  {
-  public:
-    ConsumesDef_out (ConsumesDef_ptr &);
-    ConsumesDef_out (ConsumesDef_var &);
-    ConsumesDef_out (const ConsumesDef_out &);
-    ConsumesDef_out &operator= (const ConsumesDef_out &);
-    ConsumesDef_out &operator= (const ConsumesDef_var &);
-    ConsumesDef_out &operator= (ConsumesDef_ptr);
-    operator ConsumesDef_ptr &();
-    ConsumesDef_ptr &ptr (void);
-    ConsumesDef_ptr operator-> (void);
-
-  private:
-    ConsumesDef_ptr &ptr_;
-  };
+#if !defined (_CORBA_COMPONENTIR_USESDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_USESDEF___PTR_CH_
+    
+    class UsesDef;
+    typedef UsesDef *UsesDef_ptr;
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
-
-#if !defined (_IR_CONSUMESDEF_CH_)
-#define _IR_CONSUMESDEF_CH_
-
-  class _TAO_ConsumesDef_Proxy_Impl;
-  class _TAO_ConsumesDef_Remote_Proxy_Impl;
-  class _TAO_ConsumesDef_Proxy_Broker;
-  class _TAO_ConsumesDef_Remote_Proxy_Broker;
-
-  class TAO_IFR_Client_Export ConsumesDef
-    : public virtual IR::EventDef
-  {
-  public:
-    typedef ConsumesDef_ptr _ptr_type;
-    typedef ConsumesDef_var _var_type;
-    static int _tao_class_id;
-
-    // The static operations.
-    static ConsumesDef_ptr _duplicate (ConsumesDef_ptr obj);
-
-    static ConsumesDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ConsumesDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ConsumesDef_ptr _nil (void)
-      {
-        return (ConsumesDef_ptr)0;
-      }
-
-    static void _tao_any_destructor (void *);
-
+#if !defined (_CORBA_COMPONENTIR_USESDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_USESDEF___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-    virtual const char* _interface_repository_id (void) const;
-  private:
-    _TAO_ConsumesDef_Proxy_Broker *the_TAO_ConsumesDef_Proxy_Broker_;
-
-  protected:
-    ConsumesDef (int collocated = 0);
-
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void IR_ConsumesDef_setup_collocation (int collocated);
-
-    ConsumesDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-      );
-    virtual ~ConsumesDef (void);
-
-    friend class _TAO_ConsumesDef_Remote_Proxy_Impl;
-    friend class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ConsumesDef_Direct_Proxy_Impl;
-
-  private:
-    ConsumesDef (const ConsumesDef &);
-    void operator= (const ConsumesDef &);
-  };
-
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Impl
-    : public virtual IR::_TAO_EventDef_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_ConsumesDef_Proxy_Impl (void) {}
-
-  protected:
-    _TAO_ConsumesDef_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Impl
-    : public virtual _TAO_ConsumesDef_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_ConsumesDef_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_ConsumesDef_Remote_Proxy_Impl (void) {}
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_ConsumesDef_Proxy_Broker (void);
-    virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
-        ConsumesDef *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_ConsumesDef_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Broker
-    : public virtual _TAO_ConsumesDef_Proxy_Broker
-  {
-  public:
-    _TAO_ConsumesDef_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_ConsumesDef_Remote_Proxy_Broker (void);
-
-    virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
-        ConsumesDef *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_ConsumesDef_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void);
-  };
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export UsesDef_var : public TAO_Base_var
+    {
+    public:
+      UsesDef_var (void); // default constructor
+      UsesDef_var (UsesDef_ptr p) : ptr_ (p) {} 
+      UsesDef_var (const UsesDef_var &); // copy constructor
+      ~UsesDef_var (void); // destructor
+      
+      UsesDef_var &operator= (UsesDef_ptr);
+      UsesDef_var &operator= (const UsesDef_var &);
+      UsesDef_ptr operator-> (void) const;
+      
+      operator const UsesDef_ptr &() const;
+      operator UsesDef_ptr &();
+      // in, inout, out, _retn 
+      UsesDef_ptr in (void) const;
+      UsesDef_ptr &inout (void);
+      UsesDef_ptr &out (void);
+      UsesDef_ptr _retn (void);
+      UsesDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static UsesDef_ptr tao_duplicate (UsesDef_ptr);
+      static void tao_release (UsesDef_ptr);
+      static UsesDef_ptr tao_nil (void);
+      static UsesDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      UsesDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      UsesDef_var (const TAO_Base_var &rhs);
+      UsesDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_USESDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_USESDEF___OUT_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export UsesDef_out
+    {
+    public:
+      UsesDef_out (UsesDef_ptr &);
+      UsesDef_out (UsesDef_var &);
+      UsesDef_out (const UsesDef_out &);
+      UsesDef_out &operator= (const UsesDef_out &);
+      UsesDef_out &operator= (const UsesDef_var &);
+      UsesDef_out &operator= (UsesDef_ptr);
+      operator UsesDef_ptr &();
+      UsesDef_ptr &ptr (void);
+      UsesDef_ptr operator-> (void);
+    
+    private:
+      UsesDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_USESDEF_CH_)
+#define _CORBA_COMPONENTIR_USESDEF_CH_
+    
+    class _TAO_UsesDef_Proxy_Impl;
+    class _TAO_UsesDef_Remote_Proxy_Impl;
+    class _TAO_UsesDef_Proxy_Broker;
+    class _TAO_UsesDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export UsesDef
+      : public virtual CORBA::Contained
+    {
+    public:
+      typedef UsesDef_ptr _ptr_type;
+      typedef UsesDef_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static UsesDef_ptr _duplicate (UsesDef_ptr obj);
+      
+      static UsesDef_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static UsesDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static UsesDef_ptr _nil (void)
+        {
+          return (UsesDef_ptr)0;
+        }
+      
+      static void _tao_any_destructor (void *);
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::InterfaceDef_ptr interface_type (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual void interface_type (
+          CORBA::InterfaceDef_ptr interface_type
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual CORBA::Boolean is_multiple (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual void is_multiple (
+          CORBA::Boolean is_multiple
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_UsesDef_Proxy_Broker *the_TAO_UsesDef_Proxy_Broker_;
+    
+    protected:
+      UsesDef (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_UsesDef_setup_collocation (int collocated);
+      
+      UsesDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~UsesDef (void);
+      
+      friend class _TAO_UsesDef_Remote_Proxy_Impl;
+      friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_UsesDef_Direct_Proxy_Impl;
+    
+    private:
+      UsesDef (const UsesDef &);
+      void operator= (const UsesDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Impl
+      : public virtual CORBA::_TAO_Contained_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_UsesDef_Proxy_Impl (void) {}
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::InterfaceDef_ptr interface_type (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual void interface_type (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::InterfaceDef_ptr interface_type
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual CORBA::Boolean is_multiple (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual void is_multiple (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::Boolean is_multiple
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+    
+    protected:
+      _TAO_UsesDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Impl
+      : public virtual _TAO_UsesDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::_TAO_Contained_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_UsesDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_UsesDef_Remote_Proxy_Impl (void) {}
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::InterfaceDef_ptr interface_type (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual void interface_type (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::InterfaceDef_ptr interface_type
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual CORBA::Boolean is_multiple (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual void is_multiple (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::Boolean is_multiple
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_UsesDef_Proxy_Broker (void);
+      virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
+          UsesDef *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_UsesDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Broker
+      : public virtual _TAO_UsesDef_Proxy_Broker
+    {
+    public: 
+      _TAO_UsesDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_UsesDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
+          UsesDef *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_UsesDef_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
+    // 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_UsesDef;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    
+    class UsesDescription_var;
+    
+    struct TAO_IFR_Client_Export UsesDescription
+    {
+      typedef UsesDescription_var _var_type;
+      
+      static void _tao_any_destructor (void *);
+      TAO_String_Manager name;
+      TAO_String_Manager id;
+      TAO_String_Manager defined_in;
+      TAO_String_Manager version;
+      TAO_String_Manager interface_type;
+      CORBA::Boolean is_multiple;
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+    
+    class TAO_IFR_Client_Export UsesDescription_var
+    {
+    public:
+      UsesDescription_var (void);
+      UsesDescription_var (UsesDescription *);
+      UsesDescription_var (const UsesDescription_var &);
+      ~UsesDescription_var (void);
+      
+      UsesDescription_var &operator= (UsesDescription *);
+      UsesDescription_var &operator= (const UsesDescription_var &);
+      UsesDescription *operator-> (void);
+      const UsesDescription *operator-> (void) const;
+      
+      operator const UsesDescription &() const;
+      operator UsesDescription &();
+      operator UsesDescription &() const;
+      
+      // Variable-size types only.
+      operator UsesDescription *&();
+      
+      // in, inout, out, _retn 
+      const UsesDescription &in (void) const;
+      UsesDescription &inout (void);
+      UsesDescription *&out (void);
+      UsesDescription *_retn (void);
+      UsesDescription *ptr (void) const;
+    
+    private:
+      UsesDescription *ptr_;
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+    
+    class TAO_IFR_Client_Export UsesDescription_out
+    {
+    public:
+      UsesDescription_out (UsesDescription *&);
+      UsesDescription_out (UsesDescription_var &);
+      UsesDescription_out (const UsesDescription_out &);
+      UsesDescription_out &operator= (const UsesDescription_out &);
+      UsesDescription_out &operator= (UsesDescription *);
+      operator UsesDescription *&();
+      UsesDescription *&ptr (void);
+      UsesDescription *operator-> (void);
+      
+    private:
+      UsesDescription *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const UsesDescription_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_UsesDescription;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_EVENTPORTDEF___PTR_CH_
+    
+    class EventPortDef;
+    typedef EventPortDef *EventPortDef_ptr;
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConsumesDef;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IR_COMPONENTDEF___PTR_CH_)
-#define _IR_COMPONENTDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_EVENTPORTDEF___VAR_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export EventPortDef_var : public TAO_Base_var
+    {
+    public:
+      EventPortDef_var (void); // default constructor
+      EventPortDef_var (EventPortDef_ptr p) : ptr_ (p) {} 
+      EventPortDef_var (const EventPortDef_var &); // copy constructor
+      ~EventPortDef_var (void); // destructor
+      
+      EventPortDef_var &operator= (EventPortDef_ptr);
+      EventPortDef_var &operator= (const EventPortDef_var &);
+      EventPortDef_ptr operator-> (void) const;
+      
+      operator const EventPortDef_ptr &() const;
+      operator EventPortDef_ptr &();
+      // in, inout, out, _retn 
+      EventPortDef_ptr in (void) const;
+      EventPortDef_ptr &inout (void);
+      EventPortDef_ptr &out (void);
+      EventPortDef_ptr _retn (void);
+      EventPortDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static EventPortDef_ptr tao_duplicate (EventPortDef_ptr);
+      static void tao_release (EventPortDef_ptr);
+      static EventPortDef_ptr tao_nil (void);
+      static EventPortDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      EventPortDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      EventPortDef_var (const TAO_Base_var &rhs);
+      EventPortDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_EVENTPORTDEF___OUT_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export EventPortDef_out
+    {
+    public:
+      EventPortDef_out (EventPortDef_ptr &);
+      EventPortDef_out (EventPortDef_var &);
+      EventPortDef_out (const EventPortDef_out &);
+      EventPortDef_out &operator= (const EventPortDef_out &);
+      EventPortDef_out &operator= (const EventPortDef_var &);
+      EventPortDef_out &operator= (EventPortDef_ptr);
+      operator EventPortDef_ptr &();
+      EventPortDef_ptr &ptr (void);
+      EventPortDef_ptr operator-> (void);
+    
+    private:
+      EventPortDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF_CH_)
+#define _CORBA_COMPONENTIR_EVENTPORTDEF_CH_
+    
+    class _TAO_EventPortDef_Proxy_Impl;
+    class _TAO_EventPortDef_Remote_Proxy_Impl;
+    class _TAO_EventPortDef_Proxy_Broker;
+    class _TAO_EventPortDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export EventPortDef
+      : public virtual CORBA::Contained
+    {
+    public:
+      typedef EventPortDef_ptr _ptr_type;
+      typedef EventPortDef_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static EventPortDef_ptr _duplicate (EventPortDef_ptr obj);
+      
+      static EventPortDef_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static EventPortDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static EventPortDef_ptr _nil (void)
+        {
+          return (EventPortDef_ptr)0;
+        }
+      
+      static void _tao_any_destructor (void *);
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::EventDef_ptr event (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual void event (
+          CORBA::ComponentIR::EventDef_ptr event
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual CORBA::Boolean is_a (
+          const char * event_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_EventPortDef_Proxy_Broker *the_TAO_EventPortDef_Proxy_Broker_;
+    
+    protected:
+      EventPortDef (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_EventPortDef_setup_collocation (int collocated);
+      
+      EventPortDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~EventPortDef (void);
+      
+      friend class _TAO_EventPortDef_Remote_Proxy_Impl;
+      friend class _TAO_EventPortDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_EventPortDef_Direct_Proxy_Impl;
+    
+    private:
+      EventPortDef (const EventPortDef &);
+      void operator= (const EventPortDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_EventPortDef_Proxy_Impl
+      : public virtual CORBA::_TAO_Contained_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_EventPortDef_Proxy_Impl (void) {}
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::EventDef_ptr event (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual void event (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::ComponentIR::EventDef_ptr event
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual CORBA::Boolean is_a (
+          CORBA::Object *_collocated_tao_target_,
+          const char * event_id
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+    
+    protected:
+      _TAO_EventPortDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_EventPortDef_Remote_Proxy_Impl
+      : public virtual _TAO_EventPortDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::_TAO_Contained_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_EventPortDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_EventPortDef_Remote_Proxy_Impl (void) {}
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::EventDef_ptr event (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual void event (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::ComponentIR::EventDef_ptr event
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual CORBA::Boolean is_a (
+          CORBA::Object *_collocated_tao_target_,
+          const char * event_id
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_EventPortDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_EventPortDef_Proxy_Broker (void);
+      virtual _TAO_EventPortDef_Proxy_Impl &select_proxy (
+          EventPortDef *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_EventPortDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_EventPortDef_Remote_Proxy_Broker
+      : public virtual _TAO_EventPortDef_Proxy_Broker
+    {
+    public: 
+      _TAO_EventPortDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_EventPortDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_EventPortDef_Proxy_Impl &select_proxy (
+          EventPortDef *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_EventPortDef_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_EventPortDef_Remote_Proxy_Broker *the_TAO_EventPortDef_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
+    // 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_EventPortDef;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    
+    class EventPortDescription_var;
+    
+    struct TAO_IFR_Client_Export EventPortDescription
+    {
+      typedef EventPortDescription_var _var_type;
+      
+      static void _tao_any_destructor (void *);
+      TAO_String_Manager name;
+      TAO_String_Manager id;
+      TAO_String_Manager defined_in;
+      TAO_String_Manager version;
+      TAO_String_Manager event;
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+    
+    class TAO_IFR_Client_Export EventPortDescription_var
+    {
+    public:
+      EventPortDescription_var (void);
+      EventPortDescription_var (EventPortDescription *);
+      EventPortDescription_var (const EventPortDescription_var &);
+      ~EventPortDescription_var (void);
+      
+      EventPortDescription_var &operator= (EventPortDescription *);
+      EventPortDescription_var &operator= (const EventPortDescription_var &);
+      EventPortDescription *operator-> (void);
+      const EventPortDescription *operator-> (void) const;
+      
+      operator const EventPortDescription &() const;
+      operator EventPortDescription &();
+      operator EventPortDescription &() const;
+      
+      // Variable-size types only.
+      operator EventPortDescription *&();
+      
+      // in, inout, out, _retn 
+      const EventPortDescription &in (void) const;
+      EventPortDescription &inout (void);
+      EventPortDescription *&out (void);
+      EventPortDescription *_retn (void);
+      EventPortDescription *ptr (void) const;
+    
+    private:
+      EventPortDescription *ptr_;
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+    
+    class TAO_IFR_Client_Export EventPortDescription_out
+    {
+    public:
+      EventPortDescription_out (EventPortDescription *&);
+      EventPortDescription_out (EventPortDescription_var &);
+      EventPortDescription_out (const EventPortDescription_out &);
+      EventPortDescription_out &operator= (const EventPortDescription_out &);
+      EventPortDescription_out &operator= (EventPortDescription *);
+      operator EventPortDescription *&();
+      EventPortDescription *&ptr (void);
+      EventPortDescription *operator-> (void);
+      
+    private:
+      EventPortDescription *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const EventPortDescription_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_EventPortDescription;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-  class ComponentDef;
-  typedef ComponentDef *ComponentDef_ptr;
+#if !defined (_CORBA_COMPONENTIR_EMITSDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_EMITSDEF___PTR_CH_
+    
+    class EmitsDef;
+    typedef EmitsDef *EmitsDef_ptr;
 
 #endif /* end #if !defined */
 
-#if !defined (_IR_COMPONENTDEF___VAR_CH_)
-#define _IR_COMPONENTDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
+#if !defined (_CORBA_COMPONENTIR_EMITSDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_EMITSDEF___VAR_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export EmitsDef_var : public TAO_Base_var
+    {
+    public:
+      EmitsDef_var (void); // default constructor
+      EmitsDef_var (EmitsDef_ptr p) : ptr_ (p) {} 
+      EmitsDef_var (const EmitsDef_var &); // copy constructor
+      ~EmitsDef_var (void); // destructor
+      
+      EmitsDef_var &operator= (EmitsDef_ptr);
+      EmitsDef_var &operator= (const EmitsDef_var &);
+      EmitsDef_ptr operator-> (void) const;
+      
+      operator const EmitsDef_ptr &() const;
+      operator EmitsDef_ptr &();
+      // in, inout, out, _retn 
+      EmitsDef_ptr in (void) const;
+      EmitsDef_ptr &inout (void);
+      EmitsDef_ptr &out (void);
+      EmitsDef_ptr _retn (void);
+      EmitsDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static EmitsDef_ptr tao_duplicate (EmitsDef_ptr);
+      static void tao_release (EmitsDef_ptr);
+      static EmitsDef_ptr tao_nil (void);
+      static EmitsDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      EmitsDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      EmitsDef_var (const TAO_Base_var &rhs);
+      EmitsDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_EMITSDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_EMITSDEF___OUT_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export EmitsDef_out
+    {
+    public:
+      EmitsDef_out (EmitsDef_ptr &);
+      EmitsDef_out (EmitsDef_var &);
+      EmitsDef_out (const EmitsDef_out &);
+      EmitsDef_out &operator= (const EmitsDef_out &);
+      EmitsDef_out &operator= (const EmitsDef_var &);
+      EmitsDef_out &operator= (EmitsDef_ptr);
+      operator EmitsDef_ptr &();
+      EmitsDef_ptr &ptr (void);
+      EmitsDef_ptr operator-> (void);
+    
+    private:
+      EmitsDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_EMITSDEF_CH_)
+#define _CORBA_COMPONENTIR_EMITSDEF_CH_
+    
+    class _TAO_EmitsDef_Proxy_Impl;
+    class _TAO_EmitsDef_Remote_Proxy_Impl;
+    class _TAO_EmitsDef_Proxy_Broker;
+    class _TAO_EmitsDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export EmitsDef
+      : public virtual CORBA::ComponentIR::EventPortDef
+    {
+    public:
+      typedef EmitsDef_ptr _ptr_type;
+      typedef EmitsDef_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static EmitsDef_ptr _duplicate (EmitsDef_ptr obj);
+      
+      static EmitsDef_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static EmitsDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static EmitsDef_ptr _nil (void)
+        {
+          return (EmitsDef_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
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_EmitsDef_Proxy_Broker *the_TAO_EmitsDef_Proxy_Broker_;
+    
+    protected:
+      EmitsDef (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_EmitsDef_setup_collocation (int collocated);
+      
+      EmitsDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~EmitsDef (void);
+      
+      friend class _TAO_EmitsDef_Remote_Proxy_Impl;
+      friend class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_EmitsDef_Direct_Proxy_Impl;
+    
+    private:
+      EmitsDef (const EmitsDef &);
+      void operator= (const EmitsDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Impl
+      : public virtual CORBA::ComponentIR::_TAO_EventPortDef_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_EmitsDef_Proxy_Impl (void) {}
+    
+    protected:
+      _TAO_EmitsDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Impl
+      : public virtual _TAO_EmitsDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_EmitsDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_EmitsDef_Remote_Proxy_Impl (void) {}
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_EmitsDef_Proxy_Broker (void);
+      virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
+          EmitsDef *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_EmitsDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Broker
+      : public virtual _TAO_EmitsDef_Proxy_Broker
+    {
+    public: 
+      _TAO_EmitsDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_EmitsDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
+          EmitsDef *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_EmitsDef_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
+    // 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_EmitsDef;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-  class TAO_IFR_Client_Export ComponentDef_var : private TAO_Base_var
-  {
-  public:
-    ComponentDef_var (void); // default constructor
-    ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {}
-    ComponentDef_var (const ComponentDef_var &); // copy constructor
-    ~ComponentDef_var (void); // destructor
-
-    ComponentDef_var &operator= (ComponentDef_ptr);
-    ComponentDef_var &operator= (const ComponentDef_var &);
-    ComponentDef_ptr operator-> (void) const;
-
-    operator const ComponentDef_ptr &() const;
-    operator ComponentDef_ptr &();
-    // in, inout, out, _retn
-    ComponentDef_ptr in (void) const;
-    ComponentDef_ptr &inout (void);
-    ComponentDef_ptr &out (void);
-    ComponentDef_ptr _retn (void);
-    ComponentDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static ComponentDef_ptr tao_duplicate (ComponentDef_ptr);
-    static void tao_release (ComponentDef_ptr);
-    static ComponentDef_ptr tao_nil (void);
-    static ComponentDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    ComponentDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ComponentDef_var (const TAO_Base_var & rhs);
-    ComponentDef_var & operator= (const TAO_Base_var & rhs);
-  };
+#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_PUBLISHESDEF___PTR_CH_
+    
+    class PublishesDef;
+    typedef PublishesDef *PublishesDef_ptr;
 
 #endif /* end #if !defined */
 
-#if !defined (_IR_COMPONENTDEF___OUT_CH_)
-#define _IR_COMPONENTDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
+#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_PUBLISHESDEF___VAR_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export PublishesDef_var : public TAO_Base_var
+    {
+    public:
+      PublishesDef_var (void); // default constructor
+      PublishesDef_var (PublishesDef_ptr p) : ptr_ (p) {} 
+      PublishesDef_var (const PublishesDef_var &); // copy constructor
+      ~PublishesDef_var (void); // destructor
+      
+      PublishesDef_var &operator= (PublishesDef_ptr);
+      PublishesDef_var &operator= (const PublishesDef_var &);
+      PublishesDef_ptr operator-> (void) const;
+      
+      operator const PublishesDef_ptr &() const;
+      operator PublishesDef_ptr &();
+      // in, inout, out, _retn 
+      PublishesDef_ptr in (void) const;
+      PublishesDef_ptr &inout (void);
+      PublishesDef_ptr &out (void);
+      PublishesDef_ptr _retn (void);
+      PublishesDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static PublishesDef_ptr tao_duplicate (PublishesDef_ptr);
+      static void tao_release (PublishesDef_ptr);
+      static PublishesDef_ptr tao_nil (void);
+      static PublishesDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      PublishesDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      PublishesDef_var (const TAO_Base_var &rhs);
+      PublishesDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_PUBLISHESDEF___OUT_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export PublishesDef_out
+    {
+    public:
+      PublishesDef_out (PublishesDef_ptr &);
+      PublishesDef_out (PublishesDef_var &);
+      PublishesDef_out (const PublishesDef_out &);
+      PublishesDef_out &operator= (const PublishesDef_out &);
+      PublishesDef_out &operator= (const PublishesDef_var &);
+      PublishesDef_out &operator= (PublishesDef_ptr);
+      operator PublishesDef_ptr &();
+      PublishesDef_ptr &ptr (void);
+      PublishesDef_ptr operator-> (void);
+    
+    private:
+      PublishesDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF_CH_)
+#define _CORBA_COMPONENTIR_PUBLISHESDEF_CH_
+    
+    class _TAO_PublishesDef_Proxy_Impl;
+    class _TAO_PublishesDef_Remote_Proxy_Impl;
+    class _TAO_PublishesDef_Proxy_Broker;
+    class _TAO_PublishesDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export PublishesDef
+      : public virtual CORBA::ComponentIR::EventPortDef
+    {
+    public:
+      typedef PublishesDef_ptr _ptr_type;
+      typedef PublishesDef_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static PublishesDef_ptr _duplicate (PublishesDef_ptr obj);
+      
+      static PublishesDef_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static PublishesDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static PublishesDef_ptr _nil (void)
+        {
+          return (PublishesDef_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
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_PublishesDef_Proxy_Broker *the_TAO_PublishesDef_Proxy_Broker_;
+    
+    protected:
+      PublishesDef (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_PublishesDef_setup_collocation (int collocated);
+      
+      PublishesDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~PublishesDef (void);
+      
+      friend class _TAO_PublishesDef_Remote_Proxy_Impl;
+      friend class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_PublishesDef_Direct_Proxy_Impl;
+    
+    private:
+      PublishesDef (const PublishesDef &);
+      void operator= (const PublishesDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Impl
+      : public virtual CORBA::ComponentIR::_TAO_EventPortDef_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_PublishesDef_Proxy_Impl (void) {}
+    
+    protected:
+      _TAO_PublishesDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Impl
+      : public virtual _TAO_PublishesDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_PublishesDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_PublishesDef_Remote_Proxy_Impl (void) {}
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_PublishesDef_Proxy_Broker (void);
+      virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
+          PublishesDef *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_PublishesDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Broker
+      : public virtual _TAO_PublishesDef_Proxy_Broker
+    {
+    public: 
+      _TAO_PublishesDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_PublishesDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
+          PublishesDef *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_PublishesDef_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
+    // 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_PublishesDef;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-  class TAO_IFR_Client_Export ComponentDef_out
-  {
-  public:
-    ComponentDef_out (ComponentDef_ptr &);
-    ComponentDef_out (ComponentDef_var &);
-    ComponentDef_out (const ComponentDef_out &);
-    ComponentDef_out &operator= (const ComponentDef_out &);
-    ComponentDef_out &operator= (const ComponentDef_var &);
-    ComponentDef_out &operator= (ComponentDef_ptr);
-    operator ComponentDef_ptr &();
-    ComponentDef_ptr &ptr (void);
-    ComponentDef_ptr operator-> (void);
-
-  private:
-    ComponentDef_ptr &ptr_;
-  };
+#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_CONSUMESDEF___PTR_CH_
+    
+    class ConsumesDef;
+    typedef ConsumesDef *ConsumesDef_ptr;
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
-
-#if !defined (_IR_COMPONENTDEF_CH_)
-#define _IR_COMPONENTDEF_CH_
-
-  class _TAO_ComponentDef_Proxy_Impl;
-  class _TAO_ComponentDef_Remote_Proxy_Impl;
-  class _TAO_ComponentDef_Proxy_Broker;
-  class _TAO_ComponentDef_Remote_Proxy_Broker;
-
-  class TAO_IFR_Client_Export ComponentDef
-    : public virtual CORBA::InterfaceDef
-  {
-  public:
-    typedef ComponentDef_ptr _ptr_type;
-    typedef ComponentDef_var _var_type;
-    static int _tao_class_id;
-
-    // The static operations.
-    static ComponentDef_ptr _duplicate (ComponentDef_ptr obj);
-
-    static ComponentDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ComponentDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ComponentDef_ptr _nil (void)
-      {
-        return (ComponentDef_ptr)0;
-      }
-
-    static void _tao_any_destructor (void *);
-
+#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_CONSUMESDEF___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export ConsumesDef_var : public TAO_Base_var
+    {
+    public:
+      ConsumesDef_var (void); // default constructor
+      ConsumesDef_var (ConsumesDef_ptr p) : ptr_ (p) {} 
+      ConsumesDef_var (const ConsumesDef_var &); // copy constructor
+      ~ConsumesDef_var (void); // destructor
+      
+      ConsumesDef_var &operator= (ConsumesDef_ptr);
+      ConsumesDef_var &operator= (const ConsumesDef_var &);
+      ConsumesDef_ptr operator-> (void) const;
+      
+      operator const ConsumesDef_ptr &() const;
+      operator ConsumesDef_ptr &();
+      // in, inout, out, _retn 
+      ConsumesDef_ptr in (void) const;
+      ConsumesDef_ptr &inout (void);
+      ConsumesDef_ptr &out (void);
+      ConsumesDef_ptr _retn (void);
+      ConsumesDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static ConsumesDef_ptr tao_duplicate (ConsumesDef_ptr);
+      static void tao_release (ConsumesDef_ptr);
+      static ConsumesDef_ptr tao_nil (void);
+      static ConsumesDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      ConsumesDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      ConsumesDef_var (const TAO_Base_var &rhs);
+      ConsumesDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_CONSUMESDEF___OUT_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual void supported_interfaces (
-        const CORBA::InterfaceDefSeq & supported_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export ConsumesDef_out
+    {
+    public:
+      ConsumesDef_out (ConsumesDef_ptr &);
+      ConsumesDef_out (ConsumesDef_var &);
+      ConsumesDef_out (const ConsumesDef_out &);
+      ConsumesDef_out &operator= (const ConsumesDef_out &);
+      ConsumesDef_out &operator= (const ConsumesDef_var &);
+      ConsumesDef_out &operator= (ConsumesDef_ptr);
+      operator ConsumesDef_ptr &();
+      ConsumesDef_ptr &ptr (void);
+      ConsumesDef_ptr operator-> (void);
+    
+    private:
+      ConsumesDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::ComponentDef_ptr base_component (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF_CH_)
+#define _CORBA_COMPONENTIR_CONSUMESDEF_CH_
+    
+    class _TAO_ConsumesDef_Proxy_Impl;
+    class _TAO_ConsumesDef_Remote_Proxy_Impl;
+    class _TAO_ConsumesDef_Proxy_Broker;
+    class _TAO_ConsumesDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export ConsumesDef
+      : public virtual CORBA::ComponentIR::EventPortDef
+    {
+    public:
+      typedef ConsumesDef_ptr _ptr_type;
+      typedef ConsumesDef_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static ConsumesDef_ptr _duplicate (ConsumesDef_ptr obj);
+      
+      static ConsumesDef_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static ConsumesDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static ConsumesDef_ptr _nil (void)
+        {
+          return (ConsumesDef_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
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_ConsumesDef_Proxy_Broker *the_TAO_ConsumesDef_Proxy_Broker_;
+    
+    protected:
+      ConsumesDef (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_ConsumesDef_setup_collocation (int collocated);
+      
+      ConsumesDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~ConsumesDef (void);
+      
+      friend class _TAO_ConsumesDef_Remote_Proxy_Impl;
+      friend class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_ConsumesDef_Direct_Proxy_Impl;
+    
+    private:
+      ConsumesDef (const ConsumesDef &);
+      void operator= (const ConsumesDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::ProvidesDefSeq * provides_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Impl
+      : public virtual CORBA::ComponentIR::_TAO_EventPortDef_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_ConsumesDef_Proxy_Impl (void) {}
+    
+    protected:
+      _TAO_ConsumesDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::UsesDefSeq * uses_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Impl
+      : public virtual _TAO_ConsumesDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_ConsumesDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_ConsumesDef_Remote_Proxy_Impl (void) {}
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::EmitsDefSeq * emits_events (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_ConsumesDef_Proxy_Broker (void);
+      virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
+          ConsumesDef *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_ConsumesDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::PublishesDefSeq * publishes_events (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Broker
+      : public virtual _TAO_ConsumesDef_Proxy_Broker
+    {
+    public: 
+      _TAO_ConsumesDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_ConsumesDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
+          ConsumesDef *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_ConsumesDef_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::ConsumesDefSeq * consumes_events (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConsumesDef;
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-    virtual CORBA::Boolean is_basic (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF___PTR_CH_
+    
+    class ComponentDef;
+    typedef ComponentDef *ComponentDef_ptr;
 
-    virtual ::IR::ProvidesDef_ptr create_provides (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::InterfaceDef_ptr interface_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+#endif /* end #if !defined */
 
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::UsesDef_ptr create_uses (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::InterfaceDef_ptr interface_type,
-        CORBA::Boolean is_multiple
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export ComponentDef_var : public TAO_Base_var
+    {
+    public:
+      ComponentDef_var (void); // default constructor
+      ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {} 
+      ComponentDef_var (const ComponentDef_var &); // copy constructor
+      ~ComponentDef_var (void); // destructor
+      
+      ComponentDef_var &operator= (ComponentDef_ptr);
+      ComponentDef_var &operator= (const ComponentDef_var &);
+      ComponentDef_ptr operator-> (void) const;
+      
+      operator const ComponentDef_ptr &() const;
+      operator ComponentDef_ptr &();
+      // in, inout, out, _retn 
+      ComponentDef_ptr in (void) const;
+      ComponentDef_ptr &inout (void);
+      ComponentDef_ptr &out (void);
+      ComponentDef_ptr _retn (void);
+      ComponentDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static ComponentDef_ptr tao_duplicate (ComponentDef_ptr);
+      static void tao_release (ComponentDef_ptr);
+      static ComponentDef_ptr tao_nil (void);
+      static ComponentDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      ComponentDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      ComponentDef_var (const TAO_Base_var &rhs);
+      ComponentDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF___OUT_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::EmitsDef_ptr create_emits (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::ValueDef_ptr value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export ComponentDef_out
+    {
+    public:
+      ComponentDef_out (ComponentDef_ptr &);
+      ComponentDef_out (ComponentDef_var &);
+      ComponentDef_out (const ComponentDef_out &);
+      ComponentDef_out &operator= (const ComponentDef_out &);
+      ComponentDef_out &operator= (const ComponentDef_var &);
+      ComponentDef_out &operator= (ComponentDef_ptr);
+      operator ComponentDef_ptr &();
+      ComponentDef_ptr &ptr (void);
+      ComponentDef_ptr operator-> (void);
+    
+    private:
+      ComponentDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::PublishesDef_ptr create_publishes (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::ValueDef_ptr value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF_CH_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF_CH_
+    
+    class _TAO_ComponentDef_Proxy_Impl;
+    class _TAO_ComponentDef_Remote_Proxy_Impl;
+    class _TAO_ComponentDef_Proxy_Broker;
+    class _TAO_ComponentDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export ComponentDef
+      : public virtual CORBA::ExtInterfaceDef
+    {
+    public:
+      typedef ComponentDef_ptr _ptr_type;
+      typedef ComponentDef_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static ComponentDef_ptr _duplicate (ComponentDef_ptr obj);
+      
+      static ComponentDef_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static ComponentDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static ComponentDef_ptr _nil (void)
+        {
+          return (ComponentDef_ptr)0;
+        }
+      
+      static void _tao_any_destructor (void *);
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::ComponentDef_ptr base_component (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual void base_component (
+          CORBA::ComponentIR::ComponentDef_ptr base_component
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual void supported_interfaces (
+          const CORBA::InterfaceDefSeq & supported_interfaces
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::ProvidesDef_ptr create_provides (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::InterfaceDef_ptr interface_type
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::UsesDef_ptr create_uses (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::InterfaceDef_ptr interface_type,
+          CORBA::Boolean is_multiple
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::EmitsDef_ptr create_emits (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::EventDef_ptr event
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::PublishesDef_ptr create_publishes (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::EventDef_ptr event
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::ConsumesDef_ptr create_consumes (
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::EventDef_ptr event
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_ComponentDef_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_;
+    
+    protected:
+      ComponentDef (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_ComponentDef_setup_collocation (int collocated);
+      
+      ComponentDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~ComponentDef (void);
+      
+      friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+      friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+    
+    private:
+      ComponentDef (const ComponentDef &);
+      void operator= (const ComponentDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::ConsumesDef_ptr create_consumes (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::ValueDef_ptr value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Impl
+      : public virtual CORBA::_TAO_ExtInterfaceDef_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_ComponentDef_Proxy_Impl (void) {}
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::ComponentDef_ptr base_component (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual void base_component (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::ComponentIR::ComponentDef_ptr base_component
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual void supported_interfaces (
+          CORBA::Object *_collocated_tao_target_,
+          const CORBA::InterfaceDefSeq & supported_interfaces
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::ProvidesDef_ptr create_provides (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::InterfaceDef_ptr interface_type
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::UsesDef_ptr create_uses (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::InterfaceDef_ptr interface_type,
+          CORBA::Boolean is_multiple
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::EmitsDef_ptr create_emits (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::EventDef_ptr event
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::PublishesDef_ptr create_publishes (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::EventDef_ptr event
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::ConsumesDef_ptr create_consumes (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::EventDef_ptr event
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+    
+    protected:
+      _TAO_ComponentDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-    virtual const char* _interface_repository_id (void) const;
-  private:
-    _TAO_ComponentDef_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_;
-
-  protected:
-    ComponentDef (int collocated = 0);
-
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void IR_ComponentDef_setup_collocation (int collocated);
-
-    ComponentDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-      );
-    virtual ~ComponentDef (void);
-
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-  private:
-    ComponentDef (const ComponentDef &);
-    void operator= (const ComponentDef &);
-  };
-
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Impl
-    : public virtual CORBA::_TAO_InterfaceDef_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_ComponentDef_Proxy_Impl (void) {}
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Impl
+      : public virtual _TAO_ComponentDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_ComponentDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_ComponentDef_Remote_Proxy_Impl (void) {}
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::ComponentDef_ptr base_component (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual void base_component (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::ComponentIR::ComponentDef_ptr base_component
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual void supported_interfaces (
+          CORBA::Object *_collocated_tao_target_,
+          const CORBA::InterfaceDefSeq & supported_interfaces
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::ProvidesDef_ptr create_provides (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::InterfaceDef_ptr interface_type
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::UsesDef_ptr create_uses (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::InterfaceDef_ptr interface_type,
+          CORBA::Boolean is_multiple
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::EmitsDef_ptr create_emits (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::EventDef_ptr event
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::PublishesDef_ptr create_publishes (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::EventDef_ptr event
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::ConsumesDef_ptr create_consumes (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          CORBA::ComponentIR::EventDef_ptr event
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_ComponentDef_Proxy_Broker (void);
+      virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
+          ComponentDef *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_ComponentDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void supported_interfaces (
-        CORBA::Object *_collocated_tao_target_,
-        const CORBA::InterfaceDefSeq & supported_interfaces
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Broker
+      : public virtual _TAO_ComponentDef_Proxy_Broker
+    {
+    public: 
+      _TAO_ComponentDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_ComponentDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
+          ComponentDef *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_ComponentDef_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentDef;
+    
+    // TAO_IDL - Generated from 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
-    virtual ::IR::ComponentDef_ptr base_component (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_
+    
+    class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (void);
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          ProvidesDescription *data,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (
+          const _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq &rhs
+        );
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq &operator= (
+          const _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (void);
+      
+      // = Accessors.
+      ProvidesDescription &operator[] (CORBA::ULong i);
+      const ProvidesDescription &operator[] (CORBA::ULong i) const;
+      
+      // = Static operations.
+      static ProvidesDescription *allocbuf (CORBA::ULong size);
+      static void freebuf (ProvidesDescription *buffer);
+      
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      ProvidesDescription *get_buffer (CORBA::Boolean orphan = 0);
+      const ProvidesDescription *get_buffer (void) const;
+      void replace (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          ProvidesDescription *data,
+          CORBA::Boolean release
+        );
+    };
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_)
+#define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::ProvidesDefSeq * provides_interfaces (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
+    class ProvidesDescriptionSeq;
+    class ProvidesDescriptionSeq_var;
+    
+    // *************************************************************
+    // CORBA::ComponentIR::ProvidesDescriptionSeq
+    // *************************************************************
+    
+    class TAO_IFR_Client_Export ProvidesDescriptionSeq : 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_CORBA_ComponentIR_ProvidesDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+    TAO_Unbounded_Sequence<ProvidesDescription>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    {
+    public:
+      ProvidesDescriptionSeq (void);
+      ProvidesDescriptionSeq (CORBA::ULong max);
+      ProvidesDescriptionSeq (
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          ProvidesDescription *buffer, 
+          CORBA::Boolean release = 0
+        );
+      ProvidesDescriptionSeq (const ProvidesDescriptionSeq &);
+      ~ProvidesDescriptionSeq (void);
+      
+      static void _tao_any_destructor (void*);
+      
+      typedef ProvidesDescriptionSeq_var _var_type;
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ___VAR_CH_)
+#define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::UsesDefSeq * uses_interfaces (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::EmitsDefSeq * emits_events (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+    
+    // *************************************************************
+    // class CORBA::ComponentIR::ProvidesDescriptionSeq_var
+    // *************************************************************
+    
+    class TAO_IFR_Client_Export ProvidesDescriptionSeq_var
+    {
+    public:
+      ProvidesDescriptionSeq_var (void);
+      ProvidesDescriptionSeq_var (ProvidesDescriptionSeq *);
+      ProvidesDescriptionSeq_var (const ProvidesDescriptionSeq_var &);
+      ~ProvidesDescriptionSeq_var (void);
+      
+      ProvidesDescriptionSeq_var &operator= (ProvidesDescriptionSeq *);
+      ProvidesDescriptionSeq_var &operator= (const ProvidesDescriptionSeq_var &);
+      ProvidesDescriptionSeq *operator-> (void);
+      const ProvidesDescriptionSeq *operator-> (void) const;
+      
+      operator const ProvidesDescriptionSeq &() const;
+      operator ProvidesDescriptionSeq &();
+      operator ProvidesDescriptionSeq &() const;
+      
+      // Variable-size base types only.
+      operator ProvidesDescriptionSeq *&();
+      
+      ProvidesDescription & operator[] (CORBA::ULong index);
+      const ProvidesDescription & operator[] (CORBA::ULong index) const;
+      
+      // in, inout, out, _retn 
+      const ProvidesDescriptionSeq &in (void) const;
+      ProvidesDescriptionSeq &inout (void);
+      ProvidesDescriptionSeq *&out (void);
+      ProvidesDescriptionSeq *_retn (void);
+      ProvidesDescriptionSeq *ptr (void) const;
+    
+    private:
+      ProvidesDescriptionSeq *ptr_;
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ___OUT_CH_)
+#define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ___OUT_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::PublishesDefSeq * publishes_events (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::ConsumesDefSeq * consumes_events (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual CORBA::Boolean is_basic (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::ProvidesDef_ptr create_provides (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::InterfaceDef_ptr interface_type
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::UsesDef_ptr create_uses (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::InterfaceDef_ptr interface_type,
-        CORBA::Boolean is_multiple
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::EmitsDef_ptr create_emits (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::ValueDef_ptr value
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::PublishesDef_ptr create_publishes (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::ValueDef_ptr value
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::ConsumesDef_ptr create_consumes (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::ValueDef_ptr value
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-  protected:
-    _TAO_ComponentDef_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Impl
-    : public virtual _TAO_ComponentDef_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_ComponentDef_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_ComponentDef_Remote_Proxy_Impl (void) {}
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+    
+    class TAO_IFR_Client_Export ProvidesDescriptionSeq_out
+    {
+    public:
+      ProvidesDescriptionSeq_out (ProvidesDescriptionSeq *&);
+      ProvidesDescriptionSeq_out (ProvidesDescriptionSeq_var &);
+      ProvidesDescriptionSeq_out (const ProvidesDescriptionSeq_out &);
+      ProvidesDescriptionSeq_out &operator= (const ProvidesDescriptionSeq_out &);
+      ProvidesDescriptionSeq_out &operator= (ProvidesDescriptionSeq *);
+      operator ProvidesDescriptionSeq *&();
+      ProvidesDescriptionSeq *&ptr (void);
+      ProvidesDescriptionSeq *operator-> (void);
+      ProvidesDescription & operator[] (CORBA::ULong index);
+    
+    private:
+      ProvidesDescriptionSeq *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const ProvidesDescriptionSeq_var &);
+    };
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProvidesDescriptionSeq;
+    
+    // TAO_IDL - Generated from 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
-    virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_
+    
+    class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (void);
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          UsesDescription *data,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (
+          const _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq &rhs
+        );
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq &operator= (
+          const _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (void);
+      
+      // = Accessors.
+      UsesDescription &operator[] (CORBA::ULong i);
+      const UsesDescription &operator[] (CORBA::ULong i) const;
+      
+      // = Static operations.
+      static UsesDescription *allocbuf (CORBA::ULong size);
+      static void freebuf (UsesDescription *buffer);
+      
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      UsesDescription *get_buffer (CORBA::Boolean orphan = 0);
+      const UsesDescription *get_buffer (void) const;
+      void replace (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          UsesDescription *data,
+          CORBA::Boolean release
+        );
+    };
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_)
+#define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void supported_interfaces (
-        CORBA::Object *_collocated_tao_target_,
-        const CORBA::InterfaceDefSeq & supported_interfaces
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
+    class UsesDescriptionSeq;
+    class UsesDescriptionSeq_var;
+    
+    // *************************************************************
+    // CORBA::ComponentIR::UsesDescriptionSeq
+    // *************************************************************
+    
+    class TAO_IFR_Client_Export UsesDescriptionSeq : 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_CORBA_ComponentIR_UsesDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+    TAO_Unbounded_Sequence<UsesDescription>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    {
+    public:
+      UsesDescriptionSeq (void);
+      UsesDescriptionSeq (CORBA::ULong max);
+      UsesDescriptionSeq (
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          UsesDescription *buffer, 
+          CORBA::Boolean release = 0
+        );
+      UsesDescriptionSeq (const UsesDescriptionSeq &);
+      ~UsesDescriptionSeq (void);
+      
+      static void _tao_any_destructor (void*);
+      
+      typedef UsesDescriptionSeq_var _var_type;
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ___VAR_CH_)
+#define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::ComponentDef_ptr base_component (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+    
+    // *************************************************************
+    // class CORBA::ComponentIR::UsesDescriptionSeq_var
+    // *************************************************************
+    
+    class TAO_IFR_Client_Export UsesDescriptionSeq_var
+    {
+    public:
+      UsesDescriptionSeq_var (void);
+      UsesDescriptionSeq_var (UsesDescriptionSeq *);
+      UsesDescriptionSeq_var (const UsesDescriptionSeq_var &);
+      ~UsesDescriptionSeq_var (void);
+      
+      UsesDescriptionSeq_var &operator= (UsesDescriptionSeq *);
+      UsesDescriptionSeq_var &operator= (const UsesDescriptionSeq_var &);
+      UsesDescriptionSeq *operator-> (void);
+      const UsesDescriptionSeq *operator-> (void) const;
+      
+      operator const UsesDescriptionSeq &() const;
+      operator UsesDescriptionSeq &();
+      operator UsesDescriptionSeq &() const;
+      
+      // Variable-size base types only.
+      operator UsesDescriptionSeq *&();
+      
+      UsesDescription & operator[] (CORBA::ULong index);
+      const UsesDescription & operator[] (CORBA::ULong index) const;
+      
+      // in, inout, out, _retn 
+      const UsesDescriptionSeq &in (void) const;
+      UsesDescriptionSeq &inout (void);
+      UsesDescriptionSeq *&out (void);
+      UsesDescriptionSeq *_retn (void);
+      UsesDescriptionSeq *ptr (void) const;
+    
+    private:
+      UsesDescriptionSeq *ptr_;
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ___OUT_CH_)
+#define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ___OUT_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::ProvidesDefSeq * provides_interfaces (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+    
+    class TAO_IFR_Client_Export UsesDescriptionSeq_out
+    {
+    public:
+      UsesDescriptionSeq_out (UsesDescriptionSeq *&);
+      UsesDescriptionSeq_out (UsesDescriptionSeq_var &);
+      UsesDescriptionSeq_out (const UsesDescriptionSeq_out &);
+      UsesDescriptionSeq_out &operator= (const UsesDescriptionSeq_out &);
+      UsesDescriptionSeq_out &operator= (UsesDescriptionSeq *);
+      operator UsesDescriptionSeq *&();
+      UsesDescriptionSeq *&ptr (void);
+      UsesDescriptionSeq *operator-> (void);
+      UsesDescription & operator[] (CORBA::ULong index);
+    
+    private:
+      UsesDescriptionSeq *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const UsesDescriptionSeq_var &);
+    };
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UsesDescriptionSeq;
+    
+    // TAO_IDL - Generated from 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
-    virtual ::IR::UsesDefSeq * uses_interfaces (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_
+    
+    class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (void);
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          EventPortDescription *data,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (
+          const _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq &rhs
+        );
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq &operator= (
+          const _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (void);
+      
+      // = Accessors.
+      EventPortDescription &operator[] (CORBA::ULong i);
+      const EventPortDescription &operator[] (CORBA::ULong i) const;
+      
+      // = Static operations.
+      static EventPortDescription *allocbuf (CORBA::ULong size);
+      static void freebuf (EventPortDescription *buffer);
+      
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      EventPortDescription *get_buffer (CORBA::Boolean orphan = 0);
+      const EventPortDescription *get_buffer (void) const;
+      void replace (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          EventPortDescription *data,
+          CORBA::Boolean release
+        );
+    };
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_)
+#define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::EmitsDefSeq * emits_events (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
+    class EventPortDescriptionSeq;
+    class EventPortDescriptionSeq_var;
+    
+    // *************************************************************
+    // CORBA::ComponentIR::EventPortDescriptionSeq
+    // *************************************************************
+    
+    class TAO_IFR_Client_Export EventPortDescriptionSeq : 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_CORBA_ComponentIR_EventPortDescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+    TAO_Unbounded_Sequence<EventPortDescription>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    {
+    public:
+      EventPortDescriptionSeq (void);
+      EventPortDescriptionSeq (CORBA::ULong max);
+      EventPortDescriptionSeq (
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          EventPortDescription *buffer, 
+          CORBA::Boolean release = 0
+        );
+      EventPortDescriptionSeq (const EventPortDescriptionSeq &);
+      ~EventPortDescriptionSeq (void);
+      
+      static void _tao_any_destructor (void*);
+      
+      typedef EventPortDescriptionSeq_var _var_type;
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ___VAR_CH_)
+#define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::PublishesDefSeq * publishes_events (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::ConsumesDefSeq * consumes_events (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual CORBA::Boolean is_basic (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::ProvidesDef_ptr create_provides (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::InterfaceDef_ptr interface_type
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::UsesDef_ptr create_uses (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::InterfaceDef_ptr interface_type,
-        CORBA::Boolean is_multiple
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::EmitsDef_ptr create_emits (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::ValueDef_ptr value
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::PublishesDef_ptr create_publishes (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::ValueDef_ptr value
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::ConsumesDef_ptr create_consumes (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::ValueDef_ptr value
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_ComponentDef_Proxy_Broker (void);
-    virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
-        ComponentDef *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_ComponentDef_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Broker
-    : public virtual _TAO_ComponentDef_Proxy_Broker
-  {
-  public:
-    _TAO_ComponentDef_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_ComponentDef_Remote_Proxy_Broker (void);
-
-    virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
-        ComponentDef *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_ComponentDef_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentDef;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
-  class ComponentDescription_var;
-
-  struct TAO_IFR_Client_Export ComponentDescription
-  {
-    typedef ComponentDescription_var _var_type;
-
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    TAO_String_Manager base_component;
-    IR::RepositoryIdSeq supports_interfaces;
-    IR::ProvidesDefSeq provides_interfaces;
-    IR::UsesDefSeq uses_interfaces;
-    CORBA::AttrDescriptionSeq attributes;
-    IR::EmitsDefSeq emits_events;
-    IR::PublishesDefSeq publishes_events;
-    IR::ConsumesDefSeq consumes_events;
-    CORBA::Boolean is_basic;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
-  class TAO_IFR_Client_Export ComponentDescription_var
-  {
-  public:
-    ComponentDescription_var (void);
-    ComponentDescription_var (ComponentDescription *);
-    ComponentDescription_var (const ComponentDescription_var &);
-    ~ComponentDescription_var (void);
-
-    ComponentDescription_var &operator= (ComponentDescription *);
-    ComponentDescription_var &operator= (const ComponentDescription_var &);
-    ComponentDescription *operator-> (void);
-    const ComponentDescription *operator-> (void) const;
-
-    operator const ComponentDescription &() const;
-    operator ComponentDescription &();
-    operator ComponentDescription &() const;
-
-    // Variable-size types only.
-    operator ComponentDescription *&();
-
-    // in, inout, out, _retn
-    const ComponentDescription &in (void) const;
-    ComponentDescription &inout (void);
-    ComponentDescription *&out (void);
-    ComponentDescription *_retn (void);
-    ComponentDescription *ptr (void) const;
-
-  private:
-    ComponentDescription *ptr_;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
-  class TAO_IFR_Client_Export ComponentDescription_out
-  {
-  public:
-    ComponentDescription_out (ComponentDescription *&);
-    ComponentDescription_out (ComponentDescription_var &);
-    ComponentDescription_out (const ComponentDescription_out &);
-    ComponentDescription_out &operator= (const ComponentDescription_out &);
-    ComponentDescription_out &operator= (ComponentDescription *);
-    operator ComponentDescription *&();
-    ComponentDescription *&ptr (void);
-    ComponentDescription *operator-> (void);
-
-  private:
-    ComponentDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ComponentDescription_var &);
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentDescription;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IR_PRIMARYKEYDEF___PTR_CH_)
-#define _IR_PRIMARYKEYDEF___PTR_CH_
-
-  class PrimaryKeyDef;
-  typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PRIMARYKEYDEF___VAR_CH_)
-#define _IR_PRIMARYKEYDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export PrimaryKeyDef_var : private TAO_Base_var
-  {
-  public:
-    PrimaryKeyDef_var (void); // default constructor
-    PrimaryKeyDef_var (PrimaryKeyDef_ptr p) : ptr_ (p) {}
-    PrimaryKeyDef_var (const PrimaryKeyDef_var &); // copy constructor
-    ~PrimaryKeyDef_var (void); // destructor
-
-    PrimaryKeyDef_var &operator= (PrimaryKeyDef_ptr);
-    PrimaryKeyDef_var &operator= (const PrimaryKeyDef_var &);
-    PrimaryKeyDef_ptr operator-> (void) const;
-
-    operator const PrimaryKeyDef_ptr &() const;
-    operator PrimaryKeyDef_ptr &();
-    // in, inout, out, _retn
-    PrimaryKeyDef_ptr in (void) const;
-    PrimaryKeyDef_ptr &inout (void);
-    PrimaryKeyDef_ptr &out (void);
-    PrimaryKeyDef_ptr _retn (void);
-    PrimaryKeyDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static PrimaryKeyDef_ptr tao_duplicate (PrimaryKeyDef_ptr);
-    static void tao_release (PrimaryKeyDef_ptr);
-    static PrimaryKeyDef_ptr tao_nil (void);
-    static PrimaryKeyDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    PrimaryKeyDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PrimaryKeyDef_var (const TAO_Base_var & rhs);
-    PrimaryKeyDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_PRIMARYKEYDEF___OUT_CH_)
-#define _IR_PRIMARYKEYDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export PrimaryKeyDef_out
-  {
-  public:
-    PrimaryKeyDef_out (PrimaryKeyDef_ptr &);
-    PrimaryKeyDef_out (PrimaryKeyDef_var &);
-    PrimaryKeyDef_out (const PrimaryKeyDef_out &);
-    PrimaryKeyDef_out &operator= (const PrimaryKeyDef_out &);
-    PrimaryKeyDef_out &operator= (const PrimaryKeyDef_var &);
-    PrimaryKeyDef_out &operator= (PrimaryKeyDef_ptr);
-    operator PrimaryKeyDef_ptr &();
-    PrimaryKeyDef_ptr &ptr (void);
-    PrimaryKeyDef_ptr operator-> (void);
-
-  private:
-    PrimaryKeyDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
-
-#if !defined (_IR_PRIMARYKEYDEF_CH_)
-#define _IR_PRIMARYKEYDEF_CH_
-
-  class _TAO_PrimaryKeyDef_Proxy_Impl;
-  class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
-  class _TAO_PrimaryKeyDef_Proxy_Broker;
-  class _TAO_PrimaryKeyDef_Remote_Proxy_Broker;
-
-  class TAO_IFR_Client_Export PrimaryKeyDef
-    : public virtual CORBA::Contained
-  {
-  public:
-    typedef PrimaryKeyDef_ptr _ptr_type;
-    typedef PrimaryKeyDef_var _var_type;
-    static int _tao_class_id;
-
-    // The static operations.
-    static PrimaryKeyDef_ptr _duplicate (PrimaryKeyDef_ptr obj);
-
-    static PrimaryKeyDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static PrimaryKeyDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static PrimaryKeyDef_ptr _nil (void)
-      {
-        return (PrimaryKeyDef_ptr)0;
-      }
-
-    static void _tao_any_destructor (void *);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+    
+    // *************************************************************
+    // class CORBA::ComponentIR::EventPortDescriptionSeq_var
+    // *************************************************************
+    
+    class TAO_IFR_Client_Export EventPortDescriptionSeq_var
+    {
+    public:
+      EventPortDescriptionSeq_var (void);
+      EventPortDescriptionSeq_var (EventPortDescriptionSeq *);
+      EventPortDescriptionSeq_var (const EventPortDescriptionSeq_var &);
+      ~EventPortDescriptionSeq_var (void);
+      
+      EventPortDescriptionSeq_var &operator= (EventPortDescriptionSeq *);
+      EventPortDescriptionSeq_var &operator= (const EventPortDescriptionSeq_var &);
+      EventPortDescriptionSeq *operator-> (void);
+      const EventPortDescriptionSeq *operator-> (void) const;
+      
+      operator const EventPortDescriptionSeq &() const;
+      operator EventPortDescriptionSeq &();
+      operator EventPortDescriptionSeq &() const;
+      
+      // Variable-size base types only.
+      operator EventPortDescriptionSeq *&();
+      
+      EventPortDescription & operator[] (CORBA::ULong index);
+      const EventPortDescription & operator[] (CORBA::ULong index) const;
+      
+      // in, inout, out, _retn 
+      const EventPortDescriptionSeq &in (void) const;
+      EventPortDescriptionSeq &inout (void);
+      EventPortDescriptionSeq *&out (void);
+      EventPortDescriptionSeq *_retn (void);
+      EventPortDescriptionSeq *ptr (void) const;
+    
+    private:
+      EventPortDescriptionSeq *ptr_;
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ___OUT_CH_)
+#define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ___OUT_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean is_a (
-        const char * primary_key_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+    
+    class TAO_IFR_Client_Export EventPortDescriptionSeq_out
+    {
+    public:
+      EventPortDescriptionSeq_out (EventPortDescriptionSeq *&);
+      EventPortDescriptionSeq_out (EventPortDescriptionSeq_var &);
+      EventPortDescriptionSeq_out (const EventPortDescriptionSeq_out &);
+      EventPortDescriptionSeq_out &operator= (const EventPortDescriptionSeq_out &);
+      EventPortDescriptionSeq_out &operator= (EventPortDescriptionSeq *);
+      operator EventPortDescriptionSeq *&();
+      EventPortDescriptionSeq *&ptr (void);
+      EventPortDescriptionSeq *operator-> (void);
+      EventPortDescription & operator[] (CORBA::ULong index);
+    
+    private:
+      EventPortDescriptionSeq *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const EventPortDescriptionSeq_var &);
+    };
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::ValueDef_ptr primary_key (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EventPortDescriptionSeq;
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-    virtual const char* _interface_repository_id (void) const;
-  private:
-    _TAO_PrimaryKeyDef_Proxy_Broker *the_TAO_PrimaryKeyDef_Proxy_Broker_;
-
-  protected:
-    PrimaryKeyDef (int collocated = 0);
-
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void IR_PrimaryKeyDef_setup_collocation (int collocated);
-
-    PrimaryKeyDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-      );
-    virtual ~PrimaryKeyDef (void);
-
-    friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
-    friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
-
-  private:
-    PrimaryKeyDef (const PrimaryKeyDef &);
-    void operator= (const PrimaryKeyDef &);
-  };
-
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Contained_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_PrimaryKeyDef_Proxy_Impl (void) {}
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    
+    class ComponentDescription_var;
+    
+    struct TAO_IFR_Client_Export ComponentDescription
+    {
+      typedef ComponentDescription_var _var_type;
+      
+      static void _tao_any_destructor (void *);
+      TAO_String_Manager name;
+      TAO_String_Manager id;
+      TAO_String_Manager defined_in;
+      TAO_String_Manager version;
+      TAO_String_Manager base_component;
+      CORBA::RepositoryIdSeq supported_interfaces;
+      CORBA::ComponentIR::ProvidesDescriptionSeq provided_interfaces;
+      CORBA::ComponentIR::UsesDescriptionSeq used_interfaces;
+      CORBA::ComponentIR::EventPortDescriptionSeq emits_events;
+      CORBA::ComponentIR::EventPortDescriptionSeq publishes_events;
+      CORBA::ComponentIR::EventPortDescriptionSeq consumes_events;
+      CORBA::ExtAttrDescriptionSeq attributes;
+      CORBA::TypeCode_var type;
+    };
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual CORBA::Boolean is_a (
-        CORBA::Object *_collocated_tao_target_,
-        const char * primary_key_id
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+    
+    class TAO_IFR_Client_Export ComponentDescription_var
+    {
+    public:
+      ComponentDescription_var (void);
+      ComponentDescription_var (ComponentDescription *);
+      ComponentDescription_var (const ComponentDescription_var &);
+      ~ComponentDescription_var (void);
+      
+      ComponentDescription_var &operator= (ComponentDescription *);
+      ComponentDescription_var &operator= (const ComponentDescription_var &);
+      ComponentDescription *operator-> (void);
+      const ComponentDescription *operator-> (void) const;
+      
+      operator const ComponentDescription &() const;
+      operator ComponentDescription &();
+      operator ComponentDescription &() const;
+      
+      // Variable-size types only.
+      operator ComponentDescription *&();
+      
+      // in, inout, out, _retn 
+      const ComponentDescription &in (void) const;
+      ComponentDescription &inout (void);
+      ComponentDescription *&out (void);
+      ComponentDescription *_retn (void);
+      ComponentDescription *ptr (void) const;
+    
+    private:
+      ComponentDescription *ptr_;
+    };
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::CORBA::ValueDef_ptr primary_key (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-  protected:
-    _TAO_PrimaryKeyDef_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Impl
-    : public virtual _TAO_PrimaryKeyDef_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual CORBA::_TAO_Contained_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_PrimaryKeyDef_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_PrimaryKeyDef_Remote_Proxy_Impl (void) {}
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+    
+    class TAO_IFR_Client_Export ComponentDescription_out
+    {
+    public:
+      ComponentDescription_out (ComponentDescription *&);
+      ComponentDescription_out (ComponentDescription_var &);
+      ComponentDescription_out (const ComponentDescription_out &);
+      ComponentDescription_out &operator= (const ComponentDescription_out &);
+      ComponentDescription_out &operator= (ComponentDescription *);
+      operator ComponentDescription *&();
+      ComponentDescription *&ptr (void);
+      ComponentDescription *operator-> (void);
+      
+    private:
+      ComponentDescription *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const ComponentDescription_var &);
+    };
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual CORBA::Boolean is_a (
-        CORBA::Object *_collocated_tao_target_,
-        const char * primary_key_id
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentDescription;
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::CORBA::ValueDef_ptr primary_key (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_PrimaryKeyDef_Proxy_Broker (void);
-    virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
-        PrimaryKeyDef *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_PrimaryKeyDef_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Broker
-    : public virtual _TAO_PrimaryKeyDef_Proxy_Broker
-  {
-  public:
-    _TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
-
-    virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
-        PrimaryKeyDef *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_PrimaryKeyDef_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_PrimaryKeyDef_Remote_Proxy_Broker *the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrimaryKeyDef;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
-  class PrimaryKeyDescription_var;
-
-  struct TAO_IFR_Client_Export PrimaryKeyDescription
-  {
-    typedef PrimaryKeyDescription_var _var_type;
-
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::ValueDef_var primary_key;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
-  class TAO_IFR_Client_Export PrimaryKeyDescription_var
-  {
-  public:
-    PrimaryKeyDescription_var (void);
-    PrimaryKeyDescription_var (PrimaryKeyDescription *);
-    PrimaryKeyDescription_var (const PrimaryKeyDescription_var &);
-    ~PrimaryKeyDescription_var (void);
-
-    PrimaryKeyDescription_var &operator= (PrimaryKeyDescription *);
-    PrimaryKeyDescription_var &operator= (const PrimaryKeyDescription_var &);
-    PrimaryKeyDescription *operator-> (void);
-    const PrimaryKeyDescription *operator-> (void) const;
-
-    operator const PrimaryKeyDescription &() const;
-    operator PrimaryKeyDescription &();
-    operator PrimaryKeyDescription &() const;
-
-    // Variable-size types only.
-    operator PrimaryKeyDescription *&();
-
-    // in, inout, out, _retn
-    const PrimaryKeyDescription &in (void) const;
-    PrimaryKeyDescription &inout (void);
-    PrimaryKeyDescription *&out (void);
-    PrimaryKeyDescription *_retn (void);
-    PrimaryKeyDescription *ptr (void) const;
-
-  private:
-    PrimaryKeyDescription *ptr_;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
-  class TAO_IFR_Client_Export PrimaryKeyDescription_out
-  {
-  public:
-    PrimaryKeyDescription_out (PrimaryKeyDescription *&);
-    PrimaryKeyDescription_out (PrimaryKeyDescription_var &);
-    PrimaryKeyDescription_out (const PrimaryKeyDescription_out &);
-    PrimaryKeyDescription_out &operator= (const PrimaryKeyDescription_out &);
-    PrimaryKeyDescription_out &operator= (PrimaryKeyDescription *);
-    operator PrimaryKeyDescription *&();
-    PrimaryKeyDescription *&ptr (void);
-    PrimaryKeyDescription *operator-> (void);
-
-  private:
-    PrimaryKeyDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const PrimaryKeyDescription_var &);
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrimaryKeyDescription;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IR_FACTORYDEF___PTR_CH_)
-#define _IR_FACTORYDEF___PTR_CH_
-
-  class FactoryDef;
-  typedef FactoryDef *FactoryDef_ptr;
-
-#endif /* end #if !defined */
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-#if !defined (_IR_FACTORYDEF___VAR_CH_)
-#define _IR_FACTORYDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export FactoryDef_var : private TAO_Base_var
-  {
-  public:
-    FactoryDef_var (void); // default constructor
-    FactoryDef_var (FactoryDef_ptr p) : ptr_ (p) {}
-    FactoryDef_var (const FactoryDef_var &); // copy constructor
-    ~FactoryDef_var (void); // destructor
-
-    FactoryDef_var &operator= (FactoryDef_ptr);
-    FactoryDef_var &operator= (const FactoryDef_var &);
-    FactoryDef_ptr operator-> (void) const;
-
-    operator const FactoryDef_ptr &() const;
-    operator FactoryDef_ptr &();
-    // in, inout, out, _retn
-    FactoryDef_ptr in (void) const;
-    FactoryDef_ptr &inout (void);
-    FactoryDef_ptr &out (void);
-    FactoryDef_ptr _retn (void);
-    FactoryDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static FactoryDef_ptr tao_duplicate (FactoryDef_ptr);
-    static void tao_release (FactoryDef_ptr);
-    static FactoryDef_ptr tao_nil (void);
-    static FactoryDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    FactoryDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    FactoryDef_var (const TAO_Base_var & rhs);
-    FactoryDef_var & operator= (const TAO_Base_var & rhs);
-  };
+#if !defined (_CORBA_COMPONENTIR_FACTORYDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_FACTORYDEF___PTR_CH_
+    
+    class FactoryDef;
+    typedef FactoryDef *FactoryDef_ptr;
 
 #endif /* end #if !defined */
 
-#if !defined (_IR_FACTORYDEF___OUT_CH_)
-#define _IR_FACTORYDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export FactoryDef_out
-  {
-  public:
-    FactoryDef_out (FactoryDef_ptr &);
-    FactoryDef_out (FactoryDef_var &);
-    FactoryDef_out (const FactoryDef_out &);
-    FactoryDef_out &operator= (const FactoryDef_out &);
-    FactoryDef_out &operator= (const FactoryDef_var &);
-    FactoryDef_out &operator= (FactoryDef_ptr);
-    operator FactoryDef_ptr &();
-    FactoryDef_ptr &ptr (void);
-    FactoryDef_ptr operator-> (void);
-
-  private:
-    FactoryDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
-
-#if !defined (_IR_FACTORYDEF_CH_)
-#define _IR_FACTORYDEF_CH_
-
-  class _TAO_FactoryDef_Proxy_Impl;
-  class _TAO_FactoryDef_Remote_Proxy_Impl;
-  class _TAO_FactoryDef_Proxy_Broker;
-  class _TAO_FactoryDef_Remote_Proxy_Broker;
-
-  class TAO_IFR_Client_Export FactoryDef
-    : public virtual CORBA::OperationDef
-  {
-  public:
-    typedef FactoryDef_ptr _ptr_type;
-    typedef FactoryDef_var _var_type;
-    static int _tao_class_id;
-
-    // The static operations.
-    static FactoryDef_ptr _duplicate (FactoryDef_ptr obj);
-
-    static FactoryDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static FactoryDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static FactoryDef_ptr _nil (void)
-      {
-        return (FactoryDef_ptr)0;
-      }
-
-    static void _tao_any_destructor (void *);
-
+#if !defined (_CORBA_COMPONENTIR_FACTORYDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_FACTORYDEF___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-    virtual const char* _interface_repository_id (void) const;
-  private:
-    _TAO_FactoryDef_Proxy_Broker *the_TAO_FactoryDef_Proxy_Broker_;
-
-  protected:
-    FactoryDef (int collocated = 0);
-
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void IR_FactoryDef_setup_collocation (int collocated);
-
-    FactoryDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-      );
-    virtual ~FactoryDef (void);
-
-    friend class _TAO_FactoryDef_Remote_Proxy_Impl;
-    friend class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_FactoryDef_Direct_Proxy_Impl;
-
-  private:
-    FactoryDef (const FactoryDef &);
-    void operator= (const FactoryDef &);
-  };
-
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Impl
-    : public virtual CORBA::_TAO_OperationDef_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_FactoryDef_Proxy_Impl (void) {}
-
-  protected:
-    _TAO_FactoryDef_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Impl
-    : public virtual _TAO_FactoryDef_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual CORBA::_TAO_OperationDef_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_FactoryDef_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_FactoryDef_Remote_Proxy_Impl (void) {}
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_FactoryDef_Proxy_Broker (void);
-    virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
-        FactoryDef *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_FactoryDef_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Broker
-    : public virtual _TAO_FactoryDef_Proxy_Broker
-  {
-  public:
-    _TAO_FactoryDef_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_FactoryDef_Remote_Proxy_Broker (void);
-
-    virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
-        FactoryDef *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_FactoryDef_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_FactoryDef_Remote_Proxy_Broker *the_TAO_FactoryDef_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FactoryDef;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IR_FINDERDEF___PTR_CH_)
-#define _IR_FINDERDEF___PTR_CH_
-
-  class FinderDef;
-  typedef FinderDef *FinderDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_FINDERDEF___VAR_CH_)
-#define _IR_FINDERDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export FinderDef_var : private TAO_Base_var
-  {
-  public:
-    FinderDef_var (void); // default constructor
-    FinderDef_var (FinderDef_ptr p) : ptr_ (p) {}
-    FinderDef_var (const FinderDef_var &); // copy constructor
-    ~FinderDef_var (void); // destructor
-
-    FinderDef_var &operator= (FinderDef_ptr);
-    FinderDef_var &operator= (const FinderDef_var &);
-    FinderDef_ptr operator-> (void) const;
-
-    operator const FinderDef_ptr &() const;
-    operator FinderDef_ptr &();
-    // in, inout, out, _retn
-    FinderDef_ptr in (void) const;
-    FinderDef_ptr &inout (void);
-    FinderDef_ptr &out (void);
-    FinderDef_ptr _retn (void);
-    FinderDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static FinderDef_ptr tao_duplicate (FinderDef_ptr);
-    static void tao_release (FinderDef_ptr);
-    static FinderDef_ptr tao_nil (void);
-    static FinderDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    FinderDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    FinderDef_var (const TAO_Base_var & rhs);
-    FinderDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_FINDERDEF___OUT_CH_)
-#define _IR_FINDERDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
-  class TAO_IFR_Client_Export FinderDef_out
-  {
-  public:
-    FinderDef_out (FinderDef_ptr &);
-    FinderDef_out (FinderDef_var &);
-    FinderDef_out (const FinderDef_out &);
-    FinderDef_out &operator= (const FinderDef_out &);
-    FinderDef_out &operator= (const FinderDef_var &);
-    FinderDef_out &operator= (FinderDef_ptr);
-    operator FinderDef_ptr &();
-    FinderDef_ptr &ptr (void);
-    FinderDef_ptr operator-> (void);
-
-  private:
-    FinderDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
-
-#if !defined (_IR_FINDERDEF_CH_)
-#define _IR_FINDERDEF_CH_
-
-  class _TAO_FinderDef_Proxy_Impl;
-  class _TAO_FinderDef_Remote_Proxy_Impl;
-  class _TAO_FinderDef_Proxy_Broker;
-  class _TAO_FinderDef_Remote_Proxy_Broker;
-
-  class TAO_IFR_Client_Export FinderDef
-    : public virtual CORBA::OperationDef
-  {
-  public:
-    typedef FinderDef_ptr _ptr_type;
-    typedef FinderDef_var _var_type;
-    static int _tao_class_id;
-
-    // The static operations.
-    static FinderDef_ptr _duplicate (FinderDef_ptr obj);
-
-    static FinderDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static FinderDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static FinderDef_ptr _nil (void)
-      {
-        return (FinderDef_ptr)0;
-      }
-
-    static void _tao_any_destructor (void *);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export FactoryDef_var : public TAO_Base_var
+    {
+    public:
+      FactoryDef_var (void); // default constructor
+      FactoryDef_var (FactoryDef_ptr p) : ptr_ (p) {} 
+      FactoryDef_var (const FactoryDef_var &); // copy constructor
+      ~FactoryDef_var (void); // destructor
+      
+      FactoryDef_var &operator= (FactoryDef_ptr);
+      FactoryDef_var &operator= (const FactoryDef_var &);
+      FactoryDef_ptr operator-> (void) const;
+      
+      operator const FactoryDef_ptr &() const;
+      operator FactoryDef_ptr &();
+      // in, inout, out, _retn 
+      FactoryDef_ptr in (void) const;
+      FactoryDef_ptr &inout (void);
+      FactoryDef_ptr &out (void);
+      FactoryDef_ptr _retn (void);
+      FactoryDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static FactoryDef_ptr tao_duplicate (FactoryDef_ptr);
+      static void tao_release (FactoryDef_ptr);
+      static FactoryDef_ptr tao_nil (void);
+      static FactoryDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      FactoryDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      FactoryDef_var (const TAO_Base_var &rhs);
+      FactoryDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_FACTORYDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_FACTORYDEF___OUT_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-    virtual const char* _interface_repository_id (void) const;
-  private:
-    _TAO_FinderDef_Proxy_Broker *the_TAO_FinderDef_Proxy_Broker_;
-
-  protected:
-    FinderDef (int collocated = 0);
-
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void IR_FinderDef_setup_collocation (int collocated);
-
-    FinderDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-      );
-    virtual ~FinderDef (void);
-
-    friend class _TAO_FinderDef_Remote_Proxy_Impl;
-    friend class _TAO_FinderDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_FinderDef_Direct_Proxy_Impl;
-
-  private:
-    FinderDef (const FinderDef &);
-    void operator= (const FinderDef &);
-  };
-
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Impl
-    : public virtual CORBA::_TAO_OperationDef_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_FinderDef_Proxy_Impl (void) {}
-
-  protected:
-    _TAO_FinderDef_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Impl
-    : public virtual _TAO_FinderDef_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual CORBA::_TAO_OperationDef_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_FinderDef_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_FinderDef_Remote_Proxy_Impl (void) {}
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_FinderDef_Proxy_Broker (void);
-    virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
-        FinderDef *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_FinderDef_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Broker
-    : public virtual _TAO_FinderDef_Proxy_Broker
-  {
-  public:
-    _TAO_FinderDef_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_FinderDef_Remote_Proxy_Broker (void);
-
-    virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
-        FinderDef *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_FinderDef_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FinderDef;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IR_HOMEDEF___PTR_CH_)
-#define _IR_HOMEDEF___PTR_CH_
-
-  class HomeDef;
-  typedef HomeDef *HomeDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_HOMEDEF___VAR_CH_)
-#define _IR_HOMEDEF___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export HomeDef_var : private TAO_Base_var
-  {
-  public:
-    HomeDef_var (void); // default constructor
-    HomeDef_var (HomeDef_ptr p) : ptr_ (p) {}
-    HomeDef_var (const HomeDef_var &); // copy constructor
-    ~HomeDef_var (void); // destructor
-
-    HomeDef_var &operator= (HomeDef_ptr);
-    HomeDef_var &operator= (const HomeDef_var &);
-    HomeDef_ptr operator-> (void) const;
-
-    operator const HomeDef_ptr &() const;
-    operator HomeDef_ptr &();
-    // in, inout, out, _retn
-    HomeDef_ptr in (void) const;
-    HomeDef_ptr &inout (void);
-    HomeDef_ptr &out (void);
-    HomeDef_ptr _retn (void);
-    HomeDef_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static HomeDef_ptr tao_duplicate (HomeDef_ptr);
-    static void tao_release (HomeDef_ptr);
-    static HomeDef_ptr tao_nil (void);
-    static HomeDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    HomeDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    HomeDef_var (const TAO_Base_var & rhs);
-    HomeDef_var & operator= (const TAO_Base_var & rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IR_HOMEDEF___OUT_CH_)
-#define _IR_HOMEDEF___OUT_CH_
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export FactoryDef_out
+    {
+    public:
+      FactoryDef_out (FactoryDef_ptr &);
+      FactoryDef_out (FactoryDef_var &);
+      FactoryDef_out (const FactoryDef_out &);
+      FactoryDef_out &operator= (const FactoryDef_out &);
+      FactoryDef_out &operator= (const FactoryDef_var &);
+      FactoryDef_out &operator= (FactoryDef_ptr);
+      operator FactoryDef_ptr &();
+      FactoryDef_ptr &ptr (void);
+      FactoryDef_ptr operator-> (void);
+    
+    private:
+      FactoryDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_FACTORYDEF_CH_)
+#define _CORBA_COMPONENTIR_FACTORYDEF_CH_
+    
+    class _TAO_FactoryDef_Proxy_Impl;
+    class _TAO_FactoryDef_Remote_Proxy_Impl;
+    class _TAO_FactoryDef_Proxy_Broker;
+    class _TAO_FactoryDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export FactoryDef
+      : public virtual CORBA::OperationDef
+    {
+    public:
+      typedef FactoryDef_ptr _ptr_type;
+      typedef FactoryDef_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static FactoryDef_ptr _duplicate (FactoryDef_ptr obj);
+      
+      static FactoryDef_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static FactoryDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static FactoryDef_ptr _nil (void)
+        {
+          return (FactoryDef_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
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_FactoryDef_Proxy_Broker *the_TAO_FactoryDef_Proxy_Broker_;
+    
+    protected:
+      FactoryDef (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_FactoryDef_setup_collocation (int collocated);
+      
+      FactoryDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~FactoryDef (void);
+      
+      friend class _TAO_FactoryDef_Remote_Proxy_Impl;
+      friend class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_FactoryDef_Direct_Proxy_Impl;
+    
+    private:
+      FactoryDef (const FactoryDef &);
+      void operator= (const FactoryDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Impl
+      : public virtual CORBA::_TAO_OperationDef_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_FactoryDef_Proxy_Impl (void) {}
+    
+    protected:
+      _TAO_FactoryDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Impl
+      : public virtual _TAO_FactoryDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::_TAO_OperationDef_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_FactoryDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_FactoryDef_Remote_Proxy_Impl (void) {}
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_FactoryDef_Proxy_Broker (void);
+      virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
+          FactoryDef *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_FactoryDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Broker
+      : public virtual _TAO_FactoryDef_Proxy_Broker
+    {
+    public: 
+      _TAO_FactoryDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_FactoryDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
+          FactoryDef *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_FactoryDef_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_FactoryDef_Remote_Proxy_Broker *the_TAO_FactoryDef_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
+    // 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_FactoryDef;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
-  class TAO_IFR_Client_Export HomeDef_out
-  {
-  public:
-    HomeDef_out (HomeDef_ptr &);
-    HomeDef_out (HomeDef_var &);
-    HomeDef_out (const HomeDef_out &);
-    HomeDef_out &operator= (const HomeDef_out &);
-    HomeDef_out &operator= (const HomeDef_var &);
-    HomeDef_out &operator= (HomeDef_ptr);
-    operator HomeDef_ptr &();
-    HomeDef_ptr &ptr (void);
-    HomeDef_ptr operator-> (void);
-
-  private:
-    HomeDef_ptr &ptr_;
-  };
+#if !defined (_CORBA_COMPONENTIR_FINDERDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_FINDERDEF___PTR_CH_
+    
+    class FinderDef;
+    typedef FinderDef *FinderDef_ptr;
 
 #endif /* end #if !defined */
 
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
-
-#if !defined (_IR_HOMEDEF_CH_)
-#define _IR_HOMEDEF_CH_
-
-  class _TAO_HomeDef_Proxy_Impl;
-  class _TAO_HomeDef_Remote_Proxy_Impl;
-  class _TAO_HomeDef_Proxy_Broker;
-  class _TAO_HomeDef_Remote_Proxy_Broker;
-
-  class TAO_IFR_Client_Export HomeDef
-    : public virtual CORBA::InterfaceDef
-  {
-  public:
-    typedef HomeDef_ptr _ptr_type;
-    typedef HomeDef_var _var_type;
-    static int _tao_class_id;
-
-    // The static operations.
-    static HomeDef_ptr _duplicate (HomeDef_ptr obj);
-
-    static HomeDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static HomeDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static HomeDef_ptr _nil (void)
-      {
-        return (HomeDef_ptr)0;
-      }
-
-    static void _tao_any_destructor (void *);
-
+#if !defined (_CORBA_COMPONENTIR_FINDERDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_FINDERDEF___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::HomeDef_ptr base_home (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export FinderDef_var : public TAO_Base_var
+    {
+    public:
+      FinderDef_var (void); // default constructor
+      FinderDef_var (FinderDef_ptr p) : ptr_ (p) {} 
+      FinderDef_var (const FinderDef_var &); // copy constructor
+      ~FinderDef_var (void); // destructor
+      
+      FinderDef_var &operator= (FinderDef_ptr);
+      FinderDef_var &operator= (const FinderDef_var &);
+      FinderDef_ptr operator-> (void) const;
+      
+      operator const FinderDef_ptr &() const;
+      operator FinderDef_ptr &();
+      // in, inout, out, _retn 
+      FinderDef_ptr in (void) const;
+      FinderDef_ptr &inout (void);
+      FinderDef_ptr &out (void);
+      FinderDef_ptr _retn (void);
+      FinderDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static FinderDef_ptr tao_duplicate (FinderDef_ptr);
+      static void tao_release (FinderDef_ptr);
+      static FinderDef_ptr tao_nil (void);
+      static FinderDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      FinderDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      FinderDef_var (const TAO_Base_var &rhs);
+      FinderDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_FINDERDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_FINDERDEF___OUT_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::ComponentDef_ptr managed_component (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::PrimaryKeyDef_ptr primary_key (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export FinderDef_out
+    {
+    public:
+      FinderDef_out (FinderDef_ptr &);
+      FinderDef_out (FinderDef_var &);
+      FinderDef_out (const FinderDef_out &);
+      FinderDef_out &operator= (const FinderDef_out &);
+      FinderDef_out &operator= (const FinderDef_var &);
+      FinderDef_out &operator= (FinderDef_ptr);
+      operator FinderDef_ptr &();
+      FinderDef_ptr &ptr (void);
+      FinderDef_ptr operator-> (void);
+    
+    private:
+      FinderDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::FactoryDefSeq * factories (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_FINDERDEF_CH_)
+#define _CORBA_COMPONENTIR_FINDERDEF_CH_
+    
+    class _TAO_FinderDef_Proxy_Impl;
+    class _TAO_FinderDef_Remote_Proxy_Impl;
+    class _TAO_FinderDef_Proxy_Broker;
+    class _TAO_FinderDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export FinderDef
+      : public virtual CORBA::OperationDef
+    {
+    public:
+      typedef FinderDef_ptr _ptr_type;
+      typedef FinderDef_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static FinderDef_ptr _duplicate (FinderDef_ptr obj);
+      
+      static FinderDef_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static FinderDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static FinderDef_ptr _nil (void)
+        {
+          return (FinderDef_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
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_FinderDef_Proxy_Broker *the_TAO_FinderDef_Proxy_Broker_;
+    
+    protected:
+      FinderDef (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_FinderDef_setup_collocation (int collocated);
+      
+      FinderDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~FinderDef (void);
+      
+      friend class _TAO_FinderDef_Remote_Proxy_Impl;
+      friend class _TAO_FinderDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_FinderDef_Direct_Proxy_Impl;
+    
+    private:
+      FinderDef (const FinderDef &);
+      void operator= (const FinderDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::FinderDefSeq * finders (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Impl
+      : public virtual CORBA::_TAO_OperationDef_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_FinderDef_Proxy_Impl (void) {}
+    
+    protected:
+      _TAO_FinderDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean is_basic (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Impl
+      : public virtual _TAO_FinderDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::_TAO_OperationDef_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_FinderDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_FinderDef_Remote_Proxy_Impl (void) {}
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::PrimaryKeyDef_ptr create_primary_key (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::ValueDef_ptr primary_key
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_FinderDef_Proxy_Broker (void);
+      virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
+          FinderDef *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_FinderDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::FactoryDef_ptr create_factory (
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Broker
+      : public virtual _TAO_FinderDef_Proxy_Broker
+    {
+    public: 
+      _TAO_FinderDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_FinderDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
+          FinderDef *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_FinderDef_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::IR::FinderDef_ptr create_finder (
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FinderDef;
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-    virtual const char* _interface_repository_id (void) const;
-  private:
-    _TAO_HomeDef_Proxy_Broker *the_TAO_HomeDef_Proxy_Broker_;
-
-  protected:
-    HomeDef (int collocated = 0);
-
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void IR_HomeDef_setup_collocation (int collocated);
-
-    HomeDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-      );
-    virtual ~HomeDef (void);
-
-    friend class _TAO_HomeDef_Remote_Proxy_Impl;
-    friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_HomeDef_Direct_Proxy_Impl;
-
-  private:
-    HomeDef (const HomeDef &);
-    void operator= (const HomeDef &);
-  };
-
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF___PTR_CH_)
+#define _CORBA_COMPONENTIR_HOMEDEF___PTR_CH_
+    
+    class HomeDef;
+    typedef HomeDef *HomeDef_ptr;
 
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Impl
-    : public virtual CORBA::_TAO_InterfaceDef_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_HomeDef_Proxy_Impl (void) {}
+#endif /* end #if !defined */
 
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF___VAR_CH_)
+#define _CORBA_COMPONENTIR_HOMEDEF___VAR_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::HomeDef_ptr base_home (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::ComponentDef_ptr managed_component (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    
+    class TAO_IFR_Client_Export HomeDef_var : public TAO_Base_var
+    {
+    public:
+      HomeDef_var (void); // default constructor
+      HomeDef_var (HomeDef_ptr p) : ptr_ (p) {} 
+      HomeDef_var (const HomeDef_var &); // copy constructor
+      ~HomeDef_var (void); // destructor
+      
+      HomeDef_var &operator= (HomeDef_ptr);
+      HomeDef_var &operator= (const HomeDef_var &);
+      HomeDef_ptr operator-> (void) const;
+      
+      operator const HomeDef_ptr &() const;
+      operator HomeDef_ptr &();
+      // in, inout, out, _retn 
+      HomeDef_ptr in (void) const;
+      HomeDef_ptr &inout (void);
+      HomeDef_ptr &out (void);
+      HomeDef_ptr _retn (void);
+      HomeDef_ptr ptr (void) const;
+      
+      // Hooks used by template sequence and object manager classes
+      // for non-defined forward declared interfaces.
+      static HomeDef_ptr tao_duplicate (HomeDef_ptr);
+      static void tao_release (HomeDef_ptr);
+      static HomeDef_ptr tao_nil (void);
+      static HomeDef_ptr tao_narrow (
+          CORBA::Object *
+          ACE_ENV_ARG_DECL_NOT_USED
+        );
+      static CORBA::Object * tao_upcast (void *);
+    
+    private:
+      HomeDef_ptr ptr_;
+      // Unimplemented - prevents widening assignment.
+      HomeDef_var (const TAO_Base_var &rhs);
+      HomeDef_var &operator= (const TAO_Base_var &rhs);
+    };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF___OUT_CH_)
+#define _CORBA_COMPONENTIR_HOMEDEF___OUT_CH_
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::PrimaryKeyDef_ptr primary_key (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+    
+    class TAO_IFR_Client_Export HomeDef_out
+    {
+    public:
+      HomeDef_out (HomeDef_ptr &);
+      HomeDef_out (HomeDef_var &);
+      HomeDef_out (const HomeDef_out &);
+      HomeDef_out &operator= (const HomeDef_out &);
+      HomeDef_out &operator= (const HomeDef_var &);
+      HomeDef_out &operator= (HomeDef_ptr);
+      operator HomeDef_ptr &();
+      HomeDef_ptr &ptr (void);
+      HomeDef_ptr operator-> (void);
+    
+    private:
+      HomeDef_ptr &ptr_;
+    };
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::FactoryDefSeq * factories (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF_CH_)
+#define _CORBA_COMPONENTIR_HOMEDEF_CH_
+    
+    class _TAO_HomeDef_Proxy_Impl;
+    class _TAO_HomeDef_Remote_Proxy_Impl;
+    class _TAO_HomeDef_Proxy_Broker;
+    class _TAO_HomeDef_Remote_Proxy_Broker;
+    
+    class TAO_IFR_Client_Export HomeDef
+      : public virtual CORBA::ExtInterfaceDef
+    {
+    public:
+      typedef HomeDef_ptr _ptr_type;
+      typedef HomeDef_var _var_type;
+      static int _tao_class_id;
+      
+      // The static operations.
+      static HomeDef_ptr _duplicate (HomeDef_ptr obj);
+      
+      static HomeDef_ptr _narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static HomeDef_ptr _unchecked_narrow (
+          CORBA::Object_ptr obj
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      static HomeDef_ptr _nil (void)
+        {
+          return (HomeDef_ptr)0;
+        }
+      
+      static void _tao_any_destructor (void *);
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::HomeDef_ptr base_home (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual void base_home (
+          CORBA::ComponentIR::HomeDef_ptr base_home
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual void supported_interfaces (
+          const CORBA::InterfaceDefSeq & supported_interfaces
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual void managed_component (
+          CORBA::ComponentIR::ComponentDef_ptr managed_component
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ValueDef_ptr primary_key (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual void primary_key (
+          CORBA::ValueDef_ptr primary_key
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::FactoryDef_ptr create_factory (
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA::ParDescriptionSeq & params,
+          const CORBA::ExceptionDefSeq & exceptions
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+      
+      virtual ::CORBA::ComponentIR::FinderDef_ptr create_finder (
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA::ParDescriptionSeq & params,
+          const CORBA::ExceptionDefSeq & exceptions
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      
+      virtual CORBA::Boolean _is_a (
+          const char *type_id
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        );
+      
+      virtual void *_tao_QueryInterface (ptr_arith_t type);
+      
+      virtual const char* _interface_repository_id (void) const;
+      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    private:
+      _TAO_HomeDef_Proxy_Broker *the_TAO_HomeDef_Proxy_Broker_;
+    
+    protected:
+      HomeDef (int collocated = 0);
+      
+      // These methods travese the inheritance tree and set the
+      // parents piece of the given class in the right mode.
+      virtual void CORBA_ComponentIR_HomeDef_setup_collocation (int collocated);
+      
+      HomeDef (
+          TAO_Stub *objref, 
+          CORBA::Boolean _tao_collocated = 0,
+          TAO_Abstract_ServantBase *servant = 0
+        );
+      virtual ~HomeDef (void);
+      
+      friend class _TAO_HomeDef_Remote_Proxy_Impl;
+      friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+      friend class _TAO_HomeDef_Direct_Proxy_Impl;
+    
+    private:
+      HomeDef (const HomeDef &);
+      void operator= (const HomeDef &);
+    };
+    
+    // The Proxy Implementations are used by each interface to
+    // perform a call. Each different implementation encapsulates
+    // an invocation logic.
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                    Base Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::FinderDefSeq * finders (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Impl
+      : public virtual CORBA::_TAO_ExtInterfaceDef_Proxy_Impl
+    {
+    public:
+      virtual ~_TAO_HomeDef_Proxy_Impl (void) {}
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::HomeDef_ptr base_home (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual void base_home (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::ComponentIR::HomeDef_ptr base_home
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual void supported_interfaces (
+          CORBA::Object *_collocated_tao_target_,
+          const CORBA::InterfaceDefSeq & supported_interfaces
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual void managed_component (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::ComponentIR::ComponentDef_ptr managed_component
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ValueDef_ptr primary_key (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual void primary_key (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::ValueDef_ptr primary_key
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::FactoryDef_ptr create_factory (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA::ParDescriptionSeq & params,
+          const CORBA::ExceptionDefSeq & exceptions
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+      
+      virtual ::CORBA::ComponentIR::FinderDef_ptr create_finder (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA::ParDescriptionSeq & params,
+          const CORBA::ExceptionDefSeq & exceptions
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        )) = 0;
+    
+    protected:
+      _TAO_HomeDef_Proxy_Impl (void);
+    };
+    
+    //
+    //               End Base Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                Remote Proxy Impl. Declaration
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual CORBA::Boolean is_basic (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+    
+    class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Impl
+      : public virtual _TAO_HomeDef_Proxy_Impl,
+        public virtual TAO_Remote_Object_Proxy_Impl,
+        public virtual CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Impl
+    {
+    public:
+      _TAO_HomeDef_Remote_Proxy_Impl (void);
+      
+      virtual ~_TAO_HomeDef_Remote_Proxy_Impl (void) {}
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::HomeDef_ptr base_home (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual void base_home (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::ComponentIR::HomeDef_ptr base_home
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual void supported_interfaces (
+          CORBA::Object *_collocated_tao_target_,
+          const CORBA::InterfaceDefSeq & supported_interfaces
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual void managed_component (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::ComponentIR::ComponentDef_ptr managed_component
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ValueDef_ptr primary_key (
+          CORBA::Object *_collocated_tao_target_
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual void primary_key (
+          CORBA::Object *_collocated_tao_target_,
+          CORBA::ValueDef_ptr primary_key
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::FactoryDef_ptr create_factory (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA::ParDescriptionSeq & params,
+          const CORBA::ExceptionDefSeq & exceptions
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+      
+      virtual ::CORBA::ComponentIR::FinderDef_ptr create_finder (
+          CORBA::Object *_collocated_tao_target_,
+          const char * id,
+          const char * name,
+          const char * version,
+          const CORBA::ParDescriptionSeq & params,
+          const CORBA::ExceptionDefSeq & exceptions
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((
+          CORBA::SystemException
+        ));
+    };
+    
+    //
+    //             End Remote Proxy Impl. Declaration
+    ///////////////////////////////////////////////////////////////////////
+    
+    // The Proxy Brokers are used by each interface to get
+    // the right proxy for performing a call. In the new 
+    // collocation scheme, the proxy to be used can vary on
+    // a call by call basis.
+    
+    ///////////////////////////////////////////////////////////////////////
+    //                 Base Proxy Broker Declaration 
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::PrimaryKeyDef_ptr create_primary_key (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::ValueDef_ptr primary_key
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+    
+    class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Broker
+    {
+    public:
+      virtual ~_TAO_HomeDef_Proxy_Broker (void);
+      virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
+          HomeDef *object
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        ) = 0;
+      
+    protected:
+      _TAO_HomeDef_Proxy_Broker (void);
+      
+    };
+    
+    //
+    //              End Base Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+    
+        
+    ///////////////////////////////////////////////////////////////////////
+    //                 Remote Proxy Broker Declaration 
+    //
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::FactoryDef_ptr create_factory (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+    
+    class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Broker
+      : public virtual _TAO_HomeDef_Proxy_Broker
+    {
+    public: 
+      _TAO_HomeDef_Remote_Proxy_Broker (void);
+      
+      virtual ~_TAO_HomeDef_Remote_Proxy_Broker (void);
+      
+      virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
+          HomeDef *object
+          ACE_ENV_ARG_DECL
+        );
+      
+    private:
+      _TAO_HomeDef_Remote_Proxy_Impl remote_proxy_impl_;
+    
+    public:
+      // This member function is used to get an handle to the unique instance
+      // of the Remote Proxy Broker that is available for a given
+      // interface.
+      static _TAO_HomeDef_Remote_Proxy_Broker *the_TAO_HomeDef_Remote_Proxy_Broker (void);
+    };
+    
+    //
+    //              End Remote Proxy Broker Declaration 
+    ///////////////////////////////////////////////////////////////////////
+
+#endif /* end #if !defined */
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual ::IR::FinderDef_ptr create_finder (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-  protected:
-    _TAO_HomeDef_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Impl
-    : public virtual _TAO_HomeDef_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_HomeDef_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_HomeDef_Remote_Proxy_Impl (void) {}
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_HomeDef;
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::HomeDef_ptr base_home (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::ComponentDef_ptr managed_component (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::PrimaryKeyDef_ptr primary_key (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::FactoryDefSeq * factories (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::FinderDefSeq * finders (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual CORBA::Boolean is_basic (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::PrimaryKeyDef_ptr create_primary_key (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::ValueDef_ptr primary_key
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::FactoryDef_ptr create_factory (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    
+    class HomeDescription_var;
+    
+    struct TAO_IFR_Client_Export HomeDescription
+    {
+      typedef HomeDescription_var _var_type;
+      
+      static void _tao_any_destructor (void *);
+      TAO_String_Manager name;
+      TAO_String_Manager id;
+      TAO_String_Manager defined_in;
+      TAO_String_Manager version;
+      TAO_String_Manager base_home;
+      TAO_String_Manager managed_component;
+      CORBA::ValueDescription primary_key;
+      CORBA::OpDescriptionSeq factories;
+      CORBA::OpDescriptionSeq finders;
+      CORBA::OpDescriptionSeq operations;
+      CORBA::ExtAttrDescriptionSeq attributes;
+      CORBA::TypeCode_var type;
+    };
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual ::IR::FinderDef_ptr create_finder (
-        CORBA::Object *_collocated_tao_target_,
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_HomeDef_Proxy_Broker (void);
-    virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
-        HomeDef *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_HomeDef_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Broker
-    : public virtual _TAO_HomeDef_Proxy_Broker
-  {
-  public:
-    _TAO_HomeDef_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_HomeDef_Remote_Proxy_Broker (void);
-
-    virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
-        HomeDef *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_HomeDef_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_HomeDef_Remote_Proxy_Broker *the_TAO_HomeDef_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_HomeDef;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
-  class HomeDescription_var;
-
-  struct TAO_IFR_Client_Export HomeDescription
-  {
-    typedef HomeDescription_var _var_type;
-
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    TAO_String_Manager base_home;
-    TAO_String_Manager managed_component;
-    IR::PrimaryKeyDef_var primary_key_def;
-    IR::FactoryDefSeq factories;
-    IR::FinderDefSeq finders;
-    CORBA::OpDescriptionSeq operations;
-    CORBA::AttrDescriptionSeq attributes;
-    CORBA::Boolean is_basic;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
-  class TAO_IFR_Client_Export HomeDescription_var
-  {
-  public:
-    HomeDescription_var (void);
-    HomeDescription_var (HomeDescription *);
-    HomeDescription_var (const HomeDescription_var &);
-    ~HomeDescription_var (void);
-
-    HomeDescription_var &operator= (HomeDescription *);
-    HomeDescription_var &operator= (const HomeDescription_var &);
-    HomeDescription *operator-> (void);
-    const HomeDescription *operator-> (void) const;
-
-    operator const HomeDescription &() const;
-    operator HomeDescription &();
-    operator HomeDescription &() const;
-
-    // Variable-size types only.
-    operator HomeDescription *&();
-
-    // in, inout, out, _retn
-    const HomeDescription &in (void) const;
-    HomeDescription &inout (void);
-    HomeDescription *&out (void);
-    HomeDescription *_retn (void);
-    HomeDescription *ptr (void) const;
-
-  private:
-    HomeDescription *ptr_;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
-  class TAO_IFR_Client_Export HomeDescription_out
-  {
-  public:
-    HomeDescription_out (HomeDescription *&);
-    HomeDescription_out (HomeDescription_var &);
-    HomeDescription_out (const HomeDescription_out &);
-    HomeDescription_out &operator= (const HomeDescription_out &);
-    HomeDescription_out &operator= (HomeDescription *);
-    operator HomeDescription *&();
-    HomeDescription *&ptr (void);
-    HomeDescription *operator-> (void);
-
-  private:
-    HomeDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const HomeDescription_var &);
-  };
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+    
+    class TAO_IFR_Client_Export HomeDescription_var
+    {
+    public:
+      HomeDescription_var (void);
+      HomeDescription_var (HomeDescription *);
+      HomeDescription_var (const HomeDescription_var &);
+      ~HomeDescription_var (void);
+      
+      HomeDescription_var &operator= (HomeDescription *);
+      HomeDescription_var &operator= (const HomeDescription_var &);
+      HomeDescription *operator-> (void);
+      const HomeDescription *operator-> (void) const;
+      
+      operator const HomeDescription &() const;
+      operator HomeDescription &();
+      operator HomeDescription &() const;
+      
+      // Variable-size types only.
+      operator HomeDescription *&();
+      
+      // in, inout, out, _retn 
+      const HomeDescription &in (void) const;
+      HomeDescription &inout (void);
+      HomeDescription *&out (void);
+      HomeDescription *_retn (void);
+      HomeDescription *ptr (void) const;
+    
+    private:
+      HomeDescription *ptr_;
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+    
+    class TAO_IFR_Client_Export HomeDescription_out
+    {
+    public:
+      HomeDescription_out (HomeDescription *&);
+      HomeDescription_out (HomeDescription_var &);
+      HomeDescription_out (const HomeDescription_out &);
+      HomeDescription_out &operator= (const HomeDescription_out &);
+      HomeDescription_out &operator= (HomeDescription *);
+      operator HomeDescription *&();
+      HomeDescription *&ptr (void);
+      HomeDescription *operator-> (void);
+      
+    private:
+      HomeDescription *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const HomeDescription_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_HomeDescription;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_HomeDescription;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+  
+  }
+TAO_NAMESPACE_CLOSE // module CORBA::ComponentIR
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
-TAO_NAMESPACE_CLOSE // module IR
+TAO_NAMESPACE_CLOSE // module CORBA
 
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80
 
 extern TAO_IFR_Client_Export
-IR::_TAO_ComponentRepository_Proxy_Broker *
-(*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_EventDef_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_IFR_Client_Export
-IR::_TAO_ProvidesDef_Proxy_Broker *
-(*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_Container_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_IFR_Client_Export
-IR::_TAO_UsesDef_Proxy_Broker *
-(*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_ModuleDef_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_IFR_Client_Export
-IR::_TAO_EventDef_Proxy_Broker *
-(*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_Repository_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_IFR_Client_Export
-IR::_TAO_EmitsDef_Proxy_Broker *
-(*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_ProvidesDef_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_IFR_Client_Export
-IR::_TAO_PublishesDef_Proxy_Broker *
-(*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_UsesDef_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_IFR_Client_Export
-IR::_TAO_ConsumesDef_Proxy_Broker *
-(*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_EventPortDef_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_IFR_Client_Export
-IR::_TAO_ComponentDef_Proxy_Broker *
-(*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_EmitsDef_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_IFR_Client_Export
-IR::_TAO_PrimaryKeyDef_Proxy_Broker *
-(*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_PublishesDef_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_IFR_Client_Export
-IR::_TAO_FactoryDef_Proxy_Broker *
-(*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_ConsumesDef_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_IFR_Client_Export
-IR::_TAO_FinderDef_Proxy_Broker *
-(*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_ComponentDef_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_IFR_Client_Export
-IR::_TAO_HomeDef_Proxy_Broker *
-(*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
+CORBA::ComponentIR::_TAO_FactoryDef_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_ch.cpp:51
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::DefinitionKind);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::DefinitionKind &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::RepositoryIdSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::RepositoryIdSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::RepositoryIdSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::RepositoryIdSeq *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ComponentDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ComponentDefSeq *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDefSeq *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+extern TAO_IFR_Client_Export
+CORBA::ComponentIR::_TAO_FinderDef_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDefSeq *&);
+extern TAO_IFR_Client_Export
+CORBA::ComponentIR::_TAO_HomeDef_Proxy_Broker *
+(*CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::HomeDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::HomeDefSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EventDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::EmitsDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EmitsDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EmitsDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EmitsDefSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::Container_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::Container_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::Container_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::PublishesDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PublishesDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PublishesDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::PublishesDefSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ModuleDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ModuleDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ModuleDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ConsumesDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConsumesDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConsumesDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ConsumesDefSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::Repository_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::Repository_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::Repository_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::FactoryDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FactoryDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FactoryDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::FactoryDefSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ProvidesDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ProvidesDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ProvidesDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::FinderDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FinderDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FinderDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::FinderDefSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::ProvidesDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ProvidesDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ProvidesDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::ProvidesDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentRepository_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentRepository_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentRepository_ptr &);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::UsesDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::UsesDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::UsesDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDef_ptr &);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::UsesDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::UsesDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::UsesDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::UsesDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDescription *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventPortDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventPortDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EventPortDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDef_ptr &);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::EventPortDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventPortDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EventPortDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::EventPortDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDescription *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EmitsDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EmitsDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EmitsDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDescSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDescSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::PublishesDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::PublishesDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::PublishesDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDescSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDescSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDescSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ConsumesDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ConsumesDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ConsumesDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDef_ptr &);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ComponentDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ComponentDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ComponentDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::EventDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EventDescription *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::ProvidesDescriptionSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ProvidesDescriptionSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ProvidesDescriptionSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::ProvidesDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EmitsDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EmitsDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EmitsDef_ptr &);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::UsesDescriptionSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::UsesDescriptionSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::UsesDescriptionSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::UsesDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PublishesDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PublishesDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PublishesDef_ptr &);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::EventPortDescriptionSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventPortDescriptionSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EventPortDescriptionSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::EventPortDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConsumesDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConsumesDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConsumesDef_ptr &);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::ComponentDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ComponentDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ComponentDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::ComponentDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDef_ptr &);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::FactoryDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::FactoryDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::FactoryDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ComponentDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ComponentDescription *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::FinderDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::FinderDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::FinderDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDef_ptr &);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::HomeDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::HomeDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::HomeDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::PrimaryKeyDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::PrimaryKeyDescription *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::HomeDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::HomeDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::HomeDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::HomeDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FactoryDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FactoryDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FactoryDef_ptr &);
+#ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FinderDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FinderDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FinderDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::EventDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::EventDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::Container_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::Container_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::HomeDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::HomeDescription *&);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::ModuleDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::ModuleDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-#ifndef __ACE_INLINE__
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::Repository_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::Repository_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ch.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::DefinitionKind &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::DefinitionKind &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::ProvidesDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::ProvidesDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
-#if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_H_
-#define _TAO_CDR_OP_IR_RepositoryIdSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::RepositoryIdSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::RepositoryIdSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_RepositoryIdSeq_H_ */
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::ProvidesDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::ProvidesDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
-
-#if !defined _TAO_CDR_OP_IR_ComponentDefSeq_H_
-#define _TAO_CDR_OP_IR_ComponentDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::ComponentDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::ComponentDefSeq &
-  );
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-#endif /* _TAO_CDR_OP_IR_ComponentDefSeq_H_ */
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::UsesDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::UsesDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
-#if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_H_
-#define _TAO_CDR_OP_IR_ProvidesDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::ProvidesDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::ProvidesDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_ProvidesDefSeq_H_ */
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::UsesDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::UsesDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
-
-#if !defined _TAO_CDR_OP_IR_UsesDefSeq_H_
-#define _TAO_CDR_OP_IR_UsesDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::UsesDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::UsesDefSeq &
-  );
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-#endif /* _TAO_CDR_OP_IR_UsesDefSeq_H_ */
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::EventPortDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::EventPortDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
-#if !defined _TAO_CDR_OP_IR_HomeDefSeq_H_
-#define _TAO_CDR_OP_IR_HomeDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::HomeDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::HomeDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_HomeDefSeq_H_ */
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::EventPortDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::EventPortDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
-
-#if !defined _TAO_CDR_OP_IR_EmitsDefSeq_H_
-#define _TAO_CDR_OP_IR_EmitsDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::EmitsDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::EmitsDefSeq &
-  );
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-#endif /* _TAO_CDR_OP_IR_EmitsDefSeq_H_ */
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::EmitsDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::EmitsDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-#if !defined _TAO_CDR_OP_IR_PublishesDefSeq_H_
-#define _TAO_CDR_OP_IR_PublishesDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::PublishesDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::PublishesDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_PublishesDefSeq_H_ */
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::PublishesDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::PublishesDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
-
-#if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_H_
-#define _TAO_CDR_OP_IR_ConsumesDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::ConsumesDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::ConsumesDefSeq &
-  );
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-#endif /* _TAO_CDR_OP_IR_ConsumesDefSeq_H_ */
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::ConsumesDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::ConsumesDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
-
-#if !defined _TAO_CDR_OP_IR_FactoryDefSeq_H_
-#define _TAO_CDR_OP_IR_FactoryDefSeq_H_
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::FactoryDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::FactoryDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_FactoryDefSeq_H_ */
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::ComponentDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::ComponentDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
-#if !defined _TAO_CDR_OP_IR_FinderDefSeq_H_
-#define _TAO_CDR_OP_IR_FinderDefSeq_H_
+#if !defined _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_H_
+#define _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const IR::FinderDefSeq &
+    const CORBA::ComponentIR::ProvidesDescriptionSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IR::FinderDefSeq &
+    CORBA::ComponentIR::ProvidesDescriptionSeq &
   );
 
-#endif /* _TAO_CDR_OP_IR_FinderDefSeq_H_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentRepository_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentRepository_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ProvidesDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ProvidesDef_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ProvidesDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ProvidesDescription &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UsesDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UsesDef_ptr &);
+#endif /* _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UsesDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UsesDescription &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
-
-#if !defined _TAO_CDR_OP_IR_ProvidesDescSeq_H_
-#define _TAO_CDR_OP_IR_ProvidesDescSeq_H_
+#if !defined _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_H_
+#define _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const IR::ProvidesDescSeq &
+    const CORBA::ComponentIR::UsesDescriptionSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IR::ProvidesDescSeq &
+    CORBA::ComponentIR::UsesDescriptionSeq &
   );
 
-#endif /* _TAO_CDR_OP_IR_ProvidesDescSeq_H_ */
+#endif /* _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
-#if !defined _TAO_CDR_OP_IR_UsesDescSeq_H_
-#define _TAO_CDR_OP_IR_UsesDescSeq_H_
+#if !defined _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_H_
+#define _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const IR::UsesDescSeq &
+    const CORBA::ComponentIR::EventPortDescriptionSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IR::UsesDescSeq &
+    CORBA::ComponentIR::EventPortDescriptionSeq &
   );
 
-#endif /* _TAO_CDR_OP_IR_UsesDescSeq_H_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EventDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EventDef_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EventDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EventDescription &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EmitsDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EmitsDef_ptr &);
+#endif /* _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PublishesDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PublishesDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::ComponentDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::ComponentDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ConsumesDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ConsumesDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::FactoryDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::FactoryDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::FinderDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::FinderDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::HomeDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::HomeDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimaryKeyDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimaryKeyDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::HomeDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::HomeDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimaryKeyDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimaryKeyDescription &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::FactoryDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::FactoryDef_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::FinderDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::FinderDef_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::HomeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::HomeDef_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::HomeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::HomeDescription &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1016
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "IFR_ComponentsC.i"
@@ -8828,3 +6745,5 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::HomeDescrip
 
 #include "ace/post.h"
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.i b/TAO/tao/IFR_Client/IFR_ComponentsC.i
index b6a3a671338..4fdb43173fd 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.i
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.i
@@ -20,896 +20,159 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-#if !defined (_IR_REPOSITORYIDSEQ_CI_)
-#define _IR_REPOSITORYIDSEQ_CI_
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class IR::RepositoryIdSeq_var
-// *************************************************************
-
-ACE_INLINE
-IR::RepositoryIdSeq_var::RepositoryIdSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IR::RepositoryIdSeq_var::RepositoryIdSeq_var (RepositoryIdSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IR::RepositoryIdSeq_var::RepositoryIdSeq_var (const ::IR::RepositoryIdSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IR::RepositoryIdSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::RepositoryIdSeq_var::~RepositoryIdSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IR::RepositoryIdSeq_var &
-IR::RepositoryIdSeq_var::operator= (RepositoryIdSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::IR::RepositoryIdSeq_var &
-IR::RepositoryIdSeq_var::operator= (const ::IR::RepositoryIdSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          RepositoryIdSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              RepositoryIdSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              RepositoryIdSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::IR::RepositoryIdSeq *
-IR::RepositoryIdSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::RepositoryIdSeq *
-IR::RepositoryIdSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::RepositoryIdSeq_var::operator const ::IR::RepositoryIdSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::RepositoryIdSeq_var::operator ::IR::RepositoryIdSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::RepositoryIdSeq_var::operator ::IR::RepositoryIdSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IR::RepositoryIdSeq_var::operator ::IR::RepositoryIdSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager
-IR::RepositoryIdSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::IR::RepositoryIdSeq &
-IR::RepositoryIdSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::RepositoryIdSeq &
-IR::RepositoryIdSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::RepositoryIdSeq *&
-IR::RepositoryIdSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::RepositoryIdSeq *
-IR::RepositoryIdSeq_var::_retn (void)
-{
-  ::IR::RepositoryIdSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::IR::RepositoryIdSeq *
-IR::RepositoryIdSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class IR::RepositoryIdSeq_out
-// *************************************************************
-
-ACE_INLINE
-IR::RepositoryIdSeq_out::RepositoryIdSeq_out (RepositoryIdSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::RepositoryIdSeq_out::RepositoryIdSeq_out (RepositoryIdSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::RepositoryIdSeq_out::RepositoryIdSeq_out (const ::IR::RepositoryIdSeq_out &p)
-  : ptr_ (ACE_const_cast (RepositoryIdSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::IR::RepositoryIdSeq_out &
-IR::RepositoryIdSeq_out::operator= (const ::IR::RepositoryIdSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (RepositoryIdSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::IR::RepositoryIdSeq_out &
-IR::RepositoryIdSeq_out::operator= (RepositoryIdSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IR::RepositoryIdSeq_out::operator ::IR::RepositoryIdSeq *&() // cast
-{
-  return this->ptr_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-::IR::RepositoryIdSeq *&
-IR::RepositoryIdSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
+#if !defined (_CORBA_COMPONENTIR_EVENTDEF___CI_)
+#define _CORBA_COMPONENTIR_EVENTDEF___CI_
 
 ACE_INLINE
-::IR::RepositoryIdSeq *
-IR::RepositoryIdSeq_out::operator-> (void)
+CORBA::ComponentIR::EventDef::EventDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_ComponentIR_EventDef_setup_collocation (_tao_collocated);
 }
 
 ACE_INLINE
-TAO_SeqElem_String_Manager
-IR::RepositoryIdSeq_out::operator[] (CORBA::ULong index)
+CORBA::Boolean
+CORBA::ComponentIR::EventDef::marshal (TAO_OutputCDR &cdr)
 {
-  return this->ptr_->operator[] (index);
+  return (cdr << this);
 }
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_
-
-ACE_INLINE
-IR::ComponentDef **
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  IR::ComponentDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, IR::ComponentDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = IR::ComponentDef::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (IR::ComponentDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::ComponentDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(
-    const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      IR::ComponentDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
-      IR::ComponentDef ** const tmp2 =
-        ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
+#if !defined (_CORBA_COMPONENTIR_CONTAINER___CI_)
+#define _CORBA_COMPONENTIR_CONTAINER___CI_
 
 ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs
+CORBA::ComponentIR::Container::Container (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
   )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      IR::ComponentDef **tmp =
-        ACE_reinterpret_cast (IR::ComponentDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = IR::ComponentDef::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  IR::ComponentDef **tmp1 =
-    ACE_reinterpret_cast (IR::ComponentDef **, this->buffer_);
-  
-  IR::ComponentDef ** const tmp2 =
-    ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var>
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  IR::ComponentDef ** const tmp =
-    ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-IR::ComponentDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  IR::ComponentDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(IR::ComponentDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
+  this->CORBA_ComponentIR_Container_setup_collocation (_tao_collocated);
 }
 
 ACE_INLINE
-const IR::ComponentDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (void) const
+CORBA::Boolean
+CORBA::ComponentIR::Container::marshal (TAO_OutputCDR &cdr)
 {
-  return ACE_reinterpret_cast (const IR::ComponentDef ** ACE_CAST_CONST, this->buffer_);
+  return (cdr << this);
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_COMPONENTDEFSEQ_CI_)
-#define _IR_COMPONENTDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class IR::ComponentDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-IR::ComponentDefSeq_var::ComponentDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IR::ComponentDefSeq_var::ComponentDefSeq_var (ComponentDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IR::ComponentDefSeq_var::ComponentDefSeq_var (const ::IR::ComponentDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IR::ComponentDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::ComponentDefSeq_var::~ComponentDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IR::ComponentDefSeq_var &
-IR::ComponentDefSeq_var::operator= (ComponentDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::IR::ComponentDefSeq_var &
-IR::ComponentDefSeq_var::operator= (const ::IR::ComponentDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ComponentDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ComponentDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ComponentDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::IR::ComponentDefSeq *
-IR::ComponentDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::ComponentDefSeq *
-IR::ComponentDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::ComponentDefSeq_var::operator const ::IR::ComponentDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::ComponentDefSeq_var::operator ::IR::ComponentDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::ComponentDefSeq_var::operator ::IR::ComponentDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IR::ComponentDefSeq_var::operator ::IR::ComponentDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::ComponentDef, IR::ComponentDef_var>
-IR::ComponentDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::IR::ComponentDefSeq &
-IR::ComponentDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::ComponentDefSeq &
-IR::ComponentDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::ComponentDefSeq *&
-IR::ComponentDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::ComponentDefSeq *
-IR::ComponentDefSeq_var::_retn (void)
-{
-  ::IR::ComponentDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::IR::ComponentDefSeq *
-IR::ComponentDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class IR::ComponentDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-IR::ComponentDefSeq_out::ComponentDefSeq_out (ComponentDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::ComponentDefSeq_out::ComponentDefSeq_out (ComponentDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::ComponentDefSeq_out::ComponentDefSeq_out (const ::IR::ComponentDefSeq_out &p)
-  : ptr_ (ACE_const_cast (ComponentDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::IR::ComponentDefSeq_out &
-IR::ComponentDefSeq_out::operator= (const ::IR::ComponentDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ComponentDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::IR::ComponentDefSeq_out &
-IR::ComponentDefSeq_out::operator= (ComponentDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IR::ComponentDefSeq_out::operator ::IR::ComponentDefSeq *&() // cast
-{
-  return this->ptr_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-::IR::ComponentDefSeq *&
-IR::ComponentDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
+#if !defined (_CORBA_COMPONENTIR_MODULEDEF___CI_)
+#define _CORBA_COMPONENTIR_MODULEDEF___CI_
 
 ACE_INLINE
-::IR::ComponentDefSeq *
-IR::ComponentDefSeq_out::operator-> (void)
+CORBA::ComponentIR::ModuleDef::ModuleDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_ComponentIR_ModuleDef_setup_collocation (_tao_collocated);
 }
 
 ACE_INLINE
-TAO_Object_Manager<IR::ComponentDef, IR::ComponentDef_var>
-IR::ComponentDefSeq_out::operator[] (CORBA::ULong index)
+CORBA::Boolean
+CORBA::ComponentIR::ModuleDef::marshal (TAO_OutputCDR &cdr)
 {
-  return this->ptr_->operator[] (index);
+  return (cdr << this);
 }
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-IR::ProvidesDef **
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  IR::ProvidesDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, IR::ProvidesDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = IR::ProvidesDef::_nil ();
-    }
-  
-  return buf;
-}
+#if !defined (_CORBA_COMPONENTIR_REPOSITORY___CI_)
+#define _CORBA_COMPONENTIR_REPOSITORY___CI_
 
 ACE_INLINE
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (IR::ProvidesDef **buffer)
+CORBA::ComponentIR::Repository::Repository (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
+  this->CORBA_ComponentIR_Repository_setup_collocation (_tao_collocated);
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
+CORBA::Boolean
+CORBA::ComponentIR::Repository::marshal (TAO_OutputCDR &cdr)
 {
+  return (cdr << this);
 }
 
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (maximum))
-{
-}
+#endif /* end #if !defined */
 
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::ProvidesDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(
-    const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      IR::ProvidesDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
-      IR::ProvidesDef ** const tmp2 =
-        ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF___CI_)
+#define _CORBA_COMPONENTIR_PROVIDESDEF___CI_
 
 ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs
+CORBA::ComponentIR::ProvidesDef::ProvidesDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
   )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      IR::ProvidesDef **tmp =
-        ACE_reinterpret_cast (IR::ProvidesDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = IR::ProvidesDef::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  IR::ProvidesDef **tmp1 =
-    ACE_reinterpret_cast (IR::ProvidesDef **, this->buffer_);
-  
-  IR::ProvidesDef ** const tmp2 =
-    ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
+  this->CORBA_ComponentIR_ProvidesDef_setup_collocation (_tao_collocated);
 }
 
 ACE_INLINE
-TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var>
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator[] (CORBA::ULong index) const
+CORBA::Boolean
+CORBA::ComponentIR::ProvidesDef::marshal (TAO_OutputCDR &cdr)
 {
-  ACE_ASSERT (index < this->maximum_);
-  IR::ProvidesDef ** const tmp =
-    ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-IR::ProvidesDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  IR::ProvidesDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(IR::ProvidesDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const IR::ProvidesDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const IR::ProvidesDef ** ACE_CAST_CONST, this->buffer_);
+  return (cdr << this);
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_PROVIDESDEFSEQ_CI_)
-#define _IR_PROVIDESDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
-// Inline operations for class IR::ProvidesDefSeq_var
+// Inline operations for class CORBA::ComponentIR::ProvidesDescription_var
 // *************************************************************
 
 ACE_INLINE
-IR::ProvidesDefSeq_var::ProvidesDefSeq_var (void)
+CORBA::ComponentIR::ProvidesDescription_var::ProvidesDescription_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-IR::ProvidesDefSeq_var::ProvidesDefSeq_var (ProvidesDefSeq *p)
+CORBA::ComponentIR::ProvidesDescription_var::ProvidesDescription_var (ProvidesDescription *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-IR::ProvidesDefSeq_var::ProvidesDefSeq_var (const ::IR::ProvidesDefSeq_var &p)
+CORBA::ComponentIR::ProvidesDescription_var::ProvidesDescription_var (const ::CORBA::ComponentIR::ProvidesDescription_var &p)
 {
   if (p.ptr_)
     {
-      ACE_NEW (this->ptr_, ::IR::ProvidesDefSeq (*p.ptr_));
+      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::ProvidesDescription (*p.ptr_));
     }
   else
     {
@@ -918,43 +181,43 @@ IR::ProvidesDefSeq_var::ProvidesDefSeq_var (const ::IR::ProvidesDefSeq_var &p)
 }
 
 ACE_INLINE
-IR::ProvidesDefSeq_var::~ProvidesDefSeq_var (void)
+CORBA::ComponentIR::ProvidesDescription_var::~ProvidesDescription_var (void)
 {
   delete this->ptr_;
 }
 
 ACE_INLINE
-IR::ProvidesDefSeq_var &
-IR::ProvidesDefSeq_var::operator= (ProvidesDefSeq *p)
+CORBA::ComponentIR::ProvidesDescription_var &
+CORBA::ComponentIR::ProvidesDescription_var::operator= (ProvidesDescription *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
 ACE_INLINE
-::IR::ProvidesDefSeq_var &
-IR::ProvidesDefSeq_var::operator= (const ::IR::ProvidesDefSeq_var &p)
+::CORBA::ComponentIR::ProvidesDescription_var &
+CORBA::ComponentIR::ProvidesDescription_var::operator= (const ::CORBA::ComponentIR::ProvidesDescription_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
         {
-          ProvidesDefSeq *deep_copy = 0;
+          ProvidesDescription *deep_copy = 0;
           ACE_NEW_RETURN (
               deep_copy,
-              ProvidesDefSeq (*p.ptr_),
+              ProvidesDescription (*_tao_struct_var.ptr_),
               *this
             );
           
           if (deep_copy != 0)
             {
-              ProvidesDefSeq *tmp = deep_copy;
+              ProvidesDescription *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -965,107 +228,94 @@ IR::ProvidesDefSeq_var::operator= (const ::IR::ProvidesDefSeq_var &p)
   return *this;
 }
 
-ACE_INLINE
-const ::IR::ProvidesDefSeq *
-IR::ProvidesDefSeq_var::operator-> (void) const
+ACE_INLINE const ::CORBA::ComponentIR::ProvidesDescription *
+CORBA::ComponentIR::ProvidesDescription_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-::IR::ProvidesDefSeq *
-IR::ProvidesDefSeq_var::operator-> (void)
+ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription *
+CORBA::ComponentIR::ProvidesDescription_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-IR::ProvidesDefSeq_var::operator const ::IR::ProvidesDefSeq &() const // cast
+CORBA::ComponentIR::ProvidesDescription_var::operator const ::CORBA::ComponentIR::ProvidesDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::ProvidesDefSeq_var::operator ::IR::ProvidesDefSeq &() // cast 
+CORBA::ComponentIR::ProvidesDescription_var::operator ::CORBA::ComponentIR::ProvidesDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::ProvidesDefSeq_var::operator ::IR::ProvidesDefSeq &() const // cast 
+CORBA::ComponentIR::ProvidesDescription_var::operator ::CORBA::ComponentIR::ProvidesDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-IR::ProvidesDefSeq_var::operator ::IR::ProvidesDefSeq *&() // cast 
+CORBA::ComponentIR::ProvidesDescription_var::operator ::CORBA::ComponentIR::ProvidesDescription *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-TAO_Object_Manager<IR::ProvidesDef, IR::ProvidesDef_var>
-IR::ProvidesDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::IR::ProvidesDefSeq &
-IR::ProvidesDefSeq_var::in (void) const
+ACE_INLINE const ::CORBA::ComponentIR::ProvidesDescription &
+CORBA::ComponentIR::ProvidesDescription_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-::IR::ProvidesDefSeq &
-IR::ProvidesDefSeq_var::inout (void)
+ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription &
+CORBA::ComponentIR::ProvidesDescription_var::inout (void)
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-::IR::ProvidesDefSeq *&
-IR::ProvidesDefSeq_var::out (void)
+// Mapping for variable size.
+ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription *&
+CORBA::ComponentIR::ProvidesDescription_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE
-::IR::ProvidesDefSeq *
-IR::ProvidesDefSeq_var::_retn (void)
+ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription *
+CORBA::ComponentIR::ProvidesDescription_var::_retn (void)
 {
-  ::IR::ProvidesDefSeq *tmp = this->ptr_;
+  ::CORBA::ComponentIR::ProvidesDescription *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE
-::IR::ProvidesDefSeq *
-IR::ProvidesDefSeq_var::ptr (void) const
+ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription *
+CORBA::ComponentIR::ProvidesDescription_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
-// Inline operations for class IR::ProvidesDefSeq_out
+// Inline operations for class CORBA::ComponentIR::ProvidesDescription_out
 // *************************************************************
 
 ACE_INLINE
-IR::ProvidesDefSeq_out::ProvidesDefSeq_out (ProvidesDefSeq *&p)
+CORBA::ComponentIR::ProvidesDescription_out::ProvidesDescription_out (::CORBA::ComponentIR::ProvidesDescription *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-IR::ProvidesDefSeq_out::ProvidesDefSeq_out (ProvidesDefSeq_var &p)
+CORBA::ComponentIR::ProvidesDescription_out::ProvidesDescription_out (ProvidesDescription_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1073,275 +323,93 @@ IR::ProvidesDefSeq_out::ProvidesDefSeq_out (ProvidesDefSeq_var &p)
 }
 
 ACE_INLINE
-IR::ProvidesDefSeq_out::ProvidesDefSeq_out (const ::IR::ProvidesDefSeq_out &p)
-  : ptr_ (ACE_const_cast (ProvidesDefSeq_out&, p).ptr_)
+CORBA::ComponentIR::ProvidesDescription_out::ProvidesDescription_out (const ::CORBA::ComponentIR::ProvidesDescription_out &p)
+  : ptr_ (ACE_const_cast (ProvidesDescription_out&, p).ptr_)
 {}
 
 ACE_INLINE
-::IR::ProvidesDefSeq_out &
-IR::ProvidesDefSeq_out::operator= (const ::IR::ProvidesDefSeq_out &p)
+CORBA::ComponentIR::ProvidesDescription_out &
+CORBA::ComponentIR::ProvidesDescription_out::operator= (const ::CORBA::ComponentIR::ProvidesDescription_out &p)
 {
-  this->ptr_ = ACE_const_cast (ProvidesDefSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (ProvidesDescription_out&, p).ptr_;
   return *this;
 }
 
 ACE_INLINE
-::IR::ProvidesDefSeq_out &
-IR::ProvidesDefSeq_out::operator= (ProvidesDefSeq *p)
+CORBA::ComponentIR::ProvidesDescription_out &
+CORBA::ComponentIR::ProvidesDescription_out::operator= (ProvidesDescription *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
-ACE_INLINE
-IR::ProvidesDefSeq_out::operator ::IR::ProvidesDefSeq *&() // cast
+ACE_INLINE 
+CORBA::ComponentIR::ProvidesDescription_out::operator ::CORBA::ComponentIR::ProvidesDescription *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-::IR::ProvidesDefSeq *&
-IR::ProvidesDefSeq_out::ptr (void) // ptr
+ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription *&
+CORBA::ComponentIR::ProvidesDescription_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-::IR::ProvidesDefSeq *
-IR::ProvidesDefSeq_out::operator-> (void)
+ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription *
+CORBA::ComponentIR::ProvidesDescription_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-TAO_Object_Manager<IR::ProvidesDef, IR::ProvidesDef_var>
-IR::ProvidesDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_
-
-ACE_INLINE
-IR::UsesDef **
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  IR::UsesDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, IR::UsesDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = IR::UsesDef::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (IR::UsesDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (maximum))
-{
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::UsesDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
+#if !defined (_CORBA_COMPONENTIR_USESDEF___CI_)
+#define _CORBA_COMPONENTIR_USESDEF___CI_
 
 ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(
-    const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      IR::UsesDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
-      IR::UsesDef ** const tmp2 =
-        ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs
+CORBA::ComponentIR::UsesDef::UsesDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
   )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      IR::UsesDef **tmp =
-        ACE_reinterpret_cast (IR::UsesDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = IR::UsesDef::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  IR::UsesDef **tmp1 =
-    ACE_reinterpret_cast (IR::UsesDef **, this->buffer_);
-  
-  IR::UsesDef ** const tmp2 =
-    ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var>
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  IR::UsesDef ** const tmp =
-    ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-IR::UsesDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  IR::UsesDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(IR::UsesDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
+  this->CORBA_ComponentIR_UsesDef_setup_collocation (_tao_collocated);
 }
 
 ACE_INLINE
-const IR::UsesDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (void) const
+CORBA::Boolean
+CORBA::ComponentIR::UsesDef::marshal (TAO_OutputCDR &cdr)
 {
-  return ACE_reinterpret_cast (const IR::UsesDef ** ACE_CAST_CONST, this->buffer_);
+  return (cdr << this);
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_USESDEFSEQ_CI_)
-#define _IR_USESDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
-// Inline operations for class IR::UsesDefSeq_var
+// Inline operations for class CORBA::ComponentIR::UsesDescription_var
 // *************************************************************
 
 ACE_INLINE
-IR::UsesDefSeq_var::UsesDefSeq_var (void)
+CORBA::ComponentIR::UsesDescription_var::UsesDescription_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-IR::UsesDefSeq_var::UsesDefSeq_var (UsesDefSeq *p)
+CORBA::ComponentIR::UsesDescription_var::UsesDescription_var (UsesDescription *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-IR::UsesDefSeq_var::UsesDefSeq_var (const ::IR::UsesDefSeq_var &p)
+CORBA::ComponentIR::UsesDescription_var::UsesDescription_var (const ::CORBA::ComponentIR::UsesDescription_var &p)
 {
   if (p.ptr_)
     {
-      ACE_NEW (this->ptr_, ::IR::UsesDefSeq (*p.ptr_));
+      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::UsesDescription (*p.ptr_));
     }
   else
     {
@@ -1350,43 +418,43 @@ IR::UsesDefSeq_var::UsesDefSeq_var (const ::IR::UsesDefSeq_var &p)
 }
 
 ACE_INLINE
-IR::UsesDefSeq_var::~UsesDefSeq_var (void)
+CORBA::ComponentIR::UsesDescription_var::~UsesDescription_var (void)
 {
   delete this->ptr_;
 }
 
 ACE_INLINE
-IR::UsesDefSeq_var &
-IR::UsesDefSeq_var::operator= (UsesDefSeq *p)
+CORBA::ComponentIR::UsesDescription_var &
+CORBA::ComponentIR::UsesDescription_var::operator= (UsesDescription *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
 ACE_INLINE
-::IR::UsesDefSeq_var &
-IR::UsesDefSeq_var::operator= (const ::IR::UsesDefSeq_var &p)
+::CORBA::ComponentIR::UsesDescription_var &
+CORBA::ComponentIR::UsesDescription_var::operator= (const ::CORBA::ComponentIR::UsesDescription_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
         {
-          UsesDefSeq *deep_copy = 0;
+          UsesDescription *deep_copy = 0;
           ACE_NEW_RETURN (
               deep_copy,
-              UsesDefSeq (*p.ptr_),
+              UsesDescription (*_tao_struct_var.ptr_),
               *this
             );
           
           if (deep_copy != 0)
             {
-              UsesDefSeq *tmp = deep_copy;
+              UsesDescription *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -1397,107 +465,94 @@ IR::UsesDefSeq_var::operator= (const ::IR::UsesDefSeq_var &p)
   return *this;
 }
 
-ACE_INLINE
-const ::IR::UsesDefSeq *
-IR::UsesDefSeq_var::operator-> (void) const
+ACE_INLINE const ::CORBA::ComponentIR::UsesDescription *
+CORBA::ComponentIR::UsesDescription_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-::IR::UsesDefSeq *
-IR::UsesDefSeq_var::operator-> (void)
+ACE_INLINE ::CORBA::ComponentIR::UsesDescription *
+CORBA::ComponentIR::UsesDescription_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-IR::UsesDefSeq_var::operator const ::IR::UsesDefSeq &() const // cast
+CORBA::ComponentIR::UsesDescription_var::operator const ::CORBA::ComponentIR::UsesDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::UsesDefSeq_var::operator ::IR::UsesDefSeq &() // cast 
+CORBA::ComponentIR::UsesDescription_var::operator ::CORBA::ComponentIR::UsesDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::UsesDefSeq_var::operator ::IR::UsesDefSeq &() const // cast 
+CORBA::ComponentIR::UsesDescription_var::operator ::CORBA::ComponentIR::UsesDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-IR::UsesDefSeq_var::operator ::IR::UsesDefSeq *&() // cast 
+CORBA::ComponentIR::UsesDescription_var::operator ::CORBA::ComponentIR::UsesDescription *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-TAO_Object_Manager<IR::UsesDef, IR::UsesDef_var>
-IR::UsesDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::IR::UsesDefSeq &
-IR::UsesDefSeq_var::in (void) const
+ACE_INLINE const ::CORBA::ComponentIR::UsesDescription &
+CORBA::ComponentIR::UsesDescription_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-::IR::UsesDefSeq &
-IR::UsesDefSeq_var::inout (void)
+ACE_INLINE ::CORBA::ComponentIR::UsesDescription &
+CORBA::ComponentIR::UsesDescription_var::inout (void)
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-::IR::UsesDefSeq *&
-IR::UsesDefSeq_var::out (void)
+// Mapping for variable size.
+ACE_INLINE ::CORBA::ComponentIR::UsesDescription *&
+CORBA::ComponentIR::UsesDescription_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE
-::IR::UsesDefSeq *
-IR::UsesDefSeq_var::_retn (void)
+ACE_INLINE ::CORBA::ComponentIR::UsesDescription *
+CORBA::ComponentIR::UsesDescription_var::_retn (void)
 {
-  ::IR::UsesDefSeq *tmp = this->ptr_;
+  ::CORBA::ComponentIR::UsesDescription *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE
-::IR::UsesDefSeq *
-IR::UsesDefSeq_var::ptr (void) const
+ACE_INLINE ::CORBA::ComponentIR::UsesDescription *
+CORBA::ComponentIR::UsesDescription_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
-// Inline operations for class IR::UsesDefSeq_out
+// Inline operations for class CORBA::ComponentIR::UsesDescription_out
 // *************************************************************
 
 ACE_INLINE
-IR::UsesDefSeq_out::UsesDefSeq_out (UsesDefSeq *&p)
+CORBA::ComponentIR::UsesDescription_out::UsesDescription_out (::CORBA::ComponentIR::UsesDescription *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-IR::UsesDefSeq_out::UsesDefSeq_out (UsesDefSeq_var &p)
+CORBA::ComponentIR::UsesDescription_out::UsesDescription_out (UsesDescription_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1505,275 +560,93 @@ IR::UsesDefSeq_out::UsesDefSeq_out (UsesDefSeq_var &p)
 }
 
 ACE_INLINE
-IR::UsesDefSeq_out::UsesDefSeq_out (const ::IR::UsesDefSeq_out &p)
-  : ptr_ (ACE_const_cast (UsesDefSeq_out&, p).ptr_)
+CORBA::ComponentIR::UsesDescription_out::UsesDescription_out (const ::CORBA::ComponentIR::UsesDescription_out &p)
+  : ptr_ (ACE_const_cast (UsesDescription_out&, p).ptr_)
 {}
 
 ACE_INLINE
-::IR::UsesDefSeq_out &
-IR::UsesDefSeq_out::operator= (const ::IR::UsesDefSeq_out &p)
+CORBA::ComponentIR::UsesDescription_out &
+CORBA::ComponentIR::UsesDescription_out::operator= (const ::CORBA::ComponentIR::UsesDescription_out &p)
 {
-  this->ptr_ = ACE_const_cast (UsesDefSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (UsesDescription_out&, p).ptr_;
   return *this;
 }
 
 ACE_INLINE
-::IR::UsesDefSeq_out &
-IR::UsesDefSeq_out::operator= (UsesDefSeq *p)
+CORBA::ComponentIR::UsesDescription_out &
+CORBA::ComponentIR::UsesDescription_out::operator= (UsesDescription *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
-ACE_INLINE
-IR::UsesDefSeq_out::operator ::IR::UsesDefSeq *&() // cast
+ACE_INLINE 
+CORBA::ComponentIR::UsesDescription_out::operator ::CORBA::ComponentIR::UsesDescription *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-::IR::UsesDefSeq *&
-IR::UsesDefSeq_out::ptr (void) // ptr
+ACE_INLINE ::CORBA::ComponentIR::UsesDescription *&
+CORBA::ComponentIR::UsesDescription_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-::IR::UsesDefSeq *
-IR::UsesDefSeq_out::operator-> (void)
+ACE_INLINE ::CORBA::ComponentIR::UsesDescription *
+CORBA::ComponentIR::UsesDescription_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-TAO_Object_Manager<IR::UsesDef, IR::UsesDef_var>
-IR::UsesDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_
-
-ACE_INLINE
-IR::HomeDef **
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  IR::HomeDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, IR::HomeDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = IR::HomeDef::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (IR::HomeDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (maximum))
-{
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::HomeDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF___CI_)
+#define _CORBA_COMPONENTIR_EVENTPORTDEF___CI_
 
 ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(
-    const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      IR::HomeDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
-      IR::HomeDef ** const tmp2 =
-        ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs
+CORBA::ComponentIR::EventPortDef::EventPortDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
   )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      IR::HomeDef **tmp =
-        ACE_reinterpret_cast (IR::HomeDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = IR::HomeDef::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  IR::HomeDef **tmp1 =
-    ACE_reinterpret_cast (IR::HomeDef **, this->buffer_);
-  
-  IR::HomeDef ** const tmp2 =
-    ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var>
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  IR::HomeDef ** const tmp =
-    ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-IR::HomeDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  IR::HomeDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(IR::HomeDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
+  this->CORBA_ComponentIR_EventPortDef_setup_collocation (_tao_collocated);
 }
 
 ACE_INLINE
-const IR::HomeDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (void) const
+CORBA::Boolean
+CORBA::ComponentIR::EventPortDef::marshal (TAO_OutputCDR &cdr)
 {
-  return ACE_reinterpret_cast (const IR::HomeDef ** ACE_CAST_CONST, this->buffer_);
+  return (cdr << this);
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_HOMEDEFSEQ_CI_)
-#define _IR_HOMEDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
-// Inline operations for class IR::HomeDefSeq_var
+// Inline operations for class CORBA::ComponentIR::EventPortDescription_var
 // *************************************************************
 
 ACE_INLINE
-IR::HomeDefSeq_var::HomeDefSeq_var (void)
+CORBA::ComponentIR::EventPortDescription_var::EventPortDescription_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-IR::HomeDefSeq_var::HomeDefSeq_var (HomeDefSeq *p)
+CORBA::ComponentIR::EventPortDescription_var::EventPortDescription_var (EventPortDescription *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-IR::HomeDefSeq_var::HomeDefSeq_var (const ::IR::HomeDefSeq_var &p)
+CORBA::ComponentIR::EventPortDescription_var::EventPortDescription_var (const ::CORBA::ComponentIR::EventPortDescription_var &p)
 {
   if (p.ptr_)
     {
-      ACE_NEW (this->ptr_, ::IR::HomeDefSeq (*p.ptr_));
+      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::EventPortDescription (*p.ptr_));
     }
   else
     {
@@ -1782,43 +655,43 @@ IR::HomeDefSeq_var::HomeDefSeq_var (const ::IR::HomeDefSeq_var &p)
 }
 
 ACE_INLINE
-IR::HomeDefSeq_var::~HomeDefSeq_var (void)
+CORBA::ComponentIR::EventPortDescription_var::~EventPortDescription_var (void)
 {
   delete this->ptr_;
 }
 
 ACE_INLINE
-IR::HomeDefSeq_var &
-IR::HomeDefSeq_var::operator= (HomeDefSeq *p)
+CORBA::ComponentIR::EventPortDescription_var &
+CORBA::ComponentIR::EventPortDescription_var::operator= (EventPortDescription *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
 ACE_INLINE
-::IR::HomeDefSeq_var &
-IR::HomeDefSeq_var::operator= (const ::IR::HomeDefSeq_var &p)
+::CORBA::ComponentIR::EventPortDescription_var &
+CORBA::ComponentIR::EventPortDescription_var::operator= (const ::CORBA::ComponentIR::EventPortDescription_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
         {
-          HomeDefSeq *deep_copy = 0;
+          EventPortDescription *deep_copy = 0;
           ACE_NEW_RETURN (
               deep_copy,
-              HomeDefSeq (*p.ptr_),
+              EventPortDescription (*_tao_struct_var.ptr_),
               *this
             );
           
           if (deep_copy != 0)
             {
-              HomeDefSeq *tmp = deep_copy;
+              EventPortDescription *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -1829,107 +702,94 @@ IR::HomeDefSeq_var::operator= (const ::IR::HomeDefSeq_var &p)
   return *this;
 }
 
-ACE_INLINE
-const ::IR::HomeDefSeq *
-IR::HomeDefSeq_var::operator-> (void) const
+ACE_INLINE const ::CORBA::ComponentIR::EventPortDescription *
+CORBA::ComponentIR::EventPortDescription_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-::IR::HomeDefSeq *
-IR::HomeDefSeq_var::operator-> (void)
+ACE_INLINE ::CORBA::ComponentIR::EventPortDescription *
+CORBA::ComponentIR::EventPortDescription_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-IR::HomeDefSeq_var::operator const ::IR::HomeDefSeq &() const // cast
+CORBA::ComponentIR::EventPortDescription_var::operator const ::CORBA::ComponentIR::EventPortDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::HomeDefSeq_var::operator ::IR::HomeDefSeq &() // cast 
+CORBA::ComponentIR::EventPortDescription_var::operator ::CORBA::ComponentIR::EventPortDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::HomeDefSeq_var::operator ::IR::HomeDefSeq &() const // cast 
+CORBA::ComponentIR::EventPortDescription_var::operator ::CORBA::ComponentIR::EventPortDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-IR::HomeDefSeq_var::operator ::IR::HomeDefSeq *&() // cast 
+CORBA::ComponentIR::EventPortDescription_var::operator ::CORBA::ComponentIR::EventPortDescription *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-TAO_Object_Manager<IR::HomeDef, IR::HomeDef_var>
-IR::HomeDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::IR::HomeDefSeq &
-IR::HomeDefSeq_var::in (void) const
+ACE_INLINE const ::CORBA::ComponentIR::EventPortDescription &
+CORBA::ComponentIR::EventPortDescription_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-::IR::HomeDefSeq &
-IR::HomeDefSeq_var::inout (void)
+ACE_INLINE ::CORBA::ComponentIR::EventPortDescription &
+CORBA::ComponentIR::EventPortDescription_var::inout (void)
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-::IR::HomeDefSeq *&
-IR::HomeDefSeq_var::out (void)
+// Mapping for variable size.
+ACE_INLINE ::CORBA::ComponentIR::EventPortDescription *&
+CORBA::ComponentIR::EventPortDescription_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE
-::IR::HomeDefSeq *
-IR::HomeDefSeq_var::_retn (void)
+ACE_INLINE ::CORBA::ComponentIR::EventPortDescription *
+CORBA::ComponentIR::EventPortDescription_var::_retn (void)
 {
-  ::IR::HomeDefSeq *tmp = this->ptr_;
+  ::CORBA::ComponentIR::EventPortDescription *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE
-::IR::HomeDefSeq *
-IR::HomeDefSeq_var::ptr (void) const
+ACE_INLINE ::CORBA::ComponentIR::EventPortDescription *
+CORBA::ComponentIR::EventPortDescription_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
-// Inline operations for class IR::HomeDefSeq_out
+// Inline operations for class CORBA::ComponentIR::EventPortDescription_out
 // *************************************************************
 
 ACE_INLINE
-IR::HomeDefSeq_out::HomeDefSeq_out (HomeDefSeq *&p)
+CORBA::ComponentIR::EventPortDescription_out::EventPortDescription_out (::CORBA::ComponentIR::EventPortDescription *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-IR::HomeDefSeq_out::HomeDefSeq_out (HomeDefSeq_var &p)
+CORBA::ComponentIR::EventPortDescription_out::EventPortDescription_out (EventPortDescription_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1937,561 +797,209 @@ IR::HomeDefSeq_out::HomeDefSeq_out (HomeDefSeq_var &p)
 }
 
 ACE_INLINE
-IR::HomeDefSeq_out::HomeDefSeq_out (const ::IR::HomeDefSeq_out &p)
-  : ptr_ (ACE_const_cast (HomeDefSeq_out&, p).ptr_)
+CORBA::ComponentIR::EventPortDescription_out::EventPortDescription_out (const ::CORBA::ComponentIR::EventPortDescription_out &p)
+  : ptr_ (ACE_const_cast (EventPortDescription_out&, p).ptr_)
 {}
 
 ACE_INLINE
-::IR::HomeDefSeq_out &
-IR::HomeDefSeq_out::operator= (const ::IR::HomeDefSeq_out &p)
+CORBA::ComponentIR::EventPortDescription_out &
+CORBA::ComponentIR::EventPortDescription_out::operator= (const ::CORBA::ComponentIR::EventPortDescription_out &p)
 {
-  this->ptr_ = ACE_const_cast (HomeDefSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (EventPortDescription_out&, p).ptr_;
   return *this;
 }
 
 ACE_INLINE
-::IR::HomeDefSeq_out &
-IR::HomeDefSeq_out::operator= (HomeDefSeq *p)
+CORBA::ComponentIR::EventPortDescription_out &
+CORBA::ComponentIR::EventPortDescription_out::operator= (EventPortDescription *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
-ACE_INLINE
-IR::HomeDefSeq_out::operator ::IR::HomeDefSeq *&() // cast
+ACE_INLINE 
+CORBA::ComponentIR::EventPortDescription_out::operator ::CORBA::ComponentIR::EventPortDescription *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-::IR::HomeDefSeq *&
-IR::HomeDefSeq_out::ptr (void) // ptr
+ACE_INLINE ::CORBA::ComponentIR::EventPortDescription *&
+CORBA::ComponentIR::EventPortDescription_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-::IR::HomeDefSeq *
-IR::HomeDefSeq_out::operator-> (void)
+ACE_INLINE ::CORBA::ComponentIR::EventPortDescription *
+CORBA::ComponentIR::EventPortDescription_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-TAO_Object_Manager<IR::HomeDef, IR::HomeDef_var>
-IR::HomeDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_
-
-ACE_INLINE
-IR::EmitsDef **
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  IR::EmitsDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, IR::EmitsDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = IR::EmitsDef::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (IR::EmitsDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::EmitsDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(
-    const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      IR::EmitsDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
-      IR::EmitsDef ** const tmp2 =
-        ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
+#if !defined (_CORBA_COMPONENTIR_EMITSDEF___CI_)
+#define _CORBA_COMPONENTIR_EMITSDEF___CI_
 
 ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs
+CORBA::ComponentIR::EmitsDef::EmitsDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
   )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      IR::EmitsDef **tmp =
-        ACE_reinterpret_cast (IR::EmitsDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = IR::EmitsDef::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  IR::EmitsDef **tmp1 =
-    ACE_reinterpret_cast (IR::EmitsDef **, this->buffer_);
-  
-  IR::EmitsDef ** const tmp2 =
-    ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var>
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  IR::EmitsDef ** const tmp =
-    ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var> (tmp + index, this->release_);
+  this->CORBA_ComponentIR_EmitsDef_setup_collocation (_tao_collocated);
 }
 
 ACE_INLINE
-IR::EmitsDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (CORBA::Boolean orphan)
+CORBA::Boolean
+CORBA::ComponentIR::EmitsDef::marshal (TAO_OutputCDR &cdr)
 {
-  IR::EmitsDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(IR::EmitsDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const IR::EmitsDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const IR::EmitsDef ** ACE_CAST_CONST, this->buffer_);
+  return (cdr << this);
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_EMITSDEFSEQ_CI_)
-#define _IR_EMITSDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class IR::EmitsDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-IR::EmitsDefSeq_var::EmitsDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IR::EmitsDefSeq_var::EmitsDefSeq_var (EmitsDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IR::EmitsDefSeq_var::EmitsDefSeq_var (const ::IR::EmitsDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IR::EmitsDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::EmitsDefSeq_var::~EmitsDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IR::EmitsDefSeq_var &
-IR::EmitsDefSeq_var::operator= (EmitsDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::IR::EmitsDefSeq_var &
-IR::EmitsDefSeq_var::operator= (const ::IR::EmitsDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          EmitsDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              EmitsDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              EmitsDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::IR::EmitsDefSeq *
-IR::EmitsDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::EmitsDefSeq *
-IR::EmitsDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::EmitsDefSeq_var::operator const ::IR::EmitsDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::EmitsDefSeq_var::operator ::IR::EmitsDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::EmitsDefSeq_var::operator ::IR::EmitsDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IR::EmitsDefSeq_var::operator ::IR::EmitsDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-TAO_Object_Manager<IR::EmitsDef, IR::EmitsDef_var>
-IR::EmitsDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
+#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF___CI_)
+#define _CORBA_COMPONENTIR_PUBLISHESDEF___CI_
 
 ACE_INLINE
-const ::IR::EmitsDefSeq &
-IR::EmitsDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::EmitsDefSeq &
-IR::EmitsDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::EmitsDefSeq *&
-IR::EmitsDefSeq_var::out (void)
+CORBA::ComponentIR::PublishesDef::PublishesDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
+  this->CORBA_ComponentIR_PublishesDef_setup_collocation (_tao_collocated);
 }
 
 ACE_INLINE
-::IR::EmitsDefSeq *
-IR::EmitsDefSeq_var::_retn (void)
+CORBA::Boolean
+CORBA::ComponentIR::PublishesDef::marshal (TAO_OutputCDR &cdr)
 {
-  ::IR::EmitsDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
+  return (cdr << this);
 }
 
-ACE_INLINE
-::IR::EmitsDefSeq *
-IR::EmitsDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
+#endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-// *************************************************************
-// Inline operations for class IR::EmitsDefSeq_out
-// *************************************************************
+#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF___CI_)
+#define _CORBA_COMPONENTIR_CONSUMESDEF___CI_
 
 ACE_INLINE
-IR::EmitsDefSeq_out::EmitsDefSeq_out (EmitsDefSeq *&p)
-  : ptr_ (p)
+CORBA::ComponentIR::ConsumesDef::ConsumesDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  this->ptr_ = 0;
+  this->CORBA_ComponentIR_ConsumesDef_setup_collocation (_tao_collocated);
 }
 
 ACE_INLINE
-IR::EmitsDefSeq_out::EmitsDefSeq_out (EmitsDefSeq_var &p)
-  : ptr_ (p.out ())
+CORBA::Boolean
+CORBA::ComponentIR::ConsumesDef::marshal (TAO_OutputCDR &cdr)
 {
-  delete this->ptr_;
-  this->ptr_ = 0;
+  return (cdr << this);
 }
 
-ACE_INLINE
-IR::EmitsDefSeq_out::EmitsDefSeq_out (const ::IR::EmitsDefSeq_out &p)
-  : ptr_ (ACE_const_cast (EmitsDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::IR::EmitsDefSeq_out &
-IR::EmitsDefSeq_out::operator= (const ::IR::EmitsDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (EmitsDefSeq_out&, p).ptr_;
-  return *this;
-}
+#endif /* end #if !defined */
 
-ACE_INLINE
-::IR::EmitsDefSeq_out &
-IR::EmitsDefSeq_out::operator= (EmitsDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-IR::EmitsDefSeq_out::operator ::IR::EmitsDefSeq *&() // cast
-{
-  return this->ptr_;
-}
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___CI_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF___CI_
 
 ACE_INLINE
-::IR::EmitsDefSeq *&
-IR::EmitsDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::EmitsDefSeq *
-IR::EmitsDefSeq_out::operator-> (void)
+CORBA::ComponentIR::ComponentDef::ComponentDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_ComponentIR_ComponentDef_setup_collocation (_tao_collocated);
 }
 
 ACE_INLINE
-TAO_Object_Manager<IR::EmitsDef, IR::EmitsDef_var>
-IR::EmitsDefSeq_out::operator[] (CORBA::ULong index)
+CORBA::Boolean
+CORBA::ComponentIR::ComponentDef::marshal (TAO_OutputCDR &cdr)
 {
-  return this->ptr_->operator[] (index);
+  return (cdr << this);
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CI_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CI_
 
 ACE_INLINE
-IR::PublishesDef **
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (CORBA::ULong nelems)
+CORBA::ComponentIR::ProvidesDescription *
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (CORBA::ULong size)
 {
-  IR::PublishesDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, IR::PublishesDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = IR::PublishesDef::_nil ();
-    }
-  
-  return buf;
+  CORBA::ComponentIR::ProvidesDescription *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA::ComponentIR::ProvidesDescription[size], 0);
+  return retval;
 }
 
 ACE_INLINE
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (IR::PublishesDef **buffer)
+void CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::freebuf (CORBA::ComponentIR::ProvidesDescription *buffer)
 {
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
+  delete [] buffer;
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (void)
 {
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (maximum))
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (CORBA::ULong maximum) 
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (
     CORBA::ULong maximum,
     CORBA::ULong length,
-    IR::PublishesDef* *value,
+    CORBA::ComponentIR::ProvidesDescription *data,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(
-    const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (
+    const _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq &rhs
   )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      IR::PublishesDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
-      IR::PublishesDef ** const tmp2 =
-        ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
+      CORBA::ComponentIR::ProvidesDescription *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (this->maximum_);
+      CORBA::ComponentIR::ProvidesDescription * const tmp2 =
+        ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
       
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
+          tmp1[i] = tmp2[i];
         }
       
       this->buffer_ = tmp1;
@@ -2503,9 +1011,9 @@ IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Seq
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq &
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq &rhs
   )
 {
   if (this == &rhs)
@@ -2515,490 +1023,67 @@ IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator= (
   
   if (this->release_)
     {
-      IR::PublishesDef **tmp =
-        ACE_reinterpret_cast (IR::PublishesDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = IR::PublishesDef::_nil ();
-        }
-      
       if (this->maximum_ < rhs.maximum_)
         {
-          _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (rhs.maximum_);
+          // Free the old buffer.
+          CORBA::ComponentIR::ProvidesDescription *tmp =
+            ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (rhs.maximum_);
         }
     }
   else
     {
       this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (rhs.maximum_);
+        _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (rhs.maximum_);
     }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  IR::PublishesDef **tmp1 =
-    ACE_reinterpret_cast (IR::PublishesDef **, this->buffer_);
-  
-  IR::PublishesDef ** const tmp2 =
-    ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var>
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  IR::PublishesDef ** const tmp =
-    ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-IR::PublishesDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  IR::PublishesDef **result = 0;
+  CORBA::ComponentIR::ProvidesDescription *tmp1 =
+    ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription *, this->buffer_);
+  CORBA::ComponentIR::ProvidesDescription * const tmp2 =
+    ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
   
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(IR::PublishesDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const IR::PublishesDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const IR::PublishesDef ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_PUBLISHESDEFSEQ_CI_)
-#define _IR_PUBLISHESDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class IR::PublishesDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-IR::PublishesDefSeq_var::PublishesDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IR::PublishesDefSeq_var::PublishesDefSeq_var (PublishesDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IR::PublishesDefSeq_var::PublishesDefSeq_var (const ::IR::PublishesDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IR::PublishesDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::PublishesDefSeq_var::~PublishesDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IR::PublishesDefSeq_var &
-IR::PublishesDefSeq_var::operator= (PublishesDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::IR::PublishesDefSeq_var &
-IR::PublishesDefSeq_var::operator= (const ::IR::PublishesDefSeq_var &p)
-{
-  if (this != &p)
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          PublishesDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              PublishesDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              PublishesDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
+      tmp1[i] = tmp2[i];
     }
   
   return *this;
 }
 
+// = Accessors.
 ACE_INLINE
-const ::IR::PublishesDefSeq *
-IR::PublishesDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::PublishesDefSeq *
-IR::PublishesDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::PublishesDefSeq_var::operator const ::IR::PublishesDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::PublishesDefSeq_var::operator ::IR::PublishesDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::PublishesDefSeq_var::operator ::IR::PublishesDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IR::PublishesDefSeq_var::operator ::IR::PublishesDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::PublishesDef, IR::PublishesDef_var>
-IR::PublishesDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::IR::PublishesDefSeq &
-IR::PublishesDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::PublishesDefSeq &
-IR::PublishesDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::PublishesDefSeq *&
-IR::PublishesDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::PublishesDefSeq *
-IR::PublishesDefSeq_var::_retn (void)
-{
-  ::IR::PublishesDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::IR::PublishesDefSeq *
-IR::PublishesDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class IR::PublishesDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-IR::PublishesDefSeq_out::PublishesDefSeq_out (PublishesDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::PublishesDefSeq_out::PublishesDefSeq_out (PublishesDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::PublishesDefSeq_out::PublishesDefSeq_out (const ::IR::PublishesDefSeq_out &p)
-  : ptr_ (ACE_const_cast (PublishesDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::IR::PublishesDefSeq_out &
-IR::PublishesDefSeq_out::operator= (const ::IR::PublishesDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (PublishesDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::IR::PublishesDefSeq_out &
-IR::PublishesDefSeq_out::operator= (PublishesDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IR::PublishesDefSeq_out::operator ::IR::PublishesDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::PublishesDefSeq *&
-IR::PublishesDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::PublishesDefSeq *
-IR::PublishesDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::PublishesDef, IR::PublishesDef_var>
-IR::PublishesDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_
-
-ACE_INLINE
-IR::ConsumesDef **
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  IR::ConsumesDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, IR::ConsumesDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = IR::ConsumesDef::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (IR::ConsumesDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::ConsumesDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(
-    const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
+CORBA::ComponentIR::ProvidesDescription &
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::operator[] (CORBA::ULong i)
 {
-  if (rhs.buffer_ != 0)
-    {
-      IR::ConsumesDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
-      IR::ConsumesDef ** const tmp2 =
-        ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ComponentIR::ProvidesDescription* tmp =
+    ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription*, this->buffer_);
+  return tmp[i];
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs
-  )
+const CORBA::ComponentIR::ProvidesDescription &
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::operator[] (CORBA::ULong i) const
 {
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      IR::ConsumesDef **tmp =
-        ACE_reinterpret_cast (IR::ConsumesDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = IR::ConsumesDef::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  IR::ConsumesDef **tmp1 =
-    ACE_reinterpret_cast (IR::ConsumesDef **, this->buffer_);
-  
-  IR::ConsumesDef ** const tmp2 =
-    ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ComponentIR::ProvidesDescription * const tmp =
+    ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
 }
 
-ACE_INLINE
-TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var>
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  IR::ConsumesDef ** const tmp =
-    ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var> (tmp + index, this->release_);
-}
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
 
 ACE_INLINE
-IR::ConsumesDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean orphan)
+CORBA::ComponentIR::ProvidesDescription *
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::get_buffer (CORBA::Boolean orphan)
 {
-  IR::ConsumesDef **result = 0;
+  CORBA::ComponentIR::ProvidesDescription *result = 0;
   
   if (orphan == 0)
     {
@@ -3006,14 +1091,14 @@ IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean
       if (this->buffer_ == 0)
         {
           result =
-            _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
+            _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (this->length_);
           this->buffer_ = result;
           this->release_ = 1;
         }
       else
         {
           result =
-            ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
+            ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription*, this->buffer_);
         }
     }
   else // if (orphan == 1)
@@ -3022,7 +1107,7 @@ IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean
         {
           // We set the state back to default and relinquish ownership.
           result =
-            ACE_reinterpret_cast(IR::ConsumesDef**,this->buffer_);
+            ACE_reinterpret_cast(CORBA::ComponentIR::ProvidesDescription*,this->buffer_);
           this->maximum_ = 0;
           this->length_ = 0;
           this->buffer_ = 0;
@@ -3034,474 +1119,65 @@ IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean
 }
 
 ACE_INLINE
-const IR::ConsumesDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const IR::ConsumesDef ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_CONSUMESDEFSEQ_CI_)
-#define _IR_CONSUMESDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class IR::ConsumesDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-IR::ConsumesDefSeq_var::ConsumesDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IR::ConsumesDefSeq_var::ConsumesDefSeq_var (ConsumesDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IR::ConsumesDefSeq_var::ConsumesDefSeq_var (const ::IR::ConsumesDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IR::ConsumesDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::ConsumesDefSeq_var::~ConsumesDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IR::ConsumesDefSeq_var &
-IR::ConsumesDefSeq_var::operator= (ConsumesDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::IR::ConsumesDefSeq_var &
-IR::ConsumesDefSeq_var::operator= (const ::IR::ConsumesDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ConsumesDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ConsumesDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ConsumesDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::IR::ConsumesDefSeq *
-IR::ConsumesDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::ConsumesDefSeq *
-IR::ConsumesDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::ConsumesDefSeq_var::operator const ::IR::ConsumesDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::ConsumesDefSeq_var::operator ::IR::ConsumesDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::ConsumesDefSeq_var::operator ::IR::ConsumesDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IR::ConsumesDefSeq_var::operator ::IR::ConsumesDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::ConsumesDef, IR::ConsumesDef_var>
-IR::ConsumesDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::IR::ConsumesDefSeq &
-IR::ConsumesDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::ConsumesDefSeq &
-IR::ConsumesDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::ConsumesDefSeq *&
-IR::ConsumesDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::ConsumesDefSeq *
-IR::ConsumesDefSeq_var::_retn (void)
-{
-  ::IR::ConsumesDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::IR::ConsumesDefSeq *
-IR::ConsumesDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class IR::ConsumesDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-IR::ConsumesDefSeq_out::ConsumesDefSeq_out (ConsumesDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::ConsumesDefSeq_out::ConsumesDefSeq_out (ConsumesDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::ConsumesDefSeq_out::ConsumesDefSeq_out (const ::IR::ConsumesDefSeq_out &p)
-  : ptr_ (ACE_const_cast (ConsumesDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::IR::ConsumesDefSeq_out &
-IR::ConsumesDefSeq_out::operator= (const ::IR::ConsumesDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ConsumesDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::IR::ConsumesDefSeq_out &
-IR::ConsumesDefSeq_out::operator= (ConsumesDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IR::ConsumesDefSeq_out::operator ::IR::ConsumesDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::ConsumesDefSeq *&
-IR::ConsumesDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::ConsumesDefSeq *
-IR::ConsumesDefSeq_out::operator-> (void)
+const CORBA::ComponentIR::ProvidesDescription *
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::get_buffer (void) const
 {
-  return this->ptr_;
+  return ACE_reinterpret_cast (const CORBA::ComponentIR::ProvidesDescription * ACE_CAST_CONST, this->buffer_);
 }
 
 ACE_INLINE
-TAO_Object_Manager<IR::ConsumesDef, IR::ConsumesDef_var>
-IR::ConsumesDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_
-
-ACE_INLINE
-IR::FactoryDef **
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  IR::FactoryDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, IR::FactoryDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = IR::FactoryDef::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (IR::FactoryDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (
-    CORBA::ULong maximum,
+void
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::replace (
+    CORBA::ULong max,
     CORBA::ULong length,
-    IR::FactoryDef* *value,
+    CORBA::ComponentIR::ProvidesDescription *data,
     CORBA::Boolean release
   )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(
-    const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      IR::FactoryDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
-      IR::FactoryDef ** const tmp2 =
-        ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      IR::FactoryDef **tmp =
-        ACE_reinterpret_cast (IR::FactoryDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = IR::FactoryDef::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  IR::FactoryDef **tmp1 =
-    ACE_reinterpret_cast (IR::FactoryDef **, this->buffer_);
-  
-  IR::FactoryDef ** const tmp2 =
-    ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var>
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  IR::FactoryDef ** const tmp =
-    ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-IR::FactoryDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (CORBA::Boolean orphan)
 {
-  IR::FactoryDef **result = 0;
+  this->maximum_ = max;
+  this->length_ = length;
   
-  if (orphan == 0)
+  if (this->buffer_ && this->release_ == 1)
     {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(IR::FactoryDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
+      CORBA::ComponentIR::ProvidesDescription *tmp =
+        ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription*, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::freebuf (tmp);
     }
   
-  return result;
-}
-
-ACE_INLINE
-const IR::FactoryDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const IR::FactoryDef ** ACE_CAST_CONST, this->buffer_);
+  this->buffer_ = data;
+  this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
-#if !defined (_IR_FACTORYDEFSEQ_CI_)
-#define _IR_FACTORYDEFSEQ_CI_
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CI_)
+#define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
-// Inline operations for class IR::FactoryDefSeq_var
+// Inline operations for class CORBA::ComponentIR::ProvidesDescriptionSeq_var
 // *************************************************************
 
 ACE_INLINE
-IR::FactoryDefSeq_var::FactoryDefSeq_var (void)
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::ProvidesDescriptionSeq_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-IR::FactoryDefSeq_var::FactoryDefSeq_var (FactoryDefSeq *p)
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::ProvidesDescriptionSeq_var (ProvidesDescriptionSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-IR::FactoryDefSeq_var::FactoryDefSeq_var (const ::IR::FactoryDefSeq_var &p)
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::ProvidesDescriptionSeq_var (const ::CORBA::ComponentIR::ProvidesDescriptionSeq_var &p)
 {
   if (p.ptr_)
     {
-      ACE_NEW (this->ptr_, ::IR::FactoryDefSeq (*p.ptr_));
+      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::ProvidesDescriptionSeq (*p.ptr_));
     }
   else
     {
@@ -3510,14 +1186,14 @@ IR::FactoryDefSeq_var::FactoryDefSeq_var (const ::IR::FactoryDefSeq_var &p)
 }
 
 ACE_INLINE
-IR::FactoryDefSeq_var::~FactoryDefSeq_var (void)
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::~ProvidesDescriptionSeq_var (void)
 {
   delete this->ptr_;
 }
 
 ACE_INLINE
-IR::FactoryDefSeq_var &
-IR::FactoryDefSeq_var::operator= (FactoryDefSeq *p)
+CORBA::ComponentIR::ProvidesDescriptionSeq_var &
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator= (ProvidesDescriptionSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
@@ -3525,8 +1201,8 @@ IR::FactoryDefSeq_var::operator= (FactoryDefSeq *p)
 }
 
 ACE_INLINE
-::IR::FactoryDefSeq_var &
-IR::FactoryDefSeq_var::operator= (const ::IR::FactoryDefSeq_var &p)
+::CORBA::ComponentIR::ProvidesDescriptionSeq_var &
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator= (const ::CORBA::ComponentIR::ProvidesDescriptionSeq_var &p)
 {
   if (this != &p)
     {
@@ -3537,16 +1213,16 @@ IR::FactoryDefSeq_var::operator= (const ::IR::FactoryDefSeq_var &p)
         }
       else
         {
-          FactoryDefSeq *deep_copy = 0;
+          ProvidesDescriptionSeq *deep_copy = 0;
           ACE_NEW_RETURN (
               deep_copy,
-              FactoryDefSeq (*p.ptr_),
+              ProvidesDescriptionSeq (*p.ptr_),
               *this
             );
           
           if (deep_copy != 0)
             {
-              FactoryDefSeq *tmp = deep_copy;
+              ProvidesDescriptionSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -3558,500 +1234,75 @@ IR::FactoryDefSeq_var::operator= (const ::IR::FactoryDefSeq_var &p)
 }
 
 ACE_INLINE
-const ::IR::FactoryDefSeq *
-IR::FactoryDefSeq_var::operator-> (void) const
+const ::CORBA::ComponentIR::ProvidesDescriptionSeq *
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-::IR::FactoryDefSeq *
-IR::FactoryDefSeq_var::operator-> (void)
+::CORBA::ComponentIR::ProvidesDescriptionSeq *
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-IR::FactoryDefSeq_var::operator const ::IR::FactoryDefSeq &() const // cast
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator const ::CORBA::ComponentIR::ProvidesDescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::FactoryDefSeq_var::operator ::IR::FactoryDefSeq &() // cast 
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator ::CORBA::ComponentIR::ProvidesDescriptionSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::FactoryDefSeq_var::operator ::IR::FactoryDefSeq &() const // cast 
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator ::CORBA::ComponentIR::ProvidesDescriptionSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-IR::FactoryDefSeq_var::operator ::IR::FactoryDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::FactoryDef, IR::FactoryDef_var>
-IR::FactoryDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::IR::FactoryDefSeq &
-IR::FactoryDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::FactoryDefSeq &
-IR::FactoryDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::FactoryDefSeq *&
-IR::FactoryDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::FactoryDefSeq *
-IR::FactoryDefSeq_var::_retn (void)
-{
-  ::IR::FactoryDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::IR::FactoryDefSeq *
-IR::FactoryDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class IR::FactoryDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-IR::FactoryDefSeq_out::FactoryDefSeq_out (FactoryDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::FactoryDefSeq_out::FactoryDefSeq_out (FactoryDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::FactoryDefSeq_out::FactoryDefSeq_out (const ::IR::FactoryDefSeq_out &p)
-  : ptr_ (ACE_const_cast (FactoryDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::IR::FactoryDefSeq_out &
-IR::FactoryDefSeq_out::operator= (const ::IR::FactoryDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (FactoryDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::IR::FactoryDefSeq_out &
-IR::FactoryDefSeq_out::operator= (FactoryDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IR::FactoryDefSeq_out::operator ::IR::FactoryDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IR::FactoryDefSeq *&
-IR::FactoryDefSeq_out::ptr (void) // ptr
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator ::CORBA::ComponentIR::ProvidesDescriptionSeq *&() // cast 
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-::IR::FactoryDefSeq *
-IR::FactoryDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::FactoryDef, IR::FactoryDef_var>
-IR::FactoryDefSeq_out::operator[] (CORBA::ULong index)
+CORBA::ComponentIR::ProvidesDescription &
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_
-
-ACE_INLINE
-IR::FinderDef **
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  IR::FinderDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, IR::FinderDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = IR::FinderDef::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (IR::FinderDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    IR::FinderDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(
-    const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      IR::FinderDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
-      IR::FinderDef ** const tmp2 =
-        ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      IR::FinderDef **tmp =
-        ACE_reinterpret_cast (IR::FinderDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = IR::FinderDef::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  IR::FinderDef **tmp1 =
-    ACE_reinterpret_cast (IR::FinderDef **, this->buffer_);
-  
-  IR::FinderDef ** const tmp2 =
-    ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var>
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  IR::FinderDef ** const tmp =
-    ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-IR::FinderDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  IR::FinderDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(IR::FinderDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const IR::FinderDef* *
-IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const IR::FinderDef ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IR_FINDERDEFSEQ_CI_)
-#define _IR_FINDERDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class IR::FinderDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-IR::FinderDefSeq_var::FinderDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IR::FinderDefSeq_var::FinderDefSeq_var (FinderDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IR::FinderDefSeq_var::FinderDefSeq_var (const ::IR::FinderDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IR::FinderDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::FinderDefSeq_var::~FinderDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IR::FinderDefSeq_var &
-IR::FinderDefSeq_var::operator= (FinderDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::IR::FinderDefSeq_var &
-IR::FinderDefSeq_var::operator= (const ::IR::FinderDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          FinderDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              FinderDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              FinderDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::IR::FinderDefSeq *
-IR::FinderDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
 ACE_INLINE
-::IR::FinderDefSeq *
-IR::FinderDefSeq_var::operator-> (void)
+const CORBA::ComponentIR::ProvidesDescription &
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator[] (CORBA::ULong index) const
 {
-  return this->ptr_;
+  return ACE_const_cast (const CORBA::ComponentIR::ProvidesDescription &, this->ptr_->operator[] (index));
 }
 
 ACE_INLINE
-IR::FinderDefSeq_var::operator const ::IR::FinderDefSeq &() const // cast
+const ::CORBA::ComponentIR::ProvidesDescriptionSeq &
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::FinderDefSeq_var::operator ::IR::FinderDefSeq &() // cast 
+::CORBA::ComponentIR::ProvidesDescriptionSeq &
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::FinderDefSeq_var::operator ::IR::FinderDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IR::FinderDefSeq_var::operator ::IR::FinderDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<IR::FinderDef, IR::FinderDef_var>
-IR::FinderDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::IR::FinderDefSeq &
-IR::FinderDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::FinderDefSeq &
-IR::FinderDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IR::FinderDefSeq *&
-IR::FinderDefSeq_var::out (void)
+::CORBA::ComponentIR::ProvidesDescriptionSeq *&
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
@@ -4059,37 +1310,37 @@ IR::FinderDefSeq_var::out (void)
 }
 
 ACE_INLINE
-::IR::FinderDefSeq *
-IR::FinderDefSeq_var::_retn (void)
+::CORBA::ComponentIR::ProvidesDescriptionSeq *
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::_retn (void)
 {
-  ::IR::FinderDefSeq *tmp = this->ptr_;
+  ::CORBA::ComponentIR::ProvidesDescriptionSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
 ACE_INLINE
-::IR::FinderDefSeq *
-IR::FinderDefSeq_var::ptr (void) const
+::CORBA::ComponentIR::ProvidesDescriptionSeq *
+CORBA::ComponentIR::ProvidesDescriptionSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
-// Inline operations for class IR::FinderDefSeq_out
+// Inline operations for class CORBA::ComponentIR::ProvidesDescriptionSeq_out
 // *************************************************************
 
 ACE_INLINE
-IR::FinderDefSeq_out::FinderDefSeq_out (FinderDefSeq *&p)
+CORBA::ComponentIR::ProvidesDescriptionSeq_out::ProvidesDescriptionSeq_out (ProvidesDescriptionSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-IR::FinderDefSeq_out::FinderDefSeq_out (FinderDefSeq_var &p)
+CORBA::ComponentIR::ProvidesDescriptionSeq_out::ProvidesDescriptionSeq_out (ProvidesDescriptionSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -4097,573 +1348,94 @@ IR::FinderDefSeq_out::FinderDefSeq_out (FinderDefSeq_var &p)
 }
 
 ACE_INLINE
-IR::FinderDefSeq_out::FinderDefSeq_out (const ::IR::FinderDefSeq_out &p)
-  : ptr_ (ACE_const_cast (FinderDefSeq_out&, p).ptr_)
+CORBA::ComponentIR::ProvidesDescriptionSeq_out::ProvidesDescriptionSeq_out (const ::CORBA::ComponentIR::ProvidesDescriptionSeq_out &p)
+  : ptr_ (ACE_const_cast (ProvidesDescriptionSeq_out&, p).ptr_)
 {}
 
 ACE_INLINE
-::IR::FinderDefSeq_out &
-IR::FinderDefSeq_out::operator= (const ::IR::FinderDefSeq_out &p)
+::CORBA::ComponentIR::ProvidesDescriptionSeq_out &
+CORBA::ComponentIR::ProvidesDescriptionSeq_out::operator= (const ::CORBA::ComponentIR::ProvidesDescriptionSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (FinderDefSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (ProvidesDescriptionSeq_out&, p).ptr_;
   return *this;
 }
 
 ACE_INLINE
-::IR::FinderDefSeq_out &
-IR::FinderDefSeq_out::operator= (FinderDefSeq *p)
+::CORBA::ComponentIR::ProvidesDescriptionSeq_out &
+CORBA::ComponentIR::ProvidesDescriptionSeq_out::operator= (ProvidesDescriptionSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE
-IR::FinderDefSeq_out::operator ::IR::FinderDefSeq *&() // cast
+CORBA::ComponentIR::ProvidesDescriptionSeq_out::operator ::CORBA::ComponentIR::ProvidesDescriptionSeq *&() // cast
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-::IR::FinderDefSeq *&
-IR::FinderDefSeq_out::ptr (void) // ptr
+::CORBA::ComponentIR::ProvidesDescriptionSeq *&
+CORBA::ComponentIR::ProvidesDescriptionSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-::IR::FinderDefSeq *
-IR::FinderDefSeq_out::operator-> (void)
+::CORBA::ComponentIR::ProvidesDescriptionSeq *
+CORBA::ComponentIR::ProvidesDescriptionSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-TAO_Object_Manager<IR::FinderDef, IR::FinderDef_var>
-IR::FinderDefSeq_out::operator[] (CORBA::ULong index)
+CORBA::ComponentIR::ProvidesDescription &
+CORBA::ComponentIR::ProvidesDescriptionSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_IR_COMPONENTREPOSITORY___CI_)
-#define _IR_COMPONENTREPOSITORY___CI_
-
-ACE_INLINE
-IR::ComponentRepository::ComponentRepository (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
-{
-  this->IR_ComponentRepository_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_IR_PROVIDESDEF___CI_)
-#define _IR_PROVIDESDEF___CI_
-
-ACE_INLINE
-IR::ProvidesDef::ProvidesDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
-{
-  this->IR_ProvidesDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class IR::ProvidesDescription_var
-// *************************************************************
-
-ACE_INLINE
-IR::ProvidesDescription_var::ProvidesDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IR::ProvidesDescription_var::ProvidesDescription_var (ProvidesDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IR::ProvidesDescription_var::ProvidesDescription_var (const ::IR::ProvidesDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IR::ProvidesDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::ProvidesDescription_var::~ProvidesDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IR::ProvidesDescription_var &
-IR::ProvidesDescription_var::operator= (ProvidesDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::IR::ProvidesDescription_var &
-IR::ProvidesDescription_var::operator= (const ::IR::ProvidesDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ProvidesDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ProvidesDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ProvidesDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::IR::ProvidesDescription *
-IR::ProvidesDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::ProvidesDescription *
-IR::ProvidesDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::ProvidesDescription_var::operator const ::IR::ProvidesDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::ProvidesDescription_var::operator ::IR::ProvidesDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::ProvidesDescription_var::operator ::IR::ProvidesDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IR::ProvidesDescription_var::operator ::IR::ProvidesDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::IR::ProvidesDescription &
-IR::ProvidesDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IR::ProvidesDescription &
-IR::ProvidesDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::IR::ProvidesDescription *&
-IR::ProvidesDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::ProvidesDescription *
-IR::ProvidesDescription_var::_retn (void)
-{
-  ::IR::ProvidesDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IR::ProvidesDescription *
-IR::ProvidesDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class IR::ProvidesDescription_out
-// *************************************************************
-
-ACE_INLINE
-IR::ProvidesDescription_out::ProvidesDescription_out (::IR::ProvidesDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::ProvidesDescription_out::ProvidesDescription_out (ProvidesDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::ProvidesDescription_out::ProvidesDescription_out (const ::IR::ProvidesDescription_out &p)
-  : ptr_ (ACE_const_cast (ProvidesDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-IR::ProvidesDescription_out &
-IR::ProvidesDescription_out::operator= (const ::IR::ProvidesDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (ProvidesDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-IR::ProvidesDescription_out &
-IR::ProvidesDescription_out::operator= (ProvidesDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-IR::ProvidesDescription_out::operator ::IR::ProvidesDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::ProvidesDescription *&
-IR::ProvidesDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::ProvidesDescription *
-IR::ProvidesDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_IR_USESDEF___CI_)
-#define _IR_USESDEF___CI_
-
-ACE_INLINE
-IR::UsesDef::UsesDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
-{
-  this->IR_UsesDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class IR::UsesDescription_var
-// *************************************************************
-
-ACE_INLINE
-IR::UsesDescription_var::UsesDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IR::UsesDescription_var::UsesDescription_var (UsesDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IR::UsesDescription_var::UsesDescription_var (const ::IR::UsesDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IR::UsesDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::UsesDescription_var::~UsesDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IR::UsesDescription_var &
-IR::UsesDescription_var::operator= (UsesDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::IR::UsesDescription_var &
-IR::UsesDescription_var::operator= (const ::IR::UsesDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          UsesDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              UsesDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              UsesDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::IR::UsesDescription *
-IR::UsesDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::UsesDescription *
-IR::UsesDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::UsesDescription_var::operator const ::IR::UsesDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::UsesDescription_var::operator ::IR::UsesDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::UsesDescription_var::operator ::IR::UsesDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IR::UsesDescription_var::operator ::IR::UsesDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::IR::UsesDescription &
-IR::UsesDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IR::UsesDescription &
-IR::UsesDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::IR::UsesDescription *&
-IR::UsesDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::UsesDescription *
-IR::UsesDescription_var::_retn (void)
-{
-  ::IR::UsesDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IR::UsesDescription *
-IR::UsesDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class IR::UsesDescription_out
-// *************************************************************
-
-ACE_INLINE
-IR::UsesDescription_out::UsesDescription_out (::IR::UsesDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::UsesDescription_out::UsesDescription_out (UsesDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::UsesDescription_out::UsesDescription_out (const ::IR::UsesDescription_out &p)
-  : ptr_ (ACE_const_cast (UsesDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-IR::UsesDescription_out &
-IR::UsesDescription_out::operator= (const ::IR::UsesDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (UsesDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-IR::UsesDescription_out &
-IR::UsesDescription_out::operator= (UsesDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-IR::UsesDescription_out::operator ::IR::UsesDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::UsesDescription *&
-IR::UsesDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::UsesDescription *
-IR::UsesDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CI_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CI_
 
 ACE_INLINE
-IR::ProvidesDescription *
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (CORBA::ULong size)
+CORBA::ComponentIR::UsesDescription *
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (CORBA::ULong size)
 {
-  IR::ProvidesDescription *retval = 0;
-  ACE_NEW_RETURN (retval, IR::ProvidesDescription[size], 0);
+  CORBA::ComponentIR::UsesDescription *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA::ComponentIR::UsesDescription[size], 0);
   return retval;
 }
 
 ACE_INLINE
-void IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (IR::ProvidesDescription *buffer)
+void CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::freebuf (CORBA::ComponentIR::UsesDescription *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void)
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (void)
 {
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (maximum))
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (CORBA::ULong maximum) 
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (
     CORBA::ULong maximum,
     CORBA::ULong length,
-    IR::ProvidesDescription *data,
+    CORBA::ComponentIR::UsesDescription *data,
     CORBA::Boolean release
   )
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
@@ -4671,17 +1443,17 @@ IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_Provi
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (
-    const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (
+    const _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq &rhs
   )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      IR::ProvidesDescription *tmp1 =
-        _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->maximum_);
-      IR::ProvidesDescription * const tmp2 =
-        ACE_reinterpret_cast (IR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
+      CORBA::ComponentIR::UsesDescription *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (this->maximum_);
+      CORBA::ComponentIR::UsesDescription * const tmp2 =
+        ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -4697,9 +1469,9 @@ IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_Provi
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq &
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator= (
-    const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq &
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq &rhs
   )
 {
   if (this == &rhs)
@@ -4712,27 +1484,27 @@ IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator= (
       if (this->maximum_ < rhs.maximum_)
         {
           // Free the old buffer.
-          IR::ProvidesDescription *tmp =
-            ACE_reinterpret_cast (IR::ProvidesDescription *, this->buffer_);
+          CORBA::ComponentIR::UsesDescription *tmp =
+            ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription *, this->buffer_);
           
-          _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
+          _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::freebuf (tmp);
           
           this->buffer_ =
-            _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (rhs.maximum_);
+            _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (rhs.maximum_);
         }
     }
   else
     {
       this->buffer_ =
-        _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (rhs.maximum_);
+        _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (rhs.maximum_);
     }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  IR::ProvidesDescription *tmp1 =
-    ACE_reinterpret_cast (IR::ProvidesDescription *, this->buffer_);
-  IR::ProvidesDescription * const tmp2 =
-    ACE_reinterpret_cast (IR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
+  CORBA::ComponentIR::UsesDescription *tmp1 =
+    ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription *, this->buffer_);
+  CORBA::ComponentIR::UsesDescription * const tmp2 =
+    ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
@@ -4744,32 +1516,32 @@ IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator= (
 
 // = Accessors.
 ACE_INLINE
-IR::ProvidesDescription &
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i)
+CORBA::ComponentIR::UsesDescription &
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::operator[] (CORBA::ULong i)
 {
   ACE_ASSERT (i < this->maximum_);
-  IR::ProvidesDescription* tmp =
-    ACE_reinterpret_cast (IR::ProvidesDescription*, this->buffer_);
+  CORBA::ComponentIR::UsesDescription* tmp =
+    ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription*, this->buffer_);
   return tmp[i];
 }
 
 ACE_INLINE
-const IR::ProvidesDescription &
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i) const
+const CORBA::ComponentIR::UsesDescription &
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::operator[] (CORBA::ULong i) const
 {
   ACE_ASSERT (i < this->maximum_);
-  IR::ProvidesDescription * const tmp =
-    ACE_reinterpret_cast (IR::ProvidesDescription* ACE_CAST_CONST, this->buffer_);
+  CORBA::ComponentIR::UsesDescription * const tmp =
+    ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
 ACE_INLINE
-IR::ProvidesDescription *
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orphan)
+CORBA::ComponentIR::UsesDescription *
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::get_buffer (CORBA::Boolean orphan)
 {
-  IR::ProvidesDescription *result = 0;
+  CORBA::ComponentIR::UsesDescription *result = 0;
   
   if (orphan == 0)
     {
@@ -4777,14 +1549,14 @@ IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orpha
       if (this->buffer_ == 0)
         {
           result =
-            _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->length_);
+            _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (this->length_);
           this->buffer_ = result;
           this->release_ = 1;
         }
       else
         {
           result =
-            ACE_reinterpret_cast (IR::ProvidesDescription*, this->buffer_);
+            ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription*, this->buffer_);
         }
     }
   else // if (orphan == 1)
@@ -4793,7 +1565,7 @@ IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orpha
         {
           // We set the state back to default and relinquish ownership.
           result =
-            ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
+            ACE_reinterpret_cast(CORBA::ComponentIR::UsesDescription*,this->buffer_);
           this->maximum_ = 0;
           this->length_ = 0;
           this->buffer_ = 0;
@@ -4805,18 +1577,18 @@ IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orpha
 }
 
 ACE_INLINE
-const IR::ProvidesDescription *
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (void) const
+const CORBA::ComponentIR::UsesDescription *
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast (const IR::ProvidesDescription * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::ComponentIR::UsesDescription * ACE_CAST_CONST, this->buffer_);
 }
 
 ACE_INLINE
 void
-IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::replace (
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::replace (
     CORBA::ULong max,
     CORBA::ULong length,
-    IR::ProvidesDescription *data,
+    CORBA::ComponentIR::UsesDescription *data,
     CORBA::Boolean release
   )
 {
@@ -4825,9 +1597,9 @@ IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::replace (
   
   if (this->buffer_ && this->release_ == 1)
     {
-      IR::ProvidesDescription *tmp =
-        ACE_reinterpret_cast (IR::ProvidesDescription*, this->buffer_);
-      _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
+      CORBA::ComponentIR::UsesDescription *tmp =
+        ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription*, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::freebuf (tmp);
     }
   
   this->buffer_ = data;
@@ -4838,32 +1610,32 @@ IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::replace (
 
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
-#if !defined (_IR_PROVIDESDESCSEQ_CI_)
-#define _IR_PROVIDESDESCSEQ_CI_
+#if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CI_)
+#define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
-// Inline operations for class IR::ProvidesDescSeq_var
+// Inline operations for class CORBA::ComponentIR::UsesDescriptionSeq_var
 // *************************************************************
 
 ACE_INLINE
-IR::ProvidesDescSeq_var::ProvidesDescSeq_var (void)
+CORBA::ComponentIR::UsesDescriptionSeq_var::UsesDescriptionSeq_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-IR::ProvidesDescSeq_var::ProvidesDescSeq_var (ProvidesDescSeq *p)
+CORBA::ComponentIR::UsesDescriptionSeq_var::UsesDescriptionSeq_var (UsesDescriptionSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-IR::ProvidesDescSeq_var::ProvidesDescSeq_var (const ::IR::ProvidesDescSeq_var &p)
+CORBA::ComponentIR::UsesDescriptionSeq_var::UsesDescriptionSeq_var (const ::CORBA::ComponentIR::UsesDescriptionSeq_var &p)
 {
   if (p.ptr_)
     {
-      ACE_NEW (this->ptr_, ::IR::ProvidesDescSeq (*p.ptr_));
+      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::UsesDescriptionSeq (*p.ptr_));
     }
   else
     {
@@ -4872,14 +1644,14 @@ IR::ProvidesDescSeq_var::ProvidesDescSeq_var (const ::IR::ProvidesDescSeq_var &p
 }
 
 ACE_INLINE
-IR::ProvidesDescSeq_var::~ProvidesDescSeq_var (void)
+CORBA::ComponentIR::UsesDescriptionSeq_var::~UsesDescriptionSeq_var (void)
 {
   delete this->ptr_;
 }
 
 ACE_INLINE
-IR::ProvidesDescSeq_var &
-IR::ProvidesDescSeq_var::operator= (ProvidesDescSeq *p)
+CORBA::ComponentIR::UsesDescriptionSeq_var &
+CORBA::ComponentIR::UsesDescriptionSeq_var::operator= (UsesDescriptionSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
@@ -4887,8 +1659,8 @@ IR::ProvidesDescSeq_var::operator= (ProvidesDescSeq *p)
 }
 
 ACE_INLINE
-::IR::ProvidesDescSeq_var &
-IR::ProvidesDescSeq_var::operator= (const ::IR::ProvidesDescSeq_var &p)
+::CORBA::ComponentIR::UsesDescriptionSeq_var &
+CORBA::ComponentIR::UsesDescriptionSeq_var::operator= (const ::CORBA::ComponentIR::UsesDescriptionSeq_var &p)
 {
   if (this != &p)
     {
@@ -4899,16 +1671,16 @@ IR::ProvidesDescSeq_var::operator= (const ::IR::ProvidesDescSeq_var &p)
         }
       else
         {
-          ProvidesDescSeq *deep_copy = 0;
+          UsesDescriptionSeq *deep_copy = 0;
           ACE_NEW_RETURN (
               deep_copy,
-              ProvidesDescSeq (*p.ptr_),
+              UsesDescriptionSeq (*p.ptr_),
               *this
             );
           
           if (deep_copy != 0)
             {
-              ProvidesDescSeq *tmp = deep_copy;
+              UsesDescriptionSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -4920,75 +1692,75 @@ IR::ProvidesDescSeq_var::operator= (const ::IR::ProvidesDescSeq_var &p)
 }
 
 ACE_INLINE
-const ::IR::ProvidesDescSeq *
-IR::ProvidesDescSeq_var::operator-> (void) const
+const ::CORBA::ComponentIR::UsesDescriptionSeq *
+CORBA::ComponentIR::UsesDescriptionSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-::IR::ProvidesDescSeq *
-IR::ProvidesDescSeq_var::operator-> (void)
+::CORBA::ComponentIR::UsesDescriptionSeq *
+CORBA::ComponentIR::UsesDescriptionSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-IR::ProvidesDescSeq_var::operator const ::IR::ProvidesDescSeq &() const // cast
+CORBA::ComponentIR::UsesDescriptionSeq_var::operator const ::CORBA::ComponentIR::UsesDescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::ProvidesDescSeq_var::operator ::IR::ProvidesDescSeq &() // cast 
+CORBA::ComponentIR::UsesDescriptionSeq_var::operator ::CORBA::ComponentIR::UsesDescriptionSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::ProvidesDescSeq_var::operator ::IR::ProvidesDescSeq &() const // cast 
+CORBA::ComponentIR::UsesDescriptionSeq_var::operator ::CORBA::ComponentIR::UsesDescriptionSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-IR::ProvidesDescSeq_var::operator ::IR::ProvidesDescSeq *&() // cast 
+CORBA::ComponentIR::UsesDescriptionSeq_var::operator ::CORBA::ComponentIR::UsesDescriptionSeq *&() // cast 
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-IR::ProvidesDescription &
-IR::ProvidesDescSeq_var::operator[] (CORBA::ULong index)
+CORBA::ComponentIR::UsesDescription &
+CORBA::ComponentIR::UsesDescriptionSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
 ACE_INLINE
-const IR::ProvidesDescription &
-IR::ProvidesDescSeq_var::operator[] (CORBA::ULong index) const
+const CORBA::ComponentIR::UsesDescription &
+CORBA::ComponentIR::UsesDescriptionSeq_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const IR::ProvidesDescription &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const CORBA::ComponentIR::UsesDescription &, this->ptr_->operator[] (index));
 }
 
 ACE_INLINE
-const ::IR::ProvidesDescSeq &
-IR::ProvidesDescSeq_var::in (void) const
+const ::CORBA::ComponentIR::UsesDescriptionSeq &
+CORBA::ComponentIR::UsesDescriptionSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-::IR::ProvidesDescSeq &
-IR::ProvidesDescSeq_var::inout (void)
+::CORBA::ComponentIR::UsesDescriptionSeq &
+CORBA::ComponentIR::UsesDescriptionSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-::IR::ProvidesDescSeq *&
-IR::ProvidesDescSeq_var::out (void)
+::CORBA::ComponentIR::UsesDescriptionSeq *&
+CORBA::ComponentIR::UsesDescriptionSeq_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
@@ -4996,37 +1768,37 @@ IR::ProvidesDescSeq_var::out (void)
 }
 
 ACE_INLINE
-::IR::ProvidesDescSeq *
-IR::ProvidesDescSeq_var::_retn (void)
+::CORBA::ComponentIR::UsesDescriptionSeq *
+CORBA::ComponentIR::UsesDescriptionSeq_var::_retn (void)
 {
-  ::IR::ProvidesDescSeq *tmp = this->ptr_;
+  ::CORBA::ComponentIR::UsesDescriptionSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
 ACE_INLINE
-::IR::ProvidesDescSeq *
-IR::ProvidesDescSeq_var::ptr (void) const
+::CORBA::ComponentIR::UsesDescriptionSeq *
+CORBA::ComponentIR::UsesDescriptionSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
-// Inline operations for class IR::ProvidesDescSeq_out
+// Inline operations for class CORBA::ComponentIR::UsesDescriptionSeq_out
 // *************************************************************
 
 ACE_INLINE
-IR::ProvidesDescSeq_out::ProvidesDescSeq_out (ProvidesDescSeq *&p)
+CORBA::ComponentIR::UsesDescriptionSeq_out::UsesDescriptionSeq_out (UsesDescriptionSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-IR::ProvidesDescSeq_out::ProvidesDescSeq_out (ProvidesDescSeq_var &p)
+CORBA::ComponentIR::UsesDescriptionSeq_out::UsesDescriptionSeq_out (UsesDescriptionSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -5034,49 +1806,49 @@ IR::ProvidesDescSeq_out::ProvidesDescSeq_out (ProvidesDescSeq_var &p)
 }
 
 ACE_INLINE
-IR::ProvidesDescSeq_out::ProvidesDescSeq_out (const ::IR::ProvidesDescSeq_out &p)
-  : ptr_ (ACE_const_cast (ProvidesDescSeq_out&, p).ptr_)
+CORBA::ComponentIR::UsesDescriptionSeq_out::UsesDescriptionSeq_out (const ::CORBA::ComponentIR::UsesDescriptionSeq_out &p)
+  : ptr_ (ACE_const_cast (UsesDescriptionSeq_out&, p).ptr_)
 {}
 
 ACE_INLINE
-::IR::ProvidesDescSeq_out &
-IR::ProvidesDescSeq_out::operator= (const ::IR::ProvidesDescSeq_out &p)
+::CORBA::ComponentIR::UsesDescriptionSeq_out &
+CORBA::ComponentIR::UsesDescriptionSeq_out::operator= (const ::CORBA::ComponentIR::UsesDescriptionSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (ProvidesDescSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (UsesDescriptionSeq_out&, p).ptr_;
   return *this;
 }
 
 ACE_INLINE
-::IR::ProvidesDescSeq_out &
-IR::ProvidesDescSeq_out::operator= (ProvidesDescSeq *p)
+::CORBA::ComponentIR::UsesDescriptionSeq_out &
+CORBA::ComponentIR::UsesDescriptionSeq_out::operator= (UsesDescriptionSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE
-IR::ProvidesDescSeq_out::operator ::IR::ProvidesDescSeq *&() // cast
+CORBA::ComponentIR::UsesDescriptionSeq_out::operator ::CORBA::ComponentIR::UsesDescriptionSeq *&() // cast
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-::IR::ProvidesDescSeq *&
-IR::ProvidesDescSeq_out::ptr (void) // ptr
+::CORBA::ComponentIR::UsesDescriptionSeq *&
+CORBA::ComponentIR::UsesDescriptionSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-::IR::ProvidesDescSeq *
-IR::ProvidesDescSeq_out::operator-> (void)
+::CORBA::ComponentIR::UsesDescriptionSeq *
+CORBA::ComponentIR::UsesDescriptionSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-IR::ProvidesDescription &
-IR::ProvidesDescSeq_out::operator[] (CORBA::ULong index)
+CORBA::ComponentIR::UsesDescription &
+CORBA::ComponentIR::UsesDescriptionSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
@@ -5084,44 +1856,44 @@ IR::ProvidesDescSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CI_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CI_
 
 ACE_INLINE
-IR::UsesDescription *
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (CORBA::ULong size)
+CORBA::ComponentIR::EventPortDescription *
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (CORBA::ULong size)
 {
-  IR::UsesDescription *retval = 0;
-  ACE_NEW_RETURN (retval, IR::UsesDescription[size], 0);
+  CORBA::ComponentIR::EventPortDescription *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA::ComponentIR::EventPortDescription[size], 0);
   return retval;
 }
 
 ACE_INLINE
-void IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (IR::UsesDescription *buffer)
+void CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::freebuf (CORBA::ComponentIR::EventPortDescription *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (void)
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (void)
 {
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (maximum))
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (CORBA::ULong maximum) 
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (
     CORBA::ULong maximum,
     CORBA::ULong length,
-    IR::UsesDescription *data,
+    CORBA::ComponentIR::EventPortDescription *data,
     CORBA::Boolean release
   )
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
@@ -5129,17 +1901,17 @@ IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescS
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (
-    const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (
+    const _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq &rhs
   )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      IR::UsesDescription *tmp1 =
-        _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->maximum_);
-      IR::UsesDescription * const tmp2 =
-        ACE_reinterpret_cast (IR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
+      CORBA::ComponentIR::EventPortDescription *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (this->maximum_);
+      CORBA::ComponentIR::EventPortDescription * const tmp2 =
+        ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription * ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -5155,9 +1927,9 @@ IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescS
 }
 
 ACE_INLINE
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq &
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator= (
-    const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq &
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq &rhs
   )
 {
   if (this == &rhs)
@@ -5170,27 +1942,27 @@ IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator= (
       if (this->maximum_ < rhs.maximum_)
         {
           // Free the old buffer.
-          IR::UsesDescription *tmp =
-            ACE_reinterpret_cast (IR::UsesDescription *, this->buffer_);
+          CORBA::ComponentIR::EventPortDescription *tmp =
+            ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription *, this->buffer_);
           
-          _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
+          _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::freebuf (tmp);
           
           this->buffer_ =
-            _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (rhs.maximum_);
+            _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (rhs.maximum_);
         }
     }
   else
     {
       this->buffer_ =
-        _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (rhs.maximum_);
+        _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (rhs.maximum_);
     }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  IR::UsesDescription *tmp1 =
-    ACE_reinterpret_cast (IR::UsesDescription *, this->buffer_);
-  IR::UsesDescription * const tmp2 =
-    ACE_reinterpret_cast (IR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
+  CORBA::ComponentIR::EventPortDescription *tmp1 =
+    ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription *, this->buffer_);
+  CORBA::ComponentIR::EventPortDescription * const tmp2 =
+    ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
@@ -5202,32 +1974,32 @@ IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator= (
 
 // = Accessors.
 ACE_INLINE
-IR::UsesDescription &
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i)
+CORBA::ComponentIR::EventPortDescription &
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::operator[] (CORBA::ULong i)
 {
   ACE_ASSERT (i < this->maximum_);
-  IR::UsesDescription* tmp =
-    ACE_reinterpret_cast (IR::UsesDescription*, this->buffer_);
+  CORBA::ComponentIR::EventPortDescription* tmp =
+    ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription*, this->buffer_);
   return tmp[i];
 }
 
 ACE_INLINE
-const IR::UsesDescription &
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i) const
+const CORBA::ComponentIR::EventPortDescription &
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::operator[] (CORBA::ULong i) const
 {
   ACE_ASSERT (i < this->maximum_);
-  IR::UsesDescription * const tmp =
-    ACE_reinterpret_cast (IR::UsesDescription* ACE_CAST_CONST, this->buffer_);
+  CORBA::ComponentIR::EventPortDescription * const tmp =
+    ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
 ACE_INLINE
-IR::UsesDescription *
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
+CORBA::ComponentIR::EventPortDescription *
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::get_buffer (CORBA::Boolean orphan)
 {
-  IR::UsesDescription *result = 0;
+  CORBA::ComponentIR::EventPortDescription *result = 0;
   
   if (orphan == 0)
     {
@@ -5235,14 +2007,14 @@ IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
       if (this->buffer_ == 0)
         {
           result =
-            _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->length_);
+            _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (this->length_);
           this->buffer_ = result;
           this->release_ = 1;
         }
       else
         {
           result =
-            ACE_reinterpret_cast (IR::UsesDescription*, this->buffer_);
+            ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription*, this->buffer_);
         }
     }
   else // if (orphan == 1)
@@ -5251,7 +2023,7 @@ IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
         {
           // We set the state back to default and relinquish ownership.
           result =
-            ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
+            ACE_reinterpret_cast(CORBA::ComponentIR::EventPortDescription*,this->buffer_);
           this->maximum_ = 0;
           this->length_ = 0;
           this->buffer_ = 0;
@@ -5263,18 +2035,18 @@ IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
 }
 
 ACE_INLINE
-const IR::UsesDescription *
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (void) const
+const CORBA::ComponentIR::EventPortDescription *
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast (const IR::UsesDescription * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::ComponentIR::EventPortDescription * ACE_CAST_CONST, this->buffer_);
 }
 
 ACE_INLINE
 void
-IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::replace (
+CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::replace (
     CORBA::ULong max,
     CORBA::ULong length,
-    IR::UsesDescription *data,
+    CORBA::ComponentIR::EventPortDescription *data,
     CORBA::Boolean release
   )
 {
@@ -5283,9 +2055,9 @@ IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::replace (
   
   if (this->buffer_ && this->release_ == 1)
     {
-      IR::UsesDescription *tmp =
-        ACE_reinterpret_cast (IR::UsesDescription*, this->buffer_);
-      _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
+      CORBA::ComponentIR::EventPortDescription *tmp =
+        ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription*, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::freebuf (tmp);
     }
   
   this->buffer_ = data;
@@ -5296,32 +2068,32 @@ IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::replace (
 
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
-#if !defined (_IR_USESDESCSEQ_CI_)
-#define _IR_USESDESCSEQ_CI_
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CI_)
+#define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
-// Inline operations for class IR::UsesDescSeq_var
+// Inline operations for class CORBA::ComponentIR::EventPortDescriptionSeq_var
 // *************************************************************
 
 ACE_INLINE
-IR::UsesDescSeq_var::UsesDescSeq_var (void)
+CORBA::ComponentIR::EventPortDescriptionSeq_var::EventPortDescriptionSeq_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-IR::UsesDescSeq_var::UsesDescSeq_var (UsesDescSeq *p)
+CORBA::ComponentIR::EventPortDescriptionSeq_var::EventPortDescriptionSeq_var (EventPortDescriptionSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-IR::UsesDescSeq_var::UsesDescSeq_var (const ::IR::UsesDescSeq_var &p)
+CORBA::ComponentIR::EventPortDescriptionSeq_var::EventPortDescriptionSeq_var (const ::CORBA::ComponentIR::EventPortDescriptionSeq_var &p)
 {
   if (p.ptr_)
     {
-      ACE_NEW (this->ptr_, ::IR::UsesDescSeq (*p.ptr_));
+      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::EventPortDescriptionSeq (*p.ptr_));
     }
   else
     {
@@ -5330,14 +2102,14 @@ IR::UsesDescSeq_var::UsesDescSeq_var (const ::IR::UsesDescSeq_var &p)
 }
 
 ACE_INLINE
-IR::UsesDescSeq_var::~UsesDescSeq_var (void)
+CORBA::ComponentIR::EventPortDescriptionSeq_var::~EventPortDescriptionSeq_var (void)
 {
   delete this->ptr_;
 }
 
 ACE_INLINE
-IR::UsesDescSeq_var &
-IR::UsesDescSeq_var::operator= (UsesDescSeq *p)
+CORBA::ComponentIR::EventPortDescriptionSeq_var &
+CORBA::ComponentIR::EventPortDescriptionSeq_var::operator= (EventPortDescriptionSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
@@ -5345,8 +2117,8 @@ IR::UsesDescSeq_var::operator= (UsesDescSeq *p)
 }
 
 ACE_INLINE
-::IR::UsesDescSeq_var &
-IR::UsesDescSeq_var::operator= (const ::IR::UsesDescSeq_var &p)
+::CORBA::ComponentIR::EventPortDescriptionSeq_var &
+CORBA::ComponentIR::EventPortDescriptionSeq_var::operator= (const ::CORBA::ComponentIR::EventPortDescriptionSeq_var &p)
 {
   if (this != &p)
     {
@@ -5357,16 +2129,16 @@ IR::UsesDescSeq_var::operator= (const ::IR::UsesDescSeq_var &p)
         }
       else
         {
-          UsesDescSeq *deep_copy = 0;
+          EventPortDescriptionSeq *deep_copy = 0;
           ACE_NEW_RETURN (
               deep_copy,
-              UsesDescSeq (*p.ptr_),
+              EventPortDescriptionSeq (*p.ptr_),
               *this
             );
           
           if (deep_copy != 0)
             {
-              UsesDescSeq *tmp = deep_copy;
+              EventPortDescriptionSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -5378,75 +2150,75 @@ IR::UsesDescSeq_var::operator= (const ::IR::UsesDescSeq_var &p)
 }
 
 ACE_INLINE
-const ::IR::UsesDescSeq *
-IR::UsesDescSeq_var::operator-> (void) const
+const ::CORBA::ComponentIR::EventPortDescriptionSeq *
+CORBA::ComponentIR::EventPortDescriptionSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-::IR::UsesDescSeq *
-IR::UsesDescSeq_var::operator-> (void)
+::CORBA::ComponentIR::EventPortDescriptionSeq *
+CORBA::ComponentIR::EventPortDescriptionSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-IR::UsesDescSeq_var::operator const ::IR::UsesDescSeq &() const // cast
+CORBA::ComponentIR::EventPortDescriptionSeq_var::operator const ::CORBA::ComponentIR::EventPortDescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::UsesDescSeq_var::operator ::IR::UsesDescSeq &() // cast 
+CORBA::ComponentIR::EventPortDescriptionSeq_var::operator ::CORBA::ComponentIR::EventPortDescriptionSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::UsesDescSeq_var::operator ::IR::UsesDescSeq &() const // cast 
+CORBA::ComponentIR::EventPortDescriptionSeq_var::operator ::CORBA::ComponentIR::EventPortDescriptionSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-IR::UsesDescSeq_var::operator ::IR::UsesDescSeq *&() // cast 
+CORBA::ComponentIR::EventPortDescriptionSeq_var::operator ::CORBA::ComponentIR::EventPortDescriptionSeq *&() // cast 
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-IR::UsesDescription &
-IR::UsesDescSeq_var::operator[] (CORBA::ULong index)
+CORBA::ComponentIR::EventPortDescription &
+CORBA::ComponentIR::EventPortDescriptionSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
 ACE_INLINE
-const IR::UsesDescription &
-IR::UsesDescSeq_var::operator[] (CORBA::ULong index) const
+const CORBA::ComponentIR::EventPortDescription &
+CORBA::ComponentIR::EventPortDescriptionSeq_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const IR::UsesDescription &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const CORBA::ComponentIR::EventPortDescription &, this->ptr_->operator[] (index));
 }
 
 ACE_INLINE
-const ::IR::UsesDescSeq &
-IR::UsesDescSeq_var::in (void) const
+const ::CORBA::ComponentIR::EventPortDescriptionSeq &
+CORBA::ComponentIR::EventPortDescriptionSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-::IR::UsesDescSeq &
-IR::UsesDescSeq_var::inout (void)
+::CORBA::ComponentIR::EventPortDescriptionSeq &
+CORBA::ComponentIR::EventPortDescriptionSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-::IR::UsesDescSeq *&
-IR::UsesDescSeq_var::out (void)
+::CORBA::ComponentIR::EventPortDescriptionSeq *&
+CORBA::ComponentIR::EventPortDescriptionSeq_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
@@ -5454,37 +2226,37 @@ IR::UsesDescSeq_var::out (void)
 }
 
 ACE_INLINE
-::IR::UsesDescSeq *
-IR::UsesDescSeq_var::_retn (void)
+::CORBA::ComponentIR::EventPortDescriptionSeq *
+CORBA::ComponentIR::EventPortDescriptionSeq_var::_retn (void)
 {
-  ::IR::UsesDescSeq *tmp = this->ptr_;
+  ::CORBA::ComponentIR::EventPortDescriptionSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
 ACE_INLINE
-::IR::UsesDescSeq *
-IR::UsesDescSeq_var::ptr (void) const
+::CORBA::ComponentIR::EventPortDescriptionSeq *
+CORBA::ComponentIR::EventPortDescriptionSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
-// Inline operations for class IR::UsesDescSeq_out
+// Inline operations for class CORBA::ComponentIR::EventPortDescriptionSeq_out
 // *************************************************************
 
 ACE_INLINE
-IR::UsesDescSeq_out::UsesDescSeq_out (UsesDescSeq *&p)
+CORBA::ComponentIR::EventPortDescriptionSeq_out::EventPortDescriptionSeq_out (EventPortDescriptionSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-IR::UsesDescSeq_out::UsesDescSeq_out (UsesDescSeq_var &p)
+CORBA::ComponentIR::EventPortDescriptionSeq_out::EventPortDescriptionSeq_out (EventPortDescriptionSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -5492,49 +2264,49 @@ IR::UsesDescSeq_out::UsesDescSeq_out (UsesDescSeq_var &p)
 }
 
 ACE_INLINE
-IR::UsesDescSeq_out::UsesDescSeq_out (const ::IR::UsesDescSeq_out &p)
-  : ptr_ (ACE_const_cast (UsesDescSeq_out&, p).ptr_)
+CORBA::ComponentIR::EventPortDescriptionSeq_out::EventPortDescriptionSeq_out (const ::CORBA::ComponentIR::EventPortDescriptionSeq_out &p)
+  : ptr_ (ACE_const_cast (EventPortDescriptionSeq_out&, p).ptr_)
 {}
 
 ACE_INLINE
-::IR::UsesDescSeq_out &
-IR::UsesDescSeq_out::operator= (const ::IR::UsesDescSeq_out &p)
+::CORBA::ComponentIR::EventPortDescriptionSeq_out &
+CORBA::ComponentIR::EventPortDescriptionSeq_out::operator= (const ::CORBA::ComponentIR::EventPortDescriptionSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (UsesDescSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (EventPortDescriptionSeq_out&, p).ptr_;
   return *this;
 }
 
 ACE_INLINE
-::IR::UsesDescSeq_out &
-IR::UsesDescSeq_out::operator= (UsesDescSeq *p)
+::CORBA::ComponentIR::EventPortDescriptionSeq_out &
+CORBA::ComponentIR::EventPortDescriptionSeq_out::operator= (EventPortDescriptionSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE
-IR::UsesDescSeq_out::operator ::IR::UsesDescSeq *&() // cast
+CORBA::ComponentIR::EventPortDescriptionSeq_out::operator ::CORBA::ComponentIR::EventPortDescriptionSeq *&() // cast
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-::IR::UsesDescSeq *&
-IR::UsesDescSeq_out::ptr (void) // ptr
+::CORBA::ComponentIR::EventPortDescriptionSeq *&
+CORBA::ComponentIR::EventPortDescriptionSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-::IR::UsesDescSeq *
-IR::UsesDescSeq_out::operator-> (void)
+::CORBA::ComponentIR::EventPortDescriptionSeq *
+CORBA::ComponentIR::EventPortDescriptionSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-IR::UsesDescription &
-IR::UsesDescSeq_out::operator[] (CORBA::ULong index)
+CORBA::ComponentIR::EventPortDescription &
+CORBA::ComponentIR::EventPortDescriptionSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
@@ -5542,334 +2314,28 @@ IR::UsesDescSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_IR_EVENTDEF___CI_)
-#define _IR_EVENTDEF___CI_
-
-ACE_INLINE
-IR::EventDef::EventDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
-{
-  this->IR_EventDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class IR::EventDescription_var
-// *************************************************************
-
-ACE_INLINE
-IR::EventDescription_var::EventDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IR::EventDescription_var::EventDescription_var (EventDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IR::EventDescription_var::EventDescription_var (const ::IR::EventDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IR::EventDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::EventDescription_var::~EventDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IR::EventDescription_var &
-IR::EventDescription_var::operator= (EventDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::IR::EventDescription_var &
-IR::EventDescription_var::operator= (const ::IR::EventDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          EventDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              EventDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              EventDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::IR::EventDescription *
-IR::EventDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::EventDescription *
-IR::EventDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::EventDescription_var::operator const ::IR::EventDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::EventDescription_var::operator ::IR::EventDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::EventDescription_var::operator ::IR::EventDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IR::EventDescription_var::operator ::IR::EventDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::IR::EventDescription &
-IR::EventDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IR::EventDescription &
-IR::EventDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::IR::EventDescription *&
-IR::EventDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::EventDescription *
-IR::EventDescription_var::_retn (void)
-{
-  ::IR::EventDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IR::EventDescription *
-IR::EventDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class IR::EventDescription_out
-// *************************************************************
-
-ACE_INLINE
-IR::EventDescription_out::EventDescription_out (::IR::EventDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::EventDescription_out::EventDescription_out (EventDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::EventDescription_out::EventDescription_out (const ::IR::EventDescription_out &p)
-  : ptr_ (ACE_const_cast (EventDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-IR::EventDescription_out &
-IR::EventDescription_out::operator= (const ::IR::EventDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (EventDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-IR::EventDescription_out &
-IR::EventDescription_out::operator= (EventDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-IR::EventDescription_out::operator ::IR::EventDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::EventDescription *&
-IR::EventDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::EventDescription *
-IR::EventDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_IR_EMITSDEF___CI_)
-#define _IR_EMITSDEF___CI_
-
-ACE_INLINE
-IR::EmitsDef::EmitsDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
-{
-  this->IR_EmitsDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_IR_PUBLISHESDEF___CI_)
-#define _IR_PUBLISHESDEF___CI_
-
-ACE_INLINE
-IR::PublishesDef::PublishesDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
-{
-  this->IR_PublishesDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_IR_CONSUMESDEF___CI_)
-#define _IR_CONSUMESDEF___CI_
-
-ACE_INLINE
-IR::ConsumesDef::ConsumesDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
-{
-  this->IR_ConsumesDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_IR_COMPONENTDEF___CI_)
-#define _IR_COMPONENTDEF___CI_
-
-ACE_INLINE
-IR::ComponentDef::ComponentDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
-{
-  this->IR_ComponentDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
-// Inline operations for class IR::ComponentDescription_var
+// Inline operations for class CORBA::ComponentIR::ComponentDescription_var
 // *************************************************************
 
 ACE_INLINE
-IR::ComponentDescription_var::ComponentDescription_var (void)
+CORBA::ComponentIR::ComponentDescription_var::ComponentDescription_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-IR::ComponentDescription_var::ComponentDescription_var (ComponentDescription *p)
+CORBA::ComponentIR::ComponentDescription_var::ComponentDescription_var (ComponentDescription *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-IR::ComponentDescription_var::ComponentDescription_var (const ::IR::ComponentDescription_var &p)
+CORBA::ComponentIR::ComponentDescription_var::ComponentDescription_var (const ::CORBA::ComponentIR::ComponentDescription_var &p)
 {
   if (p.ptr_)
     {
-      ACE_NEW (this->ptr_, ::IR::ComponentDescription (*p.ptr_));
+      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::ComponentDescription (*p.ptr_));
     }
   else
     {
@@ -5878,14 +2344,14 @@ IR::ComponentDescription_var::ComponentDescription_var (const ::IR::ComponentDes
 }
 
 ACE_INLINE
-IR::ComponentDescription_var::~ComponentDescription_var (void)
+CORBA::ComponentIR::ComponentDescription_var::~ComponentDescription_var (void)
 {
   delete this->ptr_;
 }
 
 ACE_INLINE
-IR::ComponentDescription_var &
-IR::ComponentDescription_var::operator= (ComponentDescription *_tao_struct_var)
+CORBA::ComponentIR::ComponentDescription_var &
+CORBA::ComponentIR::ComponentDescription_var::operator= (ComponentDescription *_tao_struct_var)
 {
   delete this->ptr_;
   this->ptr_ = _tao_struct_var;
@@ -5893,8 +2359,8 @@ IR::ComponentDescription_var::operator= (ComponentDescription *_tao_struct_var)
 }
 
 ACE_INLINE
-::IR::ComponentDescription_var &
-IR::ComponentDescription_var::operator= (const ::IR::ComponentDescription_var &_tao_struct_var)
+::CORBA::ComponentIR::ComponentDescription_var &
+CORBA::ComponentIR::ComponentDescription_var::operator= (const ::CORBA::ComponentIR::ComponentDescription_var &_tao_struct_var)
 {
   if (this != &_tao_struct_var)
     {
@@ -5925,94 +2391,94 @@ IR::ComponentDescription_var::operator= (const ::IR::ComponentDescription_var &_
   return *this;
 }
 
-ACE_INLINE const ::IR::ComponentDescription *
-IR::ComponentDescription_var::operator-> (void) const
+ACE_INLINE const ::CORBA::ComponentIR::ComponentDescription *
+CORBA::ComponentIR::ComponentDescription_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IR::ComponentDescription *
-IR::ComponentDescription_var::operator-> (void)
+ACE_INLINE ::CORBA::ComponentIR::ComponentDescription *
+CORBA::ComponentIR::ComponentDescription_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-IR::ComponentDescription_var::operator const ::IR::ComponentDescription &() const // cast
+CORBA::ComponentIR::ComponentDescription_var::operator const ::CORBA::ComponentIR::ComponentDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::ComponentDescription_var::operator ::IR::ComponentDescription &() // cast 
+CORBA::ComponentIR::ComponentDescription_var::operator ::CORBA::ComponentIR::ComponentDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::ComponentDescription_var::operator ::IR::ComponentDescription &() const // cast 
+CORBA::ComponentIR::ComponentDescription_var::operator ::CORBA::ComponentIR::ComponentDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-IR::ComponentDescription_var::operator ::IR::ComponentDescription *&() // cast 
+CORBA::ComponentIR::ComponentDescription_var::operator ::CORBA::ComponentIR::ComponentDescription *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE const ::IR::ComponentDescription &
-IR::ComponentDescription_var::in (void) const
+ACE_INLINE const ::CORBA::ComponentIR::ComponentDescription &
+CORBA::ComponentIR::ComponentDescription_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::IR::ComponentDescription &
-IR::ComponentDescription_var::inout (void)
+ACE_INLINE ::CORBA::ComponentIR::ComponentDescription &
+CORBA::ComponentIR::ComponentDescription_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // Mapping for variable size.
-ACE_INLINE ::IR::ComponentDescription *&
-IR::ComponentDescription_var::out (void)
+ACE_INLINE ::CORBA::ComponentIR::ComponentDescription *&
+CORBA::ComponentIR::ComponentDescription_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::IR::ComponentDescription *
-IR::ComponentDescription_var::_retn (void)
+ACE_INLINE ::CORBA::ComponentIR::ComponentDescription *
+CORBA::ComponentIR::ComponentDescription_var::_retn (void)
 {
-  ::IR::ComponentDescription *tmp = this->ptr_;
+  ::CORBA::ComponentIR::ComponentDescription *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::IR::ComponentDescription *
-IR::ComponentDescription_var::ptr (void) const
+ACE_INLINE ::CORBA::ComponentIR::ComponentDescription *
+CORBA::ComponentIR::ComponentDescription_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
-// Inline operations for class IR::ComponentDescription_out
+// Inline operations for class CORBA::ComponentIR::ComponentDescription_out
 // *************************************************************
 
 ACE_INLINE
-IR::ComponentDescription_out::ComponentDescription_out (::IR::ComponentDescription *&p)
+CORBA::ComponentIR::ComponentDescription_out::ComponentDescription_out (::CORBA::ComponentIR::ComponentDescription *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-IR::ComponentDescription_out::ComponentDescription_out (ComponentDescription_var &p)
+CORBA::ComponentIR::ComponentDescription_out::ComponentDescription_out (ComponentDescription_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -6020,354 +2486,145 @@ IR::ComponentDescription_out::ComponentDescription_out (ComponentDescription_var
 }
 
 ACE_INLINE
-IR::ComponentDescription_out::ComponentDescription_out (const ::IR::ComponentDescription_out &p)
+CORBA::ComponentIR::ComponentDescription_out::ComponentDescription_out (const ::CORBA::ComponentIR::ComponentDescription_out &p)
   : ptr_ (ACE_const_cast (ComponentDescription_out&, p).ptr_)
 {}
 
 ACE_INLINE
-IR::ComponentDescription_out &
-IR::ComponentDescription_out::operator= (const ::IR::ComponentDescription_out &p)
+CORBA::ComponentIR::ComponentDescription_out &
+CORBA::ComponentIR::ComponentDescription_out::operator= (const ::CORBA::ComponentIR::ComponentDescription_out &p)
 {
   this->ptr_ = ACE_const_cast (ComponentDescription_out&, p).ptr_;
   return *this;
 }
 
 ACE_INLINE
-IR::ComponentDescription_out &
-IR::ComponentDescription_out::operator= (ComponentDescription *_tao_struct_out)
+CORBA::ComponentIR::ComponentDescription_out &
+CORBA::ComponentIR::ComponentDescription_out::operator= (ComponentDescription *_tao_struct_out)
 {
   this->ptr_ = _tao_struct_out;
   return *this;
 }
 
 ACE_INLINE 
-IR::ComponentDescription_out::operator ::IR::ComponentDescription *&() // cast
+CORBA::ComponentIR::ComponentDescription_out::operator ::CORBA::ComponentIR::ComponentDescription *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IR::ComponentDescription *&
-IR::ComponentDescription_out::ptr (void) // ptr
+ACE_INLINE ::CORBA::ComponentIR::ComponentDescription *&
+CORBA::ComponentIR::ComponentDescription_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IR::ComponentDescription *
-IR::ComponentDescription_out::operator-> (void)
+ACE_INLINE ::CORBA::ComponentIR::ComponentDescription *
+CORBA::ComponentIR::ComponentDescription_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-#if !defined (_IR_PRIMARYKEYDEF___CI_)
-#define _IR_PRIMARYKEYDEF___CI_
+#if !defined (_CORBA_COMPONENTIR_FACTORYDEF___CI_)
+#define _CORBA_COMPONENTIR_FACTORYDEF___CI_
 
 ACE_INLINE
-IR::PrimaryKeyDef::PrimaryKeyDef (
+CORBA::ComponentIR::FactoryDef::FactoryDef (
     TAO_Stub *objref,
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
   : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  this->IR_PrimaryKeyDef_setup_collocation (_tao_collocated);
+  this->CORBA_ComponentIR_FactoryDef_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class IR::PrimaryKeyDescription_var
-// *************************************************************
-
 ACE_INLINE
-IR::PrimaryKeyDescription_var::PrimaryKeyDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IR::PrimaryKeyDescription_var::PrimaryKeyDescription_var (PrimaryKeyDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IR::PrimaryKeyDescription_var::PrimaryKeyDescription_var (const ::IR::PrimaryKeyDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IR::PrimaryKeyDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IR::PrimaryKeyDescription_var::~PrimaryKeyDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IR::PrimaryKeyDescription_var &
-IR::PrimaryKeyDescription_var::operator= (PrimaryKeyDescription *_tao_struct_var)
+CORBA::Boolean
+CORBA::ComponentIR::FactoryDef::marshal (TAO_OutputCDR &cdr)
 {
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
+  return (cdr << this);
 }
 
-ACE_INLINE
-::IR::PrimaryKeyDescription_var &
-IR::PrimaryKeyDescription_var::operator= (const ::IR::PrimaryKeyDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          PrimaryKeyDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              PrimaryKeyDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              PrimaryKeyDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::IR::PrimaryKeyDescription *
-IR::PrimaryKeyDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::PrimaryKeyDescription *
-IR::PrimaryKeyDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::PrimaryKeyDescription_var::operator const ::IR::PrimaryKeyDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::PrimaryKeyDescription_var::operator ::IR::PrimaryKeyDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IR::PrimaryKeyDescription_var::operator ::IR::PrimaryKeyDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IR::PrimaryKeyDescription_var::operator ::IR::PrimaryKeyDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::IR::PrimaryKeyDescription &
-IR::PrimaryKeyDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IR::PrimaryKeyDescription &
-IR::PrimaryKeyDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::IR::PrimaryKeyDescription *&
-IR::PrimaryKeyDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::PrimaryKeyDescription *
-IR::PrimaryKeyDescription_var::_retn (void)
-{
-  ::IR::PrimaryKeyDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IR::PrimaryKeyDescription *
-IR::PrimaryKeyDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class IR::PrimaryKeyDescription_out
-// *************************************************************
-
-ACE_INLINE
-IR::PrimaryKeyDescription_out::PrimaryKeyDescription_out (::IR::PrimaryKeyDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::PrimaryKeyDescription_out::PrimaryKeyDescription_out (PrimaryKeyDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR::PrimaryKeyDescription_out::PrimaryKeyDescription_out (const ::IR::PrimaryKeyDescription_out &p)
-  : ptr_ (ACE_const_cast (PrimaryKeyDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-IR::PrimaryKeyDescription_out &
-IR::PrimaryKeyDescription_out::operator= (const ::IR::PrimaryKeyDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (PrimaryKeyDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-IR::PrimaryKeyDescription_out &
-IR::PrimaryKeyDescription_out::operator= (PrimaryKeyDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-IR::PrimaryKeyDescription_out::operator ::IR::PrimaryKeyDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::PrimaryKeyDescription *&
-IR::PrimaryKeyDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::PrimaryKeyDescription *
-IR::PrimaryKeyDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-#if !defined (_IR_FACTORYDEF___CI_)
-#define _IR_FACTORYDEF___CI_
+#if !defined (_CORBA_COMPONENTIR_FINDERDEF___CI_)
+#define _CORBA_COMPONENTIR_FINDERDEF___CI_
 
 ACE_INLINE
-IR::FactoryDef::FactoryDef (
+CORBA::ComponentIR::FinderDef::FinderDef (
     TAO_Stub *objref,
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
   : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  this->IR_FactoryDef_setup_collocation (_tao_collocated);
+  this->CORBA_ComponentIR_FinderDef_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_IR_FINDERDEF___CI_)
-#define _IR_FINDERDEF___CI_
-
 ACE_INLINE
-IR::FinderDef::FinderDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
+CORBA::Boolean
+CORBA::ComponentIR::FinderDef::marshal (TAO_OutputCDR &cdr)
 {
-  this->IR_FinderDef_setup_collocation (_tao_collocated);
+  return (cdr << this);
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-#if !defined (_IR_HOMEDEF___CI_)
-#define _IR_HOMEDEF___CI_
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF___CI_)
+#define _CORBA_COMPONENTIR_HOMEDEF___CI_
 
 ACE_INLINE
-IR::HomeDef::HomeDef (
+CORBA::ComponentIR::HomeDef::HomeDef (
     TAO_Stub *objref,
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
   : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  this->IR_HomeDef_setup_collocation (_tao_collocated);
+  this->CORBA_ComponentIR_HomeDef_setup_collocation (_tao_collocated);
+}
+
+ACE_INLINE
+CORBA::Boolean
+CORBA::ComponentIR::HomeDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
-// Inline operations for class IR::HomeDescription_var
+// Inline operations for class CORBA::ComponentIR::HomeDescription_var
 // *************************************************************
 
 ACE_INLINE
-IR::HomeDescription_var::HomeDescription_var (void)
+CORBA::ComponentIR::HomeDescription_var::HomeDescription_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-IR::HomeDescription_var::HomeDescription_var (HomeDescription *p)
+CORBA::ComponentIR::HomeDescription_var::HomeDescription_var (HomeDescription *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-IR::HomeDescription_var::HomeDescription_var (const ::IR::HomeDescription_var &p)
+CORBA::ComponentIR::HomeDescription_var::HomeDescription_var (const ::CORBA::ComponentIR::HomeDescription_var &p)
 {
   if (p.ptr_)
     {
-      ACE_NEW (this->ptr_, ::IR::HomeDescription (*p.ptr_));
+      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::HomeDescription (*p.ptr_));
     }
   else
     {
@@ -6376,14 +2633,14 @@ IR::HomeDescription_var::HomeDescription_var (const ::IR::HomeDescription_var &p
 }
 
 ACE_INLINE
-IR::HomeDescription_var::~HomeDescription_var (void)
+CORBA::ComponentIR::HomeDescription_var::~HomeDescription_var (void)
 {
   delete this->ptr_;
 }
 
 ACE_INLINE
-IR::HomeDescription_var &
-IR::HomeDescription_var::operator= (HomeDescription *_tao_struct_var)
+CORBA::ComponentIR::HomeDescription_var &
+CORBA::ComponentIR::HomeDescription_var::operator= (HomeDescription *_tao_struct_var)
 {
   delete this->ptr_;
   this->ptr_ = _tao_struct_var;
@@ -6391,8 +2648,8 @@ IR::HomeDescription_var::operator= (HomeDescription *_tao_struct_var)
 }
 
 ACE_INLINE
-::IR::HomeDescription_var &
-IR::HomeDescription_var::operator= (const ::IR::HomeDescription_var &_tao_struct_var)
+::CORBA::ComponentIR::HomeDescription_var &
+CORBA::ComponentIR::HomeDescription_var::operator= (const ::CORBA::ComponentIR::HomeDescription_var &_tao_struct_var)
 {
   if (this != &_tao_struct_var)
     {
@@ -6423,94 +2680,94 @@ IR::HomeDescription_var::operator= (const ::IR::HomeDescription_var &_tao_struct
   return *this;
 }
 
-ACE_INLINE const ::IR::HomeDescription *
-IR::HomeDescription_var::operator-> (void) const
+ACE_INLINE const ::CORBA::ComponentIR::HomeDescription *
+CORBA::ComponentIR::HomeDescription_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IR::HomeDescription *
-IR::HomeDescription_var::operator-> (void)
+ACE_INLINE ::CORBA::ComponentIR::HomeDescription *
+CORBA::ComponentIR::HomeDescription_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-IR::HomeDescription_var::operator const ::IR::HomeDescription &() const // cast
+CORBA::ComponentIR::HomeDescription_var::operator const ::CORBA::ComponentIR::HomeDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::HomeDescription_var::operator ::IR::HomeDescription &() // cast 
+CORBA::ComponentIR::HomeDescription_var::operator ::CORBA::ComponentIR::HomeDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR::HomeDescription_var::operator ::IR::HomeDescription &() const // cast 
+CORBA::ComponentIR::HomeDescription_var::operator ::CORBA::ComponentIR::HomeDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-IR::HomeDescription_var::operator ::IR::HomeDescription *&() // cast 
+CORBA::ComponentIR::HomeDescription_var::operator ::CORBA::ComponentIR::HomeDescription *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE const ::IR::HomeDescription &
-IR::HomeDescription_var::in (void) const
+ACE_INLINE const ::CORBA::ComponentIR::HomeDescription &
+CORBA::ComponentIR::HomeDescription_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::IR::HomeDescription &
-IR::HomeDescription_var::inout (void)
+ACE_INLINE ::CORBA::ComponentIR::HomeDescription &
+CORBA::ComponentIR::HomeDescription_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // Mapping for variable size.
-ACE_INLINE ::IR::HomeDescription *&
-IR::HomeDescription_var::out (void)
+ACE_INLINE ::CORBA::ComponentIR::HomeDescription *&
+CORBA::ComponentIR::HomeDescription_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::IR::HomeDescription *
-IR::HomeDescription_var::_retn (void)
+ACE_INLINE ::CORBA::ComponentIR::HomeDescription *
+CORBA::ComponentIR::HomeDescription_var::_retn (void)
 {
-  ::IR::HomeDescription *tmp = this->ptr_;
+  ::CORBA::ComponentIR::HomeDescription *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::IR::HomeDescription *
-IR::HomeDescription_var::ptr (void) const
+ACE_INLINE ::CORBA::ComponentIR::HomeDescription *
+CORBA::ComponentIR::HomeDescription_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
-// Inline operations for class IR::HomeDescription_out
+// Inline operations for class CORBA::ComponentIR::HomeDescription_out
 // *************************************************************
 
 ACE_INLINE
-IR::HomeDescription_out::HomeDescription_out (::IR::HomeDescription *&p)
+CORBA::ComponentIR::HomeDescription_out::HomeDescription_out (::CORBA::ComponentIR::HomeDescription *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-IR::HomeDescription_out::HomeDescription_out (HomeDescription_var &p)
+CORBA::ComponentIR::HomeDescription_out::HomeDescription_out (HomeDescription_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -6518,411 +2775,142 @@ IR::HomeDescription_out::HomeDescription_out (HomeDescription_var &p)
 }
 
 ACE_INLINE
-IR::HomeDescription_out::HomeDescription_out (const ::IR::HomeDescription_out &p)
+CORBA::ComponentIR::HomeDescription_out::HomeDescription_out (const ::CORBA::ComponentIR::HomeDescription_out &p)
   : ptr_ (ACE_const_cast (HomeDescription_out&, p).ptr_)
 {}
 
 ACE_INLINE
-IR::HomeDescription_out &
-IR::HomeDescription_out::operator= (const ::IR::HomeDescription_out &p)
+CORBA::ComponentIR::HomeDescription_out &
+CORBA::ComponentIR::HomeDescription_out::operator= (const ::CORBA::ComponentIR::HomeDescription_out &p)
 {
   this->ptr_ = ACE_const_cast (HomeDescription_out&, p).ptr_;
   return *this;
 }
 
 ACE_INLINE
-IR::HomeDescription_out &
-IR::HomeDescription_out::operator= (HomeDescription *_tao_struct_out)
+CORBA::ComponentIR::HomeDescription_out &
+CORBA::ComponentIR::HomeDescription_out::operator= (HomeDescription *_tao_struct_out)
 {
   this->ptr_ = _tao_struct_out;
   return *this;
 }
 
 ACE_INLINE 
-IR::HomeDescription_out::operator ::IR::HomeDescription *&() // cast
+CORBA::ComponentIR::HomeDescription_out::operator ::CORBA::ComponentIR::HomeDescription *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IR::HomeDescription *&
-IR::HomeDescription_out::ptr (void) // ptr
+ACE_INLINE ::CORBA::ComponentIR::HomeDescription *&
+CORBA::ComponentIR::HomeDescription_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IR::HomeDescription *
-IR::HomeDescription_out::operator-> (void)
+ACE_INLINE ::CORBA::ComponentIR::HomeDescription *
+CORBA::ComponentIR::HomeDescription_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ci.cpp:51
-
-ACE_INLINE
-CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::DefinitionKind &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::DefinitionKind &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
-  if (_tao_result == 1)
-    {
-      _tao_enumval = ACE_static_cast (IR::DefinitionKind, _tao_temp);
-    }
-  
-  return _tao_result;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_I_
-#define _TAO_CDR_OP_IR_RepositoryIdSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const IR::RepositoryIdSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    IR::RepositoryIdSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_RepositoryIdSeq_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const IR::ComponentDef_ptr
+    const CORBA::ComponentIR::ComponentDef_ptr
   );
 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IR::ComponentDef_ptr &
+    CORBA::ComponentIR::ComponentDef_ptr &
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_IR_ComponentDefSeq_I_
-#define _TAO_CDR_OP_IR_ComponentDefSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const IR::ComponentDefSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    IR::ComponentDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_ComponentDefSeq_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const IR::ProvidesDef_ptr
+    const CORBA::ComponentIR::HomeDef_ptr
   );
 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IR::ProvidesDef_ptr &
+    CORBA::ComponentIR::HomeDef_ptr &
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_I_
-#define _TAO_CDR_OP_IR_ProvidesDefSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const IR::ProvidesDefSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    IR::ProvidesDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_ProvidesDefSeq_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const IR::UsesDef_ptr
+    const CORBA::ComponentIR::EventDef_ptr
   );
 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IR::UsesDef_ptr &
+    CORBA::ComponentIR::EventDef_ptr &
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_IR_UsesDefSeq_I_
-#define _TAO_CDR_OP_IR_UsesDefSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const IR::UsesDefSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    IR::UsesDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_UsesDefSeq_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const IR::HomeDef_ptr
+    const CORBA::ComponentIR::Container_ptr
   );
 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IR::HomeDef_ptr &
-  );
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_IR_HomeDefSeq_I_
-#define _TAO_CDR_OP_IR_HomeDefSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const IR::HomeDefSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    IR::HomeDefSeq &
+    CORBA::ComponentIR::Container_ptr &
   );
 
-#endif /* _TAO_CDR_OP_IR_HomeDefSeq_I_ */
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const IR::EventDef_ptr
+    const CORBA::ComponentIR::ModuleDef_ptr
   );
 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IR::EventDef_ptr &
+    CORBA::ComponentIR::ModuleDef_ptr &
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const IR::EmitsDef_ptr
+    const CORBA::ComponentIR::Repository_ptr
   );
 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IR::EmitsDef_ptr &
+    CORBA::ComponentIR::Repository_ptr &
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_IR_EmitsDefSeq_I_
-#define _TAO_CDR_OP_IR_EmitsDefSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const IR::EmitsDefSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    IR::EmitsDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_EmitsDefSeq_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::PublishesDef_ptr
-  );
-
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::PublishesDef_ptr &
-  );
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_IR_PublishesDefSeq_I_
-#define _TAO_CDR_OP_IR_PublishesDefSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const IR::PublishesDefSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    IR::PublishesDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_PublishesDefSeq_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const IR::ConsumesDef_ptr
+    const CORBA::ComponentIR::ProvidesDef_ptr
   );
 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IR::ConsumesDef_ptr &
-  );
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_I_
-#define _TAO_CDR_OP_IR_ConsumesDefSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const IR::ConsumesDefSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    IR::ConsumesDefSeq &
+    CORBA::ComponentIR::ProvidesDef_ptr &
   );
 
-#endif /* _TAO_CDR_OP_IR_ConsumesDefSeq_I_ */
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::FactoryDef_ptr
-  );
-
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::FactoryDef_ptr &
-  );
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_IR_FactoryDefSeq_I_
-#define _TAO_CDR_OP_IR_FactoryDefSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const IR::FactoryDefSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    IR::FactoryDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_FactoryDefSeq_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::FinderDef_ptr
-  );
-
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::FinderDef_ptr &
-  );
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_IR_FinderDefSeq_I_
-#define _TAO_CDR_OP_IR_FinderDefSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const IR::FinderDefSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    IR::FinderDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_FinderDefSeq_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::PrimaryKeyDef_ptr
-  );
-
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::PrimaryKeyDef_ptr &
-  );
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IR::ComponentRepository_ptr
-  );
-
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IR::ComponentRepository_ptr &
-  );
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::ProvidesDescription &_tao_aggregate
+    const CORBA::ComponentIR::ProvidesDescription &_tao_aggregate
   )
 {
   if (
@@ -6944,7 +2932,7 @@ CORBA::Boolean operator<< (
 ACE_INLINE
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::ProvidesDescription &_tao_aggregate
+    CORBA::ComponentIR::ProvidesDescription &_tao_aggregate
   )
 {
   if (
@@ -6964,12 +2952,25 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ComponentIR::UsesDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ComponentIR::UsesDef_ptr &
+  );
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::UsesDescription &_tao_aggregate
+    const CORBA::ComponentIR::UsesDescription &_tao_aggregate
   )
 {
   if (
@@ -6992,7 +2993,7 @@ CORBA::Boolean operator<< (
 ACE_INLINE
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::UsesDescription &_tao_aggregate
+    CORBA::ComponentIR::UsesDescription &_tao_aggregate
   )
 {
   if (
@@ -7013,48 +3014,25 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_IR_ProvidesDescSeq_I_
-#define _TAO_CDR_OP_IR_ProvidesDescSeq_I_
-
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
-    TAO_OutputCDR &,
-    const IR::ProvidesDescSeq &
-  );
-
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
-    TAO_InputCDR &,
-    IR::ProvidesDescSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IR_ProvidesDescSeq_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_IR_UsesDescSeq_I_
-#define _TAO_CDR_OP_IR_UsesDescSeq_I_
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
-CORBA::Boolean TAO_IFR_Client_Export operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const IR::UsesDescSeq &
+    const CORBA::ComponentIR::EventPortDef_ptr
   );
 
-CORBA::Boolean TAO_IFR_Client_Export operator>> (
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IR::UsesDescSeq &
+    CORBA::ComponentIR::EventPortDef_ptr &
   );
 
-#endif /* _TAO_CDR_OP_IR_UsesDescSeq_I_ */
-
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::EventDescription &_tao_aggregate
+    const CORBA::ComponentIR::EventPortDescription &_tao_aggregate
   )
 {
   if (
@@ -7062,7 +3040,7 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.id.in ()) &&
     (strm << _tao_aggregate.defined_in.in ()) &&
     (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.value.in ())
+    (strm << _tao_aggregate.event.in ())
    )
     {
       return 1;
@@ -7076,7 +3054,7 @@ CORBA::Boolean operator<< (
 ACE_INLINE
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::EventDescription &_tao_aggregate
+    CORBA::ComponentIR::EventPortDescription &_tao_aggregate
   )
 {
   if (
@@ -7084,7 +3062,7 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.id.out ()) &&
     (strm >> _tao_aggregate.defined_in.out ()) &&
     (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.value.out ())
+    (strm >> _tao_aggregate.event.out ())
    )
     {
       return 1;
@@ -7096,12 +3074,105 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ComponentIR::EmitsDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ComponentIR::EmitsDef_ptr &
+  );
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ComponentIR::PublishesDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ComponentIR::PublishesDef_ptr &
+  );
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ComponentIR::ConsumesDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ComponentIR::ConsumesDef_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_CORBA_ComponentIR_ProvidesDescriptionSeq_I_
+#define _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ComponentIR::ProvidesDescriptionSeq &
+  );
+
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ComponentIR::ProvidesDescriptionSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+
+#if !defined _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_I_
+#define _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ComponentIR::UsesDescriptionSeq &
+  );
+
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ComponentIR::UsesDescriptionSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+
+#if !defined _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_I_
+#define _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ComponentIR::EventPortDescriptionSeq &
+  );
+
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ComponentIR::EventPortDescriptionSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::ComponentDescription &_tao_aggregate
+    const CORBA::ComponentIR::ComponentDescription &_tao_aggregate
   )
 {
   if (
@@ -7110,14 +3181,14 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.defined_in.in ()) &&
     (strm << _tao_aggregate.version.in ()) &&
     (strm << _tao_aggregate.base_component.in ()) &&
-    (strm << _tao_aggregate.supports_interfaces) &&
-    (strm << _tao_aggregate.provides_interfaces) &&
-    (strm << _tao_aggregate.uses_interfaces) &&
-    (strm << _tao_aggregate.attributes) &&
+    (strm << _tao_aggregate.supported_interfaces) &&
+    (strm << _tao_aggregate.provided_interfaces) &&
+    (strm << _tao_aggregate.used_interfaces) &&
     (strm << _tao_aggregate.emits_events) &&
     (strm << _tao_aggregate.publishes_events) &&
     (strm << _tao_aggregate.consumes_events) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_basic))
+    (strm << _tao_aggregate.attributes) &&
+    (strm << _tao_aggregate.type.in ())
    )
     {
       return 1;
@@ -7131,7 +3202,7 @@ CORBA::Boolean operator<< (
 ACE_INLINE
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::ComponentDescription &_tao_aggregate
+    CORBA::ComponentIR::ComponentDescription &_tao_aggregate
   )
 {
   if (
@@ -7140,14 +3211,14 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.defined_in.out ()) &&
     (strm >> _tao_aggregate.version.out ()) &&
     (strm >> _tao_aggregate.base_component.out ()) &&
-    (strm >> _tao_aggregate.supports_interfaces) &&
-    (strm >> _tao_aggregate.provides_interfaces) &&
-    (strm >> _tao_aggregate.uses_interfaces) &&
-    (strm >> _tao_aggregate.attributes) &&
+    (strm >> _tao_aggregate.supported_interfaces) &&
+    (strm >> _tao_aggregate.provided_interfaces) &&
+    (strm >> _tao_aggregate.used_interfaces) &&
     (strm >> _tao_aggregate.emits_events) &&
     (strm >> _tao_aggregate.publishes_events) &&
     (strm >> _tao_aggregate.consumes_events) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_basic))
+    (strm >> _tao_aggregate.attributes) &&
+    (strm >> _tao_aggregate.type.out ())
    )
     {
       return 1;
@@ -7159,59 +3230,38 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IR::PrimaryKeyDescription &_tao_aggregate
-  )
-{
-  if (
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.primary_key.in ())
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ComponentIR::FactoryDef_ptr
+  );
 
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IR::PrimaryKeyDescription &_tao_aggregate
-  )
-{
-  if (
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.primary_key.out ())
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ComponentIR::FactoryDef_ptr &
+  );
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ComponentIR::FinderDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ComponentIR::FinderDef_ptr &
+  );
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IR::HomeDescription &_tao_aggregate
+    const CORBA::ComponentIR::HomeDescription &_tao_aggregate
   )
 {
   if (
@@ -7221,12 +3271,12 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.version.in ()) &&
     (strm << _tao_aggregate.base_home.in ()) &&
     (strm << _tao_aggregate.managed_component.in ()) &&
-    (strm << _tao_aggregate.primary_key_def.in ()) &&
+    (strm << _tao_aggregate.primary_key) &&
     (strm << _tao_aggregate.factories) &&
     (strm << _tao_aggregate.finders) &&
     (strm << _tao_aggregate.operations) &&
     (strm << _tao_aggregate.attributes) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_basic))
+    (strm << _tao_aggregate.type.in ())
    )
     {
       return 1;
@@ -7240,7 +3290,7 @@ CORBA::Boolean operator<< (
 ACE_INLINE
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IR::HomeDescription &_tao_aggregate
+    CORBA::ComponentIR::HomeDescription &_tao_aggregate
   )
 {
   if (
@@ -7250,12 +3300,12 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.version.out ()) &&
     (strm >> _tao_aggregate.base_home.out ()) &&
     (strm >> _tao_aggregate.managed_component.out ()) &&
-    (strm >> _tao_aggregate.primary_key_def.out ()) &&
+    (strm >> _tao_aggregate.primary_key) &&
     (strm >> _tao_aggregate.factories) &&
     (strm >> _tao_aggregate.finders) &&
     (strm >> _tao_aggregate.operations) &&
     (strm >> _tao_aggregate.attributes) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_basic))
+    (strm >> _tao_aggregate.type.out ())
    )
     {
       return 1;
@@ -7266,3 +3316,4 @@ CORBA::Boolean operator>> (
     }
 }
 
+
diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
index 032bcce4dae..9bf149f64a1 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -16,49 +16,38 @@
 //   time. This IDL file contains all the interfaces and other data
 //   types related to fixed types and valuetypes.
 //
-//   1. Patch this pidl file with
+//   The command used to generate code from this IDL file is:
 //
-//      patch < diffs/IFR_Extended.pidl.diff
-//
-//   This will remove the CORBA module, rename most types foo
-//   declared in it as CORBA_foo, unalias the simple typedefs
-//   which don't have a CORBA_ analog in corbafwd.h.
-//
-//   2. Generate the code. The command used to generate code from this 
-//   IDL file is:
-//
-//     tao_idl -o orig -Ge 1 -I.. \
+//     tao_idl -Ge 1 -I.. \
 //          -Wb,export_macro=TAO_IFR_Client_Export \
 //          -Wb,export_include=ifr_client_export.h \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
-//          IFR_Extended.pidl
+//          IFR_ExtendedC.pidl
 //
-//   3. Copy the generated files to the current directory.
+//   Only the stub files are used in the TAO_IFR_Client library. The
+//   skeleton files can be deleted from this directory.
 //
-//   4. Patch the generated files, using
-//      
-//      patch < diffs/IFR_ExtendedC.h.diff
-//      patch < diffs/IFR_ExtendedC.i.diff
-//      patch < diffs/IFR_ExtendedC.cpp.diff
+//   No patching of the generated stub files is necessary.
 //
-//   If this fails for some reason, the files must be patched
-//   by hand, and the diff files regenerated with
+//   To generate the skeleton files for the IFR Service, the command is:
 //
-//      diff -wbu orig/IFR_ExtendedC.h IFR_ExtendedC.h > diffs/IFR_ExtendedC.h.diff
-//      diff -wbu orig/IFR_ExtendedC.i IFR_ExtendedC.i > diffs/IFR_ExtendedC.i.diff
-//      diff -wbu orig/IFR_ExtendedC.cpp IFR_ExtendedC.cpp > diffs/IFR_ExtendedC.cpp.diff
+//     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
+//          -Wb,pre_include="ace/pre.h" \
+//          -Wb,post_include="ace/post.h" \
+//          IFR_ExtendedC.pidl
 //
-//   5. Restore IFR_Extended.pidl.
+//   The only modification necessary to the skelton files is to 
+//   change
 //
-//   To regenerate the skeleton files IFR_ExtendedS.{h,i,cpp} and 
-//   IFR_ExtendedS_T.{h,i.cpp} in ACE_ROOT/TAO/orbsvcs/IFR_Service,
-//   use the command
+//   #include "IFR_ExtendedC.h"
 //
-//     tao_idl -o ../../orbsvcs/IFR_Service/orig -Ge 1 \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Extended.pidl
+//   to
+//
+//   #include "tao/IFR_Client/IFR_ExtendedC.h"
+//
+//   in IFR_ExtendedS.h. The stub files may be deleted from the IFRService
+//   directory.
 //
 // ================================================================
 
@@ -67,11 +56,11 @@
 
 #include "IFR_Basic.pidl"
 
-#pragma prefix "omg.org"
-
 module CORBA
 {
-  typedef short ValueModifier; // PIDL
+// Already defined in corbafwd.h, included from orb.idl.
+/*
+  typedef short ValueModifier;
   const ValueModifier VM_NONE = 0;
   const ValueModifier VM_CUSTOM = 1;
   const ValueModifier VM_ABSTRACT = 2;
@@ -80,7 +69,7 @@ module CORBA
   typedef short Visibility;
   const Visibility PRIVATE_MEMBER = 0;
   const Visibility PUBLIC_MEMBER = 1;
-
+*/
   interface FixedDef : IDLType 
   {
     attribute unsigned short digits;
@@ -107,7 +96,9 @@ module CORBA
     attribute Visibility access;
   };
 
-  interface ValueDef : Container, Contained, IDLType 
+  interface ValueDef : Container, 
+		       Contained, 
+		       IDLType 
   {
     // read/write interface
     attribute InterfaceDefSeq supported_interfaces;
@@ -183,12 +174,49 @@ module CORBA
     RepositoryId base_value;
   };
 
+  interface ExtValueDef : ValueDef 
+  {
+    // read/write interface
+    attribute ExtInitializerSeq ext_initializers;
+
+    // read interface
+    struct ExtFullValueDescription 
+    {
+      Identifier name;
+      RepositoryId id;
+      boolean is_abstract;
+      boolean is_custom;
+      RepositoryId defined_in;
+      VersionSpec version;
+      OpDescriptionSeq operations;
+      ExtAttrDescriptionSeq attributes;
+      ValueMemberSeq members;
+      ExtInitializerSeq initializers;
+      RepositoryIdSeq supported_interfaces;
+      RepositoryIdSeq abstract_base_values;
+      boolean is_truncatable;
+      RepositoryId base_value;
+      TypeCode type;
+    };
+
+    ExtFullValueDescription describe_ext_value ();
+
+    // write interface
+    ExtAttributeDef create_ext_attribute (
+	in RepositoryId id,
+	in Identifier name,
+	in VersionSpec version,
+	in IDLType type,
+	in AttributeMode mode,
+	in ExceptionDefSeq get_exceptions,
+	in ExceptionDefSeq set_exceptions
+      );
+  };
+
   interface ValueBoxDef : TypedefDef 
   {
     attribute IDLType original_type_def;
   };
 };
 
-#pragma prefix ""
-
 #endif /* _IFR_EXTENDED_IDL_ */
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index 59162000c32..8f9102cf5cf 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -20,7 +20,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:314
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
 #include "IFR_ExtendedC.h"
@@ -35,6 +35,7 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -44,72 +45,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ValueModifier[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c75654d),
-  ACE_NTOHL (0x6f646966),
-  ACE_NTOHL (0x6965723a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ValueModifier:1.0
-  14,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x654d6f64),
-  ACE_NTOHL (0x69666965),
-  ACE_NTOHL (0x72000000),  // name = ValueModifier
-  CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueModifier (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ValueModifier),
-    (char *) &_oc_CORBA_ValueModifier,
-    0,
-    sizeof (CORBA::ValueModifier)
-  );
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_Visibility[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5669),
-  ACE_NTOHL (0x73696269),
-  ACE_NTOHL (0x6c697479),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
-  11,
-  ACE_NTOHL (0x56697369),
-  ACE_NTOHL (0x62696c69),
-  ACE_NTOHL (0x74790000),  // name = Visibility
-  CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Visibility (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_Visibility),
-    (char *) &_oc_CORBA_Visibility,
-    0,
-    sizeof (CORBA::Visibility)
-  );
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::FixedDef::_tao_class_id = 0;
 
@@ -156,8 +92,17 @@ tao_CORBA_FixedDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_FixedDef_marshal (
+    CORBA::FixedDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::FixedDef_var
@@ -207,7 +152,7 @@ CORBA::FixedDef_var::operator const ::CORBA::FixedDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA::FixedDef_var::operator ::CORBA::FixedDef_ptr &() // cast
+CORBA::FixedDef_var::operator ::CORBA::FixedDef_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -283,7 +228,7 @@ CORBA::FixedDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::FixedDef_out
@@ -345,12 +290,12 @@ CORBA::FixedDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_FixedDef_digits_get : public TAO_ClientRequestInfo_i
 {
@@ -362,29 +307,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::UShort result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_FixedDef_digits_get (const TAO_ClientRequestInfo_CORBA_FixedDef_digits_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_FixedDef_digits_get &);
-
+    
     ::CORBA::UShort _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_FixedDef_digits_get::TAO_ClientRequestInfo_CORBA_FixedDef_digits_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -397,7 +342,7 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::arguments (ACE_ENV_SINGLE_ARG_D
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -409,11 +354,11 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (ACE_ENV_SINGLE_ARG_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -422,22 +367,22 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (ACE_ENV_SINGLE_ARG_DECL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::UShort result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_FixedDef_digits_set : public TAO_ClientRequestInfo_i
 {
@@ -450,10 +395,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -462,15 +407,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_FixedDef_digits_set &);
     const CORBA::UShort & digits_;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_FixedDef_digits_set::TAO_ClientRequestInfo_CORBA_FixedDef_digits_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::UShort & digits
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       digits_ (digits)
@@ -484,15 +429,15 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (ACE_ENV_SINGLE_ARG_D
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= digits_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -504,11 +449,11 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (ACE_ENV_SINGLE_ARG_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -517,14 +462,14 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::result (ACE_ENV_SINGLE_ARG_DECL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_FixedDef_scale_get : public TAO_ClientRequestInfo_i
 {
@@ -536,29 +481,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Short result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_FixedDef_scale_get (const TAO_ClientRequestInfo_CORBA_FixedDef_scale_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_FixedDef_scale_get &);
-
+    
     ::CORBA::Short _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_FixedDef_scale_get::TAO_ClientRequestInfo_CORBA_FixedDef_scale_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -571,7 +516,7 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::arguments (ACE_ENV_SINGLE_ARG_DE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -583,11 +528,11 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (ACE_ENV_SINGLE_ARG_D
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -596,22 +541,22 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Short result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_FixedDef_scale_set : public TAO_ClientRequestInfo_i
 {
@@ -624,10 +569,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -636,15 +581,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_FixedDef_scale_set &);
     const CORBA::Short & scale_;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_FixedDef_scale_set::TAO_ClientRequestInfo_CORBA_FixedDef_scale_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Short & scale
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       scale_ (scale)
@@ -658,15 +603,15 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (ACE_ENV_SINGLE_ARG_DE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= scale_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -678,11 +623,11 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (ACE_ENV_SINGLE_ARG_D
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -691,7 +636,7 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -700,10 +645,10 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (ACE_ENV_SINGLE_ARG_DECL)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 CORBA::_TAO_FixedDef_Proxy_Impl::_TAO_FixedDef_Proxy_Impl (void)
@@ -715,7 +660,7 @@ CORBA::_TAO_FixedDef_Remote_Proxy_Impl::_TAO_FixedDef_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::UShort CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
     CORBA::Object *_collocated_tao_target_
@@ -727,12 +672,12 @@ CORBA::UShort CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
 {
   CORBA::UShort _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_digits",
@@ -740,22 +685,22 @@ CORBA::UShort CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_digits_get _tao_ri (
           &_tao_call,
@@ -763,14 +708,14 @@ CORBA::UShort CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -778,85 +723,77 @@ CORBA::UShort CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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);
 
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::UShort _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> _tao_retval)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::UShort _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -866,61 +803,63 @@ CORBA::UShort CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
     CORBA::Object *_collocated_tao_target_,
@@ -932,12 +871,12 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_digits",
@@ -945,22 +884,22 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_digits_set _tao_ri (
           &_tao_call,
@@ -969,14 +908,14 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -984,78 +923,70 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << digits)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << digits)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -1065,59 +996,61 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::Short CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
     CORBA::Object *_collocated_tao_target_
@@ -1129,12 +1062,12 @@ CORBA::Short CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
 {
   CORBA::Short _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_scale",
@@ -1142,22 +1075,22 @@ CORBA::Short CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_scale_get _tao_ri (
           &_tao_call,
@@ -1165,14 +1098,14 @@ CORBA::Short CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1180,85 +1113,77 @@ CORBA::Short CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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);
 
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Short _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> _tao_retval)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::Short _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -1268,61 +1193,63 @@ CORBA::Short CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
     CORBA::Object *_collocated_tao_target_,
@@ -1334,12 +1261,12 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_scale",
@@ -1347,22 +1274,22 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_scale_set _tao_ri (
           &_tao_call,
@@ -1371,14 +1298,14 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1386,78 +1313,70 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << scale)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << scale)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -1467,63 +1386,65 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -1570,8 +1491,8 @@ CORBA::_TAO_FixedDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:225
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::FixedDef::FixedDef (int collocated)
 {
@@ -1587,14 +1508,14 @@ CORBA::FixedDef::CORBA_FixedDef_setup_collocation (int collocated)
   else
     this->the_TAO_FixedDef_Proxy_Broker_ =
       ::CORBA::_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker ();
-
+  
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
 CORBA::FixedDef::~FixedDef (void)
 {}
 
-void
+void 
 CORBA::FixedDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   FixedDef *tmp = ACE_static_cast (FixedDef *, _tao_void_pointer);
@@ -1611,7 +1532,7 @@ CORBA::FixedDef::_narrow (
     {
       return FixedDef::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -1620,17 +1541,17 @@ CORBA::FixedDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (FixedDef::_nil ());
-
+      
       if (is_a == 0)
         {
           return FixedDef::_nil ();
         }
     }
-
+  
   return FixedDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::FixedDef_ptr
+CORBA::FixedDef_ptr 
 CORBA::FixedDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1640,18 +1561,18 @@ CORBA::FixedDef::_unchecked_narrow (
     {
       return FixedDef::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-
+      
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-
+      
       FixedDef_ptr default_proxy = FixedDef::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -1669,7 +1590,7 @@ CORBA::FixedDef::_unchecked_narrow (
               FixedDef::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -1682,10 +1603,10 @@ CORBA::FixedDef::_unchecked_narrow (
               FixedDef::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
       ACE_reinterpret_cast (
           FixedDef_ptr,
@@ -1705,7 +1626,7 @@ CORBA::FixedDef::_duplicate (FixedDef_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1748,7 +1669,7 @@ CORBA::FixedDef::_is_a (
 void *CORBA::FixedDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, FixedDef)::_tao_class_id)
@@ -1795,12 +1716,12 @@ void *CORBA::FixedDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -1810,7 +1731,7 @@ const char* CORBA::FixedDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::UShort CORBA::FixedDef::digits (
     ACE_ENV_SINGLE_ARG_DECL
@@ -1819,10 +1740,10 @@ CORBA::UShort CORBA::FixedDef::digits (
     CORBA::SystemException
   ))
 {
-  _TAO_FixedDef_Proxy_Impl &proxy =
+  _TAO_FixedDef_Proxy_Impl &proxy = 
     this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.digits (
       this
       ACE_ENV_ARG_PARAMETER
@@ -1830,7 +1751,7 @@ CORBA::UShort CORBA::FixedDef::digits (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::FixedDef::digits (
     CORBA::UShort digits
@@ -1840,10 +1761,10 @@ void CORBA::FixedDef::digits (
     CORBA::SystemException
   ))
 {
-  _TAO_FixedDef_Proxy_Impl &proxy =
+  _TAO_FixedDef_Proxy_Impl &proxy = 
     this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.digits (
       this,
       digits
@@ -1852,7 +1773,7 @@ void CORBA::FixedDef::digits (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::Short CORBA::FixedDef::scale (
     ACE_ENV_SINGLE_ARG_DECL
@@ -1861,10 +1782,10 @@ CORBA::Short CORBA::FixedDef::scale (
     CORBA::SystemException
   ))
 {
-  _TAO_FixedDef_Proxy_Impl &proxy =
+  _TAO_FixedDef_Proxy_Impl &proxy = 
     this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.scale (
       this
       ACE_ENV_ARG_PARAMETER
@@ -1872,7 +1793,7 @@ CORBA::Short CORBA::FixedDef::scale (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::FixedDef::scale (
     CORBA::Short scale
@@ -1882,10 +1803,10 @@ void CORBA::FixedDef::scale (
     CORBA::SystemException
   ))
 {
-  _TAO_FixedDef_Proxy_Impl &proxy =
+  _TAO_FixedDef_Proxy_Impl &proxy = 
     this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.scale (
       this,
       scale
@@ -1894,25 +1815,25 @@ void CORBA::FixedDef::scale (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_FixedDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4669),
-  ACE_NTOHL (0x78656444),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4669), 
+  ACE_NTOHL (0x78656444), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/FixedDef:1.0
-  9,
-  ACE_NTOHL (0x46697865),
-  ACE_NTOHL (0x64446566),
+    9,
+  ACE_NTOHL (0x46697865), 
+  ACE_NTOHL (0x64446566), 
   ACE_NTOHL (0x0),  // name = FixedDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_FixedDef (
     CORBA::tk_objref,
@@ -1932,147 +1853,147 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ValueMember[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c75654d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c75654d), 
+  ACE_NTOHL (0x656d6265), 
+  ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
-  12,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x654d656d),
+    12,
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x654d656d), 
   ACE_NTOHL (0x62657200),  // name = ValueMember
   7, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
+    5,
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+        11,
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+        13,
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+        12,
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
+    CORBA::tk_TypeCode,
 
   9,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x5f646566),
+  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x5f646566), 
   ACE_NTOHL (0x0),  // name = type_def
-  CORBA::tk_objref, // typecode kind
+    CORBA::tk_objref, // typecode kind
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4944),
-    ACE_NTOHL (0x4c547970),
-    ACE_NTOHL (0x653a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4944), 
+    ACE_NTOHL (0x4c547970), 
+    ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-    8,
-    ACE_NTOHL (0x49444c54),
+        8,
+    ACE_NTOHL (0x49444c54), 
     ACE_NTOHL (0x79706500),  // name = IDLType
-
+    
   7,
-  ACE_NTOHL (0x61636365),
+  ACE_NTOHL (0x61636365), 
   ACE_NTOHL (0x73730000),  // name = access
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5669),
-    ACE_NTOHL (0x73696269),
-    ACE_NTOHL (0x6c697479),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5669), 
+    ACE_NTOHL (0x73696269), 
+    ACE_NTOHL (0x6c697479), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
-    11,
-    ACE_NTOHL (0x56697369),
-    ACE_NTOHL (0x62696c69),
+        11,
+    ACE_NTOHL (0x56697369), 
+    ACE_NTOHL (0x62696c69), 
     ACE_NTOHL (0x74790000),  // name = Visibility
-    CORBA::tk_short,
+        CORBA::tk_short,
 
 
 };
@@ -2094,8 +2015,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ValueMember::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -2103,8 +2024,8 @@ void CORBA::ValueMember::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -2116,23 +2037,23 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_allocate_buffer (CORBA::UL
 {
   CORBA::ValueMember* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
     {
       CORBA::ValueMember *old =
         ACE_reinterpret_cast (CORBA::ValueMember *, this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
           tmp[i] = old[i];
         }
-
+      
       if (this->release_)
         {
           _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (old);
         }
     }
-
+  
   this->buffer_ = tmp;
 }
 
@@ -2143,12 +2064,12 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_deallocate_buffer (void)
     {
       return;
     }
-
+  
   CORBA::ValueMember *tmp =
     ACE_reinterpret_cast (CORBA::ValueMember *, this->buffer_);
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
 CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::~_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void)
 {
@@ -2157,13 +2078,13 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::~_TAO_Unbounded_Sequence_CO
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_VALUEMEMBERSEQ_CS_)
 #define _CORBA_VALUEMEMBERSEQ_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
 
 // *************************************************************
 // CORBA::ValueMemberSeq
@@ -2173,14 +2094,14 @@ CORBA::ValueMemberSeq::ValueMemberSeq (void)
 {}
 
 CORBA::ValueMemberSeq::ValueMemberSeq (CORBA::ULong max)
-  :
+  : 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::ValueMember>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 
@@ -2190,26 +2111,26 @@ CORBA::ValueMemberSeq::ValueMemberSeq (
     CORBA::ValueMember *buffer,
     CORBA::Boolean release
   )
-  :
+  : 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::ValueMember>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 
 CORBA::ValueMemberSeq::ValueMemberSeq (const ValueMemberSeq &seq)
-  :
+  : 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::ValueMember>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 
@@ -2225,169 +2146,169 @@ void CORBA::ValueMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ValueMemberSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c75654d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x72536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c75654d), 
+  ACE_NTOHL (0x656d6265), 
+  ACE_NTOHL (0x72536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
-  15,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x654d656d),
-  ACE_NTOHL (0x62657253),
+    15,
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x654d656d), 
+  ACE_NTOHL (0x62657253), 
   ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   544, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     528, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       34,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5661),
-      ACE_NTOHL (0x6c75654d),
-      ACE_NTOHL (0x656d6265),
-      ACE_NTOHL (0x723a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5661), 
+      ACE_NTOHL (0x6c75654d), 
+      ACE_NTOHL (0x656d6265), 
+      ACE_NTOHL (0x723a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
-      12,
-      ACE_NTOHL (0x56616c75),
-      ACE_NTOHL (0x654d656d),
+            12,
+      ACE_NTOHL (0x56616c75), 
+      ACE_NTOHL (0x654d656d), 
       ACE_NTOHL (0x62657200),  // name = ValueMember
       7, // member count
-      5,
-      ACE_NTOHL (0x6e616d65),
+            5,
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+                11,
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       3,
       ACE_NTOHL (0x69640000),  // name = id
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+                13,
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
       ACE_NTOHL (0x696e0000),  // name = defined_in
-      0xffffffff, // indirection
+            0xffffffff, // indirection
       0xffffff9c, // negative offset (-100)
       8,
-      ACE_NTOHL (0x76657273),
+      ACE_NTOHL (0x76657273), 
       ACE_NTOHL (0x696f6e00),  // name = version
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
+                12,
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       5,
-      ACE_NTOHL (0x74797065),
+      ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x0),  // name = type
-      CORBA::tk_TypeCode,
+            CORBA::tk_TypeCode,
 
       9,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x5f646566),
+      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x5f646566), 
       ACE_NTOHL (0x0),  // name = type_def
-      CORBA::tk_objref, // typecode kind
+            CORBA::tk_objref, // typecode kind
       52, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4944),
-        ACE_NTOHL (0x4c547970),
-        ACE_NTOHL (0x653a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4944), 
+        ACE_NTOHL (0x4c547970), 
+        ACE_NTOHL (0x653a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8,
-        ACE_NTOHL (0x49444c54),
+                8,
+        ACE_NTOHL (0x49444c54), 
         ACE_NTOHL (0x79706500),  // name = IDLType
-
+        
       7,
-      ACE_NTOHL (0x61636365),
+      ACE_NTOHL (0x61636365), 
       ACE_NTOHL (0x73730000),  // name = access
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5669),
-        ACE_NTOHL (0x73696269),
-        ACE_NTOHL (0x6c697479),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5669), 
+        ACE_NTOHL (0x73696269), 
+        ACE_NTOHL (0x6c697479), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
-        11,
-        ACE_NTOHL (0x56697369),
-        ACE_NTOHL (0x62696c69),
+                11,
+        ACE_NTOHL (0x56697369), 
+        ACE_NTOHL (0x62696c69), 
         ACE_NTOHL (0x74790000),  // name = Visibility
-        CORBA::tk_short,
+                CORBA::tk_short,
 
 
 
@@ -2413,7 +2334,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ValueMemberDef::_tao_class_id = 0;
 
@@ -2460,8 +2381,17 @@ tao_CORBA_ValueMemberDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ValueMemberDef_marshal (
+    CORBA::ValueMemberDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::ValueMemberDef_var
@@ -2511,7 +2441,7 @@ CORBA::ValueMemberDef_var::operator const ::CORBA::ValueMemberDef_ptr &() const
   return this->ptr_;
 }
 
-CORBA::ValueMemberDef_var::operator ::CORBA::ValueMemberDef_ptr &() // cast
+CORBA::ValueMemberDef_var::operator ::CORBA::ValueMemberDef_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2587,7 +2517,7 @@ CORBA::ValueMemberDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::ValueMemberDef_out
@@ -2649,12 +2579,12 @@ CORBA::ValueMemberDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get : public TAO_ClientRequestInfo_i
 {
@@ -2666,29 +2596,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::TypeCode_ptr result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get &);
-
+    
     ::CORBA::TypeCode_ptr _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueMemberDef_type_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -2701,7 +2631,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -2713,11 +2643,11 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2726,22 +2656,22 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get : public TAO_ClientRequestInfo_i
 {
@@ -2753,29 +2683,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::IDLType_ptr result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get &);
-
+    
     ::CORBA::IDLType_ptr _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -2788,7 +2718,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -2800,11 +2730,11 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2813,22 +2743,22 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (::CORBA::IDLType_ptr result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set : public TAO_ClientRequestInfo_i
 {
@@ -2841,10 +2771,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2853,15 +2783,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set &);
     CORBA::IDLType_ptr type_def_;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       type_def_ (type_def)
@@ -2875,15 +2805,15 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -2895,11 +2825,11 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2908,14 +2838,14 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get : public TAO_ClientRequestInfo_i
 {
@@ -2927,29 +2857,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Visibility result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get &);
-
+    
     ::CORBA::Visibility _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueMemberDef_access_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -2962,7 +2892,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -2974,11 +2904,11 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2987,22 +2917,22 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Visibility result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set : public TAO_ClientRequestInfo_i
 {
@@ -3015,10 +2945,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3027,15 +2957,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set &);
     const CORBA::Visibility & access_;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueMemberDef_access_set::TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Visibility & access
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       access_ (access)
@@ -3049,15 +2979,15 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= access_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3069,11 +2999,11 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3082,7 +3012,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -3091,10 +3021,10 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (ACE_ENV_SINGLE_AR
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 CORBA::_TAO_ValueMemberDef_Proxy_Impl::_TAO_ValueMemberDef_Proxy_Impl (void)
@@ -3106,7 +3036,7 @@ CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::_TAO_ValueMemberDef_Remote_Proxy_I
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
     CORBA::Object *_collocated_tao_target_
@@ -3118,12 +3048,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
 {
   CORBA::TypeCode_var _tao_retval (CORBA::TypeCode::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type",
@@ -3131,22 +3061,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get _tao_ri (
           &_tao_call,
@@ -3154,14 +3084,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3169,86 +3099,78 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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 ());
-
-
-              _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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::TypeCode_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::TypeCode_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
         {
@@ -3258,61 +3180,63 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::IDLType_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
     CORBA::Object *_collocated_tao_target_
@@ -3324,12 +3248,12 @@ return _tao_retval._retn ();
 {
   CORBA::IDLType_var _tao_retval (CORBA::IDLType::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type_def",
@@ -3337,22 +3261,22 @@ return _tao_retval._retn ();
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get _tao_ri (
           &_tao_call,
@@ -3360,14 +3284,14 @@ return _tao_retval._retn ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3375,86 +3299,78 @@ return _tao_retval._retn ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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 ());
-
-
-              _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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::IDLType_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::IDLType_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
         {
@@ -3464,61 +3380,63 @@ return _tao_retval._retn ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
     CORBA::Object *_collocated_tao_target_,
@@ -3530,12 +3448,12 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_type_def",
@@ -3543,22 +3461,22 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set _tao_ri (
           &_tao_call,
@@ -3567,14 +3485,14 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3582,78 +3500,70 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << type_def)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << type_def)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -3663,59 +3573,61 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::Visibility CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
     CORBA::Object *_collocated_tao_target_
@@ -3727,12 +3639,12 @@ CORBA::Visibility CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
 {
   CORBA::Visibility _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_access",
@@ -3740,22 +3652,22 @@ CORBA::Visibility CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get _tao_ri (
           &_tao_call,
@@ -3763,14 +3675,14 @@ CORBA::Visibility CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3778,85 +3690,77 @@ CORBA::Visibility CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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);
 
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Visibility _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> _tao_retval)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::Visibility _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -3866,61 +3770,63 @@ CORBA::Visibility CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
     CORBA::Object *_collocated_tao_target_,
@@ -3932,12 +3838,12 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_access",
@@ -3945,22 +3851,22 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set _tao_ri (
           &_tao_call,
@@ -3969,14 +3875,14 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3984,78 +3890,70 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << access)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << access)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -4065,63 +3963,65 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -4168,8 +4068,8 @@ CORBA::_TAO_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:225
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::ValueMemberDef::ValueMemberDef (int collocated)
 {
@@ -4185,14 +4085,14 @@ CORBA::ValueMemberDef::CORBA_ValueMemberDef_setup_collocation (int collocated)
   else
     this->the_TAO_ValueMemberDef_Proxy_Broker_ =
       ::CORBA::_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker ();
-
+  
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
 CORBA::ValueMemberDef::~ValueMemberDef (void)
 {}
 
-void
+void 
 CORBA::ValueMemberDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ValueMemberDef *tmp = ACE_static_cast (ValueMemberDef *, _tao_void_pointer);
@@ -4209,7 +4109,7 @@ CORBA::ValueMemberDef::_narrow (
     {
       return ValueMemberDef::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -4218,17 +4118,17 @@ CORBA::ValueMemberDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ValueMemberDef::_nil ());
-
+      
       if (is_a == 0)
         {
           return ValueMemberDef::_nil ();
         }
     }
-
+  
   return ValueMemberDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ValueMemberDef_ptr
+CORBA::ValueMemberDef_ptr 
 CORBA::ValueMemberDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4238,18 +4138,18 @@ CORBA::ValueMemberDef::_unchecked_narrow (
     {
       return ValueMemberDef::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-
+      
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-
+      
       ValueMemberDef_ptr default_proxy = ValueMemberDef::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -4267,7 +4167,7 @@ CORBA::ValueMemberDef::_unchecked_narrow (
               ValueMemberDef::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -4280,10 +4180,10 @@ CORBA::ValueMemberDef::_unchecked_narrow (
               ValueMemberDef::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
       ACE_reinterpret_cast (
           ValueMemberDef_ptr,
@@ -4303,7 +4203,7 @@ CORBA::ValueMemberDef::_duplicate (ValueMemberDef_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -4346,7 +4246,7 @@ CORBA::ValueMemberDef::_is_a (
 void *CORBA::ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ValueMemberDef)::_tao_class_id)
@@ -4393,12 +4293,12 @@ void *CORBA::ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -4408,7 +4308,7 @@ const char* CORBA::ValueMemberDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
     ACE_ENV_SINGLE_ARG_DECL
@@ -4417,10 +4317,10 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy =
+  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.type (
       this
       ACE_ENV_ARG_PARAMETER
@@ -4428,7 +4328,7 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::IDLType_ptr CORBA::ValueMemberDef::type_def (
     ACE_ENV_SINGLE_ARG_DECL
@@ -4437,10 +4337,10 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy =
+  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.type_def (
       this
       ACE_ENV_ARG_PARAMETER
@@ -4448,7 +4348,7 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ValueMemberDef::type_def (
     CORBA::IDLType_ptr type_def
@@ -4458,10 +4358,10 @@ void CORBA::ValueMemberDef::type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy =
+  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.type_def (
       this,
       type_def
@@ -4470,7 +4370,7 @@ void CORBA::ValueMemberDef::type_def (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::Visibility CORBA::ValueMemberDef::access (
     ACE_ENV_SINGLE_ARG_DECL
@@ -4479,10 +4379,10 @@ CORBA::Visibility CORBA::ValueMemberDef::access (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy =
+  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.access (
       this
       ACE_ENV_ARG_PARAMETER
@@ -4490,7 +4390,7 @@ CORBA::Visibility CORBA::ValueMemberDef::access (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ValueMemberDef::access (
     CORBA::Visibility access
@@ -4500,10 +4400,10 @@ void CORBA::ValueMemberDef::access (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy =
+  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.access (
       this,
       access
@@ -4512,28 +4412,28 @@ void CORBA::ValueMemberDef::access (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ValueMemberDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c75654d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x72446566),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c75654d), 
+  ACE_NTOHL (0x656d6265), 
+  ACE_NTOHL (0x72446566), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberDef:1.0
-  15,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x654d656d),
-  ACE_NTOHL (0x62657244),
+    15,
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x654d656d), 
+  ACE_NTOHL (0x62657244), 
   ACE_NTOHL (0x65660000),  // name = ValueMemberDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMemberDef (
     CORBA::tk_objref,
@@ -4553,7 +4453,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ValueDef::_tao_class_id = 0;
 
@@ -4600,8 +4500,17 @@ tao_CORBA_ValueDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ValueDef_marshal (
+    CORBA::ValueDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::ValueDef_var
@@ -4651,7 +4560,7 @@ CORBA::ValueDef_var::operator const ::CORBA::ValueDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA::ValueDef_var::operator ::CORBA::ValueDef_ptr &() // cast
+CORBA::ValueDef_var::operator ::CORBA::ValueDef_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4727,7 +4636,7 @@ CORBA::ValueDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::ValueDef_out
@@ -4789,12 +4698,12 @@ CORBA::ValueDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get : public TAO_ClientRequestInfo_i
 {
@@ -4806,29 +4715,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::InterfaceDefSeq * result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get (const TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get &);
-
+    
     ::CORBA::InterfaceDefSeq * _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -4841,7 +4750,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -4853,11 +4762,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4866,22 +4775,22 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (::CORBA::InterfaceDefSeq * result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set : public TAO_ClientRequestInfo_i
 {
@@ -4894,10 +4803,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4906,15 +4815,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set &);
     const CORBA::InterfaceDefSeq & supported_interfaces_;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_supported_interfaces_set::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::InterfaceDefSeq & supported_interfaces
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       supported_interfaces_ (supported_interfaces)
@@ -4928,15 +4837,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->supported_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -4948,11 +4857,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4961,14 +4870,14 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get : public TAO_ClientRequestInfo_i
 {
@@ -4980,29 +4889,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::InitializerSeq * result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get (const TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get &);
-
+    
     ::CORBA::InitializerSeq * _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_initializers_get::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5015,7 +4924,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -5027,11 +4936,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5040,22 +4949,22 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (::CORBA::InitializerSeq * result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set : public TAO_ClientRequestInfo_i
 {
@@ -5068,10 +4977,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5080,15 +4989,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set &);
     const CORBA::InitializerSeq & initializers_;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_initializers_set::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::InitializerSeq & initializers
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       initializers_ (initializers)
@@ -5102,15 +5011,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->initializers_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -5122,11 +5031,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5135,14 +5044,14 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get : public TAO_ClientRequestInfo_i
 {
@@ -5154,29 +5063,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ValueDef_ptr result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get (const TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get &);
-
+    
     ::CORBA::ValueDef_ptr _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_base_value_get::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5189,7 +5098,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -5201,11 +5110,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5214,22 +5123,22 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (::CORBA::ValueDef_ptr result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set : public TAO_ClientRequestInfo_i
 {
@@ -5242,10 +5151,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5254,15 +5163,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set &);
     CORBA::ValueDef_ptr base_value_;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_base_value_set::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::ValueDef_ptr base_value
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       base_value_ (base_value)
@@ -5276,15 +5185,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->base_value_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -5296,11 +5205,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5309,14 +5218,14 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get : public TAO_ClientRequestInfo_i
 {
@@ -5328,29 +5237,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ValueDefSeq * result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get (const TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get &);
-
+    
     ::CORBA::ValueDefSeq * _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5363,7 +5272,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -5375,11 +5284,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5388,22 +5297,22 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (::CORBA::ValueDefSeq * result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set : public TAO_ClientRequestInfo_i
 {
@@ -5416,10 +5325,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5428,15 +5337,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set &);
     const CORBA::ValueDefSeq & abstract_base_values_;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_abstract_base_values_set::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ValueDefSeq & abstract_base_values
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       abstract_base_values_ (abstract_base_values)
@@ -5450,15 +5359,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->abstract_base_values_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -5470,11 +5379,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5483,14 +5392,14 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get : public TAO_ClientRequestInfo_i
 {
@@ -5502,29 +5411,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get (const TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get &);
-
+    
     ::CORBA::Boolean _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_is_abstract_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5537,7 +5446,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (ACE_ENV_SINGLE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -5549,11 +5458,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (ACE_ENV_SINGLE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5562,22 +5471,22 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (ACE_ENV_SINGLE_ARG
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Boolean result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set : public TAO_ClientRequestInfo_i
 {
@@ -5590,10 +5499,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5602,15 +5511,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set &);
     const CORBA::Boolean & is_abstract_;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_is_abstract_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_abstract
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       is_abstract_ (is_abstract)
@@ -5624,15 +5533,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (ACE_ENV_SINGLE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -5644,11 +5553,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (ACE_ENV_SINGLE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5657,14 +5566,14 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::result (ACE_ENV_SINGLE_ARG
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get : public TAO_ClientRequestInfo_i
 {
@@ -5676,29 +5585,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get (const TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get &);
-
+    
     ::CORBA::Boolean _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_is_custom_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5711,7 +5620,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::arguments (ACE_ENV_SINGLE_AR
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -5723,11 +5632,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (ACE_ENV_SINGLE_A
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5736,22 +5645,22 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (ACE_ENV_SINGLE_ARG_D
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Boolean result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set : public TAO_ClientRequestInfo_i
 {
@@ -5764,10 +5673,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5776,15 +5685,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set &);
     const CORBA::Boolean & is_custom_;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_is_custom_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_custom
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       is_custom_ (is_custom)
@@ -5798,15 +5707,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (ACE_ENV_SINGLE_AR
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_custom_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -5818,11 +5727,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (ACE_ENV_SINGLE_A
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5831,14 +5740,14 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::result (ACE_ENV_SINGLE_ARG_D
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get : public TAO_ClientRequestInfo_i
 {
@@ -5850,29 +5759,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get (const TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get &);
-
+    
     ::CORBA::Boolean _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5885,7 +5794,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -5897,11 +5806,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5910,22 +5819,22 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Boolean result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set : public TAO_ClientRequestInfo_i
 {
@@ -5938,10 +5847,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5950,15 +5859,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set &);
     const CORBA::Boolean & is_truncatable_;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_is_truncatable_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_truncatable
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       is_truncatable_ (is_truncatable)
@@ -5972,15 +5881,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -5992,11 +5901,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6005,14 +5914,14 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_is_a : public TAO_ClientRequestInfo_i
 {
@@ -6025,31 +5934,31 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_is_a (const TAO_ClientRequestInfo_CORBA_ValueDef_is_a &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_a &);
     const char * id_;
-
+    
     ::CORBA::Boolean _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_is_a::TAO_ClientRequestInfo_CORBA_ValueDef_is_a (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id)
@@ -6063,15 +5972,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -6083,11 +5992,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6096,22 +6005,22 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Boolean result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_describe_value : public TAO_ClientRequestInfo_i
 {
@@ -6123,29 +6032,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ValueDef::FullValueDescription * result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_describe_value (const TAO_ClientRequestInfo_CORBA_ValueDef_describe_value &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_describe_value &);
-
+    
     ::CORBA::ValueDef::FullValueDescription * _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_describe_value::TAO_ClientRequestInfo_CORBA_ValueDef_describe_value (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -6158,7 +6067,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -6170,11 +6079,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6183,22 +6092,22 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (::CORBA::ValueDef::FullValueDescription * result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member : public TAO_ClientRequestInfo_i
 {
@@ -6215,15 +6124,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ValueMemberDef_ptr result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member (const TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member &);
@@ -6232,13 +6141,13 @@ public:
     const char * version_;
     CORBA::IDLType_ptr type_;
     const CORBA::Visibility & access_;
-
+    
     ::CORBA::ValueMemberDef_ptr _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_create_value_member::TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -6247,7 +6156,7 @@ public:
       const char * version,
       CORBA::IDLType_ptr type,
       const CORBA::Visibility & access
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -6265,31 +6174,31 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (ACE_ENV_SIN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (5);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= access_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -6301,11 +6210,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (ACE_ENV_SI
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6314,22 +6223,22 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (ACE_ENV_SINGLE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (::CORBA::ValueMemberDef_ptr result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute : public TAO_ClientRequestInfo_i
 {
@@ -6346,15 +6255,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::AttributeDef_ptr result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute (const TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute &);
@@ -6363,13 +6272,13 @@ public:
     const char * version_;
     CORBA::IDLType_ptr type_;
     const CORBA::AttributeMode & mode_;
-
+    
     ::CORBA::AttributeDef_ptr _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_create_attribute::TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -6378,7 +6287,7 @@ public:
       const char * version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode & mode
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -6396,31 +6305,31 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (5);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -6432,11 +6341,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6445,22 +6354,22 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (::CORBA::AttributeDef_ptr result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueDef_create_operation : public TAO_ClientRequestInfo_i
 {
@@ -6480,15 +6389,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::OperationDef_ptr result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_create_operation (const TAO_ClientRequestInfo_CORBA_ValueDef_create_operation &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_create_operation &);
@@ -6500,13 +6409,13 @@ public:
     const CORBA::ParDescriptionSeq & params_;
     const CORBA::ExceptionDefSeq & exceptions_;
     const CORBA::ContextIdSeq & contexts_;
-
+    
     ::CORBA::OperationDef_ptr _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueDef_create_operation::TAO_ClientRequestInfo_CORBA_ValueDef_create_operation (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -6518,7 +6427,7 @@ public:
       const CORBA::ParDescriptionSeq & params,
       const CORBA::ExceptionDefSeq & exceptions,
       const CORBA::ContextIdSeq & contexts
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -6539,43 +6448,43 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (8);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->result_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->params_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->contexts_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -6587,11 +6496,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6600,27 +6509,27 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (::CORBA::OperationDef_ptr result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 CORBA::_TAO_ValueDef_Proxy_Impl::_TAO_ValueDef_Proxy_Impl (void)
@@ -6632,7 +6541,7 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::InterfaceDefSeq * CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA::Object *_collocated_tao_target_
@@ -6644,18 +6553,18 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
 {
   CORBA::InterfaceDefSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+  
   {
     CORBA::InterfaceDefSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::InterfaceDefSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_supported_interfaces",
@@ -6663,22 +6572,22 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get _tao_ri (
           &_tao_call,
@@ -6686,14 +6595,14 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -6701,86 +6610,78 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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 ());
-
-
-              _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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::InterfaceDefSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::InterfaceDefSeq * _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
         {
@@ -6790,61 +6691,63 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA::Object *_collocated_tao_target_,
@@ -6856,12 +6759,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_supported_interfaces",
@@ -6869,22 +6772,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set _tao_ri (
           &_tao_call,
@@ -6893,14 +6796,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -6908,78 +6811,70 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << supported_interfaces)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << supported_interfaces)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -6989,59 +6884,61 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::InitializerSeq * CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
     CORBA::Object *_collocated_tao_target_
@@ -7053,18 +6950,18 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
 {
   CORBA::InitializerSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+  
   {
     CORBA::InitializerSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::InitializerSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_initializers",
@@ -7072,22 +6969,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get _tao_ri (
           &_tao_call,
@@ -7095,14 +6992,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7110,86 +7007,78 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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 ());
-
-
-              _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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::InitializerSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::InitializerSeq * _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
         {
@@ -7199,61 +7088,63 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
     CORBA::Object *_collocated_tao_target_,
@@ -7265,12 +7156,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_initializers",
@@ -7278,22 +7169,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set _tao_ri (
           &_tao_call,
@@ -7302,14 +7193,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7317,78 +7208,70 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << initializers)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << initializers)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -7398,59 +7281,61 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ValueDef_ptr CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
     CORBA::Object *_collocated_tao_target_
@@ -7462,12 +7347,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
 {
   CORBA::ValueDef_var _tao_retval (CORBA::ValueDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_base_value",
@@ -7475,22 +7360,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get _tao_ri (
           &_tao_call,
@@ -7498,14 +7383,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7513,86 +7398,78 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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 ());
-
-
-              _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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ValueDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ValueDef_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
         {
@@ -7602,61 +7479,63 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
     CORBA::Object *_collocated_tao_target_,
@@ -7668,12 +7547,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_base_value",
@@ -7681,22 +7560,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set _tao_ri (
           &_tao_call,
@@ -7705,14 +7584,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7720,78 +7599,70 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << base_value)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << base_value)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -7801,59 +7672,61 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ValueDefSeq * CORBA::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
     CORBA::Object *_collocated_tao_target_
@@ -7865,18 +7738,18 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
 {
   CORBA::ValueDefSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+  
   {
     CORBA::ValueDefSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ValueDefSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_abstract_base_values",
@@ -7884,22 +7757,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get _tao_ri (
           &_tao_call,
@@ -7907,14 +7780,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7922,86 +7795,78 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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 ());
-
-
-              _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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ValueDefSeq * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ValueDefSeq * _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
         {
@@ -8011,61 +7876,63 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
     CORBA::Object *_collocated_tao_target_,
@@ -8077,12 +7944,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_abstract_base_values",
@@ -8090,22 +7957,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set _tao_ri (
           &_tao_call,
@@ -8114,14 +7981,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8129,78 +7996,70 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << abstract_base_values)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << abstract_base_values)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -8210,59 +8069,61 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
     CORBA::Object *_collocated_tao_target_
@@ -8274,12 +8135,12 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_abstract",
@@ -8287,22 +8148,22 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get _tao_ri (
           &_tao_call,
@@ -8310,14 +8171,14 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8325,85 +8186,77 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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);
 
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-
-                  if (!(
-                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Boolean _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::Boolean _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -8413,61 +8266,63 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
     CORBA::Object *_collocated_tao_target_,
@@ -8479,12 +8334,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_is_abstract",
@@ -8492,22 +8347,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set _tao_ri (
           &_tao_call,
@@ -8516,14 +8371,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8531,78 +8386,70 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << CORBA::Any::from_boolean (is_abstract))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << CORBA::Any::from_boolean (is_abstract))
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -8612,59 +8459,61 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
     CORBA::Object *_collocated_tao_target_
@@ -8676,12 +8525,12 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_custom",
@@ -8689,22 +8538,22 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get _tao_ri (
           &_tao_call,
@@ -8712,14 +8561,14 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8727,85 +8576,77 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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);
 
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-
-                  if (!(
-                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Boolean _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::Boolean _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -8815,61 +8656,63 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
     CORBA::Object *_collocated_tao_target_,
@@ -8881,12 +8724,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_is_custom",
@@ -8894,22 +8737,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set _tao_ri (
           &_tao_call,
@@ -8918,14 +8761,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8933,78 +8776,70 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << CORBA::Any::from_boolean (is_custom))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << CORBA::Any::from_boolean (is_custom))
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -9014,59 +8849,61 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
     CORBA::Object *_collocated_tao_target_
@@ -9078,12 +8915,12 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_truncatable",
@@ -9091,22 +8928,22 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get _tao_ri (
           &_tao_call,
@@ -9114,14 +8951,14 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -9129,85 +8966,77 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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);
 
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-
-                  if (!(
-                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Boolean _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::Boolean _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -9217,61 +9046,63 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
     CORBA::Object *_collocated_tao_target_,
@@ -9283,12 +9114,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_is_truncatable",
@@ -9296,22 +9127,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set _tao_ri (
           &_tao_call,
@@ -9320,14 +9151,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -9335,78 +9166,70 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << CORBA::Any::from_boolean (is_truncatable))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << CORBA::Any::from_boolean (is_truncatable))
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -9416,59 +9239,61 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
     CORBA::Object *_collocated_tao_target_,
@@ -9481,12 +9306,12 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "is_a",
@@ -9494,22 +9319,22 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_a _tao_ri (
           &_tao_call,
@@ -9518,14 +9343,14 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -9533,98 +9358,90 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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);
 
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  _tao_retval
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << id)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-
-                        ),
-                      _tao_retval
-                    );
-                }
-
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              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 ();
-
-                  if (!(
-                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          _tao_retval
-                        );
-                    }
-
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Boolean _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
+          if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          CORBA::Boolean _tao_retval_info =
+            _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          
+          _tao_ri.reply_status (_invoke_status);
+          _tao_vfr.receive_reply (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -9634,61 +9451,63 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval;
+  
+  return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ValueDef::FullValueDescription * CORBA::_TAO_ValueDef_Remote_Proxy_Impl::describe_value (
     CORBA::Object *_collocated_tao_target_
@@ -9700,18 +9519,18 @@ return _tao_retval;
 {
   CORBA::ValueDef::FullValueDescription_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+  
   {
     CORBA::ValueDef::FullValueDescription *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ValueDef::FullValueDescription, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "describe_value",
@@ -9719,22 +9538,22 @@ return _tao_retval;
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_describe_value _tao_ri (
           &_tao_call,
@@ -9742,14 +9561,14 @@ return _tao_retval;
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -9757,86 +9576,78 @@ return _tao_retval;
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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 ());
-
-
-              _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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ValueDef::FullValueDescription * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ValueDef::FullValueDescription * _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
         {
@@ -9846,61 +9657,63 @@ return _tao_retval;
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::ValueMemberDef_ptr CORBA::_TAO_ValueDef_Remote_Proxy_Impl::create_value_member (
     CORBA::Object *_collocated_tao_target_,
@@ -9917,12 +9730,12 @@ return _tao_retval._retn ();
 {
   CORBA::ValueMemberDef_var _tao_retval (CORBA::ValueMemberDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_value_member",
@@ -9930,22 +9743,22 @@ return _tao_retval._retn ();
       5,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member _tao_ri (
           &_tao_call,
@@ -9958,14 +9771,14 @@ return _tao_retval._retn ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -9973,103 +9786,95 @@ return _tao_retval._retn ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << type) &&
+              (_tao_out << access)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << type) &&
-                  (_tao_out << access)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-
-                        ),
-                      0
-                    );
-                }
-
-              _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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::ValueMemberDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
+            }
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ValueMemberDef_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
         {
@@ -10079,61 +9884,63 @@ return _tao_retval._retn ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::AttributeDef_ptr CORBA::_TAO_ValueDef_Remote_Proxy_Impl::create_attribute (
     CORBA::Object *_collocated_tao_target_,
@@ -10150,12 +9957,12 @@ return _tao_retval._retn ();
 {
   CORBA::AttributeDef_var _tao_retval (CORBA::AttributeDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_attribute",
@@ -10163,22 +9970,22 @@ return _tao_retval._retn ();
       5,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute _tao_ri (
           &_tao_call,
@@ -10191,14 +9998,14 @@ return _tao_retval._retn ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -10206,103 +10013,95 @@ return _tao_retval._retn ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << type) &&
+              (_tao_out << mode)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << type) &&
-                  (_tao_out << mode)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-
-                        ),
-                      0
-                    );
-                }
-
-              _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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::AttributeDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
+            }
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::AttributeDef_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
         {
@@ -10312,61 +10111,63 @@ return _tao_retval._retn ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::OperationDef_ptr CORBA::_TAO_ValueDef_Remote_Proxy_Impl::create_operation (
     CORBA::Object *_collocated_tao_target_,
@@ -10386,12 +10187,12 @@ return _tao_retval._retn ();
 {
   CORBA::OperationDef_var _tao_retval (CORBA::OperationDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_operation",
@@ -10399,22 +10200,22 @@ return _tao_retval._retn ();
       8,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_create_operation _tao_ri (
           &_tao_call,
@@ -10430,14 +10231,14 @@ return _tao_retval._retn ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -10445,106 +10246,98 @@ return _tao_retval._retn ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << result) &&
+              (_tao_out << mode) &&
+              (_tao_out << params) &&
+              (_tao_out << exceptions) &&
+              (_tao_out << contexts)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
                 );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << id) &&
-                  (_tao_out << name) &&
-                  (_tao_out << version) &&
-                  (_tao_out << result) &&
-                  (_tao_out << mode) &&
-                  (_tao_out << params) &&
-                  (_tao_out << exceptions) &&
-                  (_tao_out << contexts)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::MARSHAL (
-
-                        ),
-                      0
-                    );
-                }
-
-              _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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
-
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::OperationDef_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
+            }
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
             }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::OperationDef_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
         {
@@ -10554,65 +10347,67 @@ return _tao_retval._retn ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -10659,8 +10454,8 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:225
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::ValueDef::ValueDef (int collocated)
 {
@@ -10676,7 +10471,7 @@ CORBA::ValueDef::CORBA_ValueDef_setup_collocation (int collocated)
   else
     this->the_TAO_ValueDef_Proxy_Broker_ =
       ::CORBA::_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker ();
-
+  
   this->CORBA_Container_setup_collocation (collocated);
   this->CORBA_Contained_setup_collocation (collocated);
   this->CORBA_IDLType_setup_collocation (collocated);
@@ -10685,7 +10480,7 @@ CORBA::ValueDef::CORBA_ValueDef_setup_collocation (int collocated)
 CORBA::ValueDef::~ValueDef (void)
 {}
 
-void
+void 
 CORBA::ValueDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ValueDef *tmp = ACE_static_cast (ValueDef *, _tao_void_pointer);
@@ -10702,7 +10497,7 @@ CORBA::ValueDef::_narrow (
     {
       return ValueDef::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -10711,17 +10506,17 @@ CORBA::ValueDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ValueDef::_nil ());
-
+      
       if (is_a == 0)
         {
           return ValueDef::_nil ();
         }
     }
-
+  
   return ValueDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ValueDef_ptr
+CORBA::ValueDef_ptr 
 CORBA::ValueDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -10731,18 +10526,18 @@ CORBA::ValueDef::_unchecked_narrow (
     {
       return ValueDef::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-
+      
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-
+      
       ValueDef_ptr default_proxy = ValueDef::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -10760,7 +10555,7 @@ CORBA::ValueDef::_unchecked_narrow (
               ValueDef::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -10773,10 +10568,10 @@ CORBA::ValueDef::_unchecked_narrow (
               ValueDef::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
       ACE_reinterpret_cast (
           ValueDef_ptr,
@@ -10796,7 +10591,7 @@ CORBA::ValueDef::_duplicate (ValueDef_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -10847,7 +10642,7 @@ CORBA::ValueDef::_is_a (
 void *CORBA::ValueDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ValueDef)::_tao_class_id)
@@ -10922,12 +10717,12 @@ void *CORBA::ValueDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -10937,7 +10732,7 @@ const char* CORBA::ValueDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::InterfaceDefSeq * CORBA::ValueDef::supported_interfaces (
     ACE_ENV_SINGLE_ARG_DECL
@@ -10946,10 +10741,10 @@ const char* CORBA::ValueDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.supported_interfaces (
       this
       ACE_ENV_ARG_PARAMETER
@@ -10957,7 +10752,7 @@ const char* CORBA::ValueDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ValueDef::supported_interfaces (
     const CORBA::InterfaceDefSeq & supported_interfaces
@@ -10967,10 +10762,10 @@ void CORBA::ValueDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.supported_interfaces (
       this,
       supported_interfaces
@@ -10979,7 +10774,7 @@ void CORBA::ValueDef::supported_interfaces (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::InitializerSeq * CORBA::ValueDef::initializers (
     ACE_ENV_SINGLE_ARG_DECL
@@ -10988,10 +10783,10 @@ void CORBA::ValueDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.initializers (
       this
       ACE_ENV_ARG_PARAMETER
@@ -10999,7 +10794,7 @@ void CORBA::ValueDef::supported_interfaces (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ValueDef::initializers (
     const CORBA::InitializerSeq & initializers
@@ -11009,10 +10804,10 @@ void CORBA::ValueDef::initializers (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.initializers (
       this,
       initializers
@@ -11021,7 +10816,7 @@ void CORBA::ValueDef::initializers (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ValueDef_ptr CORBA::ValueDef::base_value (
     ACE_ENV_SINGLE_ARG_DECL
@@ -11030,10 +10825,10 @@ void CORBA::ValueDef::initializers (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.base_value (
       this
       ACE_ENV_ARG_PARAMETER
@@ -11041,7 +10836,7 @@ void CORBA::ValueDef::initializers (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ValueDef::base_value (
     CORBA::ValueDef_ptr base_value
@@ -11051,10 +10846,10 @@ void CORBA::ValueDef::base_value (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.base_value (
       this,
       base_value
@@ -11063,7 +10858,7 @@ void CORBA::ValueDef::base_value (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ValueDefSeq * CORBA::ValueDef::abstract_base_values (
     ACE_ENV_SINGLE_ARG_DECL
@@ -11072,10 +10867,10 @@ void CORBA::ValueDef::base_value (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.abstract_base_values (
       this
       ACE_ENV_ARG_PARAMETER
@@ -11083,7 +10878,7 @@ void CORBA::ValueDef::base_value (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ValueDef::abstract_base_values (
     const CORBA::ValueDefSeq & abstract_base_values
@@ -11093,10 +10888,10 @@ void CORBA::ValueDef::abstract_base_values (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.abstract_base_values (
       this,
       abstract_base_values
@@ -11105,7 +10900,7 @@ void CORBA::ValueDef::abstract_base_values (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::Boolean CORBA::ValueDef::is_abstract (
     ACE_ENV_SINGLE_ARG_DECL
@@ -11114,10 +10909,10 @@ CORBA::Boolean CORBA::ValueDef::is_abstract (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.is_abstract (
       this
       ACE_ENV_ARG_PARAMETER
@@ -11125,7 +10920,7 @@ CORBA::Boolean CORBA::ValueDef::is_abstract (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ValueDef::is_abstract (
     CORBA::Boolean is_abstract
@@ -11135,10 +10930,10 @@ void CORBA::ValueDef::is_abstract (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.is_abstract (
       this,
       is_abstract
@@ -11147,7 +10942,7 @@ void CORBA::ValueDef::is_abstract (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::Boolean CORBA::ValueDef::is_custom (
     ACE_ENV_SINGLE_ARG_DECL
@@ -11156,10 +10951,10 @@ CORBA::Boolean CORBA::ValueDef::is_custom (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.is_custom (
       this
       ACE_ENV_ARG_PARAMETER
@@ -11167,7 +10962,7 @@ CORBA::Boolean CORBA::ValueDef::is_custom (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ValueDef::is_custom (
     CORBA::Boolean is_custom
@@ -11177,10 +10972,10 @@ void CORBA::ValueDef::is_custom (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.is_custom (
       this,
       is_custom
@@ -11189,7 +10984,7 @@ void CORBA::ValueDef::is_custom (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::Boolean CORBA::ValueDef::is_truncatable (
     ACE_ENV_SINGLE_ARG_DECL
@@ -11198,10 +10993,10 @@ CORBA::Boolean CORBA::ValueDef::is_truncatable (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.is_truncatable (
       this
       ACE_ENV_ARG_PARAMETER
@@ -11209,7 +11004,7 @@ CORBA::Boolean CORBA::ValueDef::is_truncatable (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ValueDef::is_truncatable (
     CORBA::Boolean is_truncatable
@@ -11219,10 +11014,10 @@ void CORBA::ValueDef::is_truncatable (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.is_truncatable (
       this,
       is_truncatable
@@ -11231,7 +11026,7 @@ void CORBA::ValueDef::is_truncatable (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::Boolean CORBA::ValueDef::is_a (
     const char * id
@@ -11241,10 +11036,10 @@ CORBA::Boolean CORBA::ValueDef::is_a (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.is_a (
       this,
       id
@@ -11253,470 +11048,470 @@ CORBA::Boolean CORBA::ValueDef::is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   52,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756544),
-  ACE_NTOHL (0x65662f46),
-  ACE_NTOHL (0x756c6c56),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c756544), 
+  ACE_NTOHL (0x65662f46), 
+  ACE_NTOHL (0x756c6c56), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ValueDef/FullValueDescription:1.0
-  21,
-  ACE_NTOHL (0x46756c6c),
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+    21,
+  ACE_NTOHL (0x46756c6c), 
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = FullValueDescription
   15, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
+    5,
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+        11,
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+        13,
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   12,
-  ACE_NTOHL (0x69735f61),
-  ACE_NTOHL (0x62737472),
+  ACE_NTOHL (0x69735f61), 
+  ACE_NTOHL (0x62737472), 
   ACE_NTOHL (0x61637400),  // name = is_abstract
-  CORBA::tk_boolean,
+    CORBA::tk_boolean,
 
   10,
-  ACE_NTOHL (0x69735f63),
-  ACE_NTOHL (0x7573746f),
+  ACE_NTOHL (0x69735f63), 
+  ACE_NTOHL (0x7573746f), 
   ACE_NTOHL (0x6d000000),  // name = is_custom
-  CORBA::tk_boolean,
+    CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff74, // negative offset (-140)
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+        12,
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x6f706572),
-  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e730000),  // name = operations
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   1340, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f70),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f70), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
-    17,
-    ACE_NTOHL (0x4f704465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
+        17,
+    ACE_NTOHL (0x4f704465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     1260, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
       1244, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4f70),
-        ACE_NTOHL (0x65726174),
-        ACE_NTOHL (0x696f6e44),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f70), 
+        ACE_NTOHL (0x65726174), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
-        21,
-        ACE_NTOHL (0x4f706572),
-        ACE_NTOHL (0x6174696f),
-        ACE_NTOHL (0x6e446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+                21,
+        ACE_NTOHL (0x4f706572), 
+        ACE_NTOHL (0x6174696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
-        5,
-        ACE_NTOHL (0x6e616d65),
+                5,
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffdec, // negative offset (-532)
         3,
         ACE_NTOHL (0x69640000),  // name = id
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffe30, // negative offset (-464)
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffe18, // negative offset (-488)
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffea0, // negative offset (-352)
         7,
-        ACE_NTOHL (0x72657375),
+        ACE_NTOHL (0x72657375), 
         ACE_NTOHL (0x6c740000),  // name = result
-        CORBA::tk_TypeCode,
+                CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
+                CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4f70),
-          ACE_NTOHL (0x65726174),
-          ACE_NTOHL (0x696f6e4d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4f70), 
+          ACE_NTOHL (0x65726174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-14,
-          ACE_NTOHL (0x4f706572),
-          ACE_NTOHL (0x6174696f),
-          ACE_NTOHL (0x6e4d6f64),
+          14,
+          ACE_NTOHL (0x4f706572), 
+          ACE_NTOHL (0x6174696f), 
+          ACE_NTOHL (0x6e4d6f64), 
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
-10,
-          ACE_NTOHL (0x4f505f4e),
-          ACE_NTOHL (0x4f524d41),
+          10,
+          ACE_NTOHL (0x4f505f4e), 
+          ACE_NTOHL (0x4f524d41), 
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-10,
-          ACE_NTOHL (0x4f505f4f),
-          ACE_NTOHL (0x4e455741),
+          10,
+          ACE_NTOHL (0x4f505f4f), 
+          ACE_NTOHL (0x4e455741), 
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
+          
         9,
-        ACE_NTOHL (0x636f6e74),
-        ACE_NTOHL (0x65787473),
+        ACE_NTOHL (0x636f6e74), 
+        ACE_NTOHL (0x65787473), 
         ACE_NTOHL (0x0),  // name = contexts
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         168, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f436f),
-          ACE_NTOHL (0x6e746578),
-          ACE_NTOHL (0x74496453),
-          ACE_NTOHL (0x65713a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f436f), 
+          ACE_NTOHL (0x6e746578), 
+          ACE_NTOHL (0x74496453), 
+          ACE_NTOHL (0x65713a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-          13,
-          ACE_NTOHL (0x436f6e74),
-          ACE_NTOHL (0x65787449),
-          ACE_NTOHL (0x64536571),
+                    13,
+          ACE_NTOHL (0x436f6e74), 
+          ACE_NTOHL (0x65787449), 
+          ACE_NTOHL (0x64536571), 
           ACE_NTOHL (0x0),  // name = ContextIdSeq
-          CORBA::tk_sequence, // typecode kind
+                    CORBA::tk_sequence, // typecode kind
           96, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_alias, // typecode kind for typedefs
             80, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f436f),
-              ACE_NTOHL (0x6e746578),
-              ACE_NTOHL (0x74496465),
-              ACE_NTOHL (0x6e746966),
-              ACE_NTOHL (0x6965723a),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f436f), 
+              ACE_NTOHL (0x6e746578), 
+              ACE_NTOHL (0x74496465), 
+              ACE_NTOHL (0x6e746966), 
+              ACE_NTOHL (0x6965723a), 
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-              18,
-              ACE_NTOHL (0x436f6e74),
-              ACE_NTOHL (0x65787449),
-              ACE_NTOHL (0x64656e74),
-              ACE_NTOHL (0x69666965),
+                            18,
+              ACE_NTOHL (0x436f6e74), 
+              ACE_NTOHL (0x65787449), 
+              ACE_NTOHL (0x64656e74), 
+              ACE_NTOHL (0x69666965), 
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffffc6c, // negative offset (-916)
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x70617261),
-        ACE_NTOHL (0x6d657465),
+        ACE_NTOHL (0x70617261), 
+        ACE_NTOHL (0x6d657465), 
         ACE_NTOHL (0x72730000),  // name = parameters
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         428, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5061),
-          ACE_NTOHL (0x72446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5061), 
+          ACE_NTOHL (0x72446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-          18,
-          ACE_NTOHL (0x50617244),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+                    18,
+          ACE_NTOHL (0x50617244), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
+                    CORBA::tk_sequence, // typecode kind
           348, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
             332, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5061),
-              ACE_NTOHL (0x72616d65),
-              ACE_NTOHL (0x74657244),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5061), 
+              ACE_NTOHL (0x72616d65), 
+              ACE_NTOHL (0x74657244), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-              21,
-              ACE_NTOHL (0x50617261),
-              ACE_NTOHL (0x6d657465),
-              ACE_NTOHL (0x72446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+                            21,
+              ACE_NTOHL (0x50617261), 
+              ACE_NTOHL (0x6d657465), 
+              ACE_NTOHL (0x72446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
-              5,
-              ACE_NTOHL (0x6e616d65),
+                            5,
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffffb8c, // negative offset (-1140)
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
+                            CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065),
-              ACE_NTOHL (0x5f646566),
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
               ACE_NTOHL (0x0),  // name = type_def
-              CORBA::tk_objref, // typecode kind
+                            CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4944),
-                ACE_NTOHL (0x4c547970),
-                ACE_NTOHL (0x653a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x653a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                8,
-                ACE_NTOHL (0x49444c54),
+                                8,
+                ACE_NTOHL (0x49444c54), 
                 ACE_NTOHL (0x79706500),  // name = IDLType
-
+                
               5,
-              ACE_NTOHL (0x6d6f6465),
+              ACE_NTOHL (0x6d6f6465), 
               ACE_NTOHL (0x0),  // name = mode
-              CORBA::tk_enum, // typecode kind
+                            CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5061),
-                ACE_NTOHL (0x72616d65),
-                ACE_NTOHL (0x7465724d),
-                ACE_NTOHL (0x6f64653a),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5061), 
+                ACE_NTOHL (0x72616d65), 
+                ACE_NTOHL (0x7465724d), 
+                ACE_NTOHL (0x6f64653a), 
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-14,
-                ACE_NTOHL (0x50617261),
-                ACE_NTOHL (0x6d657465),
-                ACE_NTOHL (0x724d6f64),
+                14,
+                ACE_NTOHL (0x50617261), 
+                ACE_NTOHL (0x6d657465), 
+                ACE_NTOHL (0x724d6f64), 
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
-9,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f494e),
+                9,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x0),  // name = PARAM_IN
-10,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f4f55),
+                10,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f4f55), 
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-12,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f494e),
+                12,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+                
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = exceptions
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         276, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-          18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+                    18,
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-          CORBA::tk_sequence, // typecode kind
+                    CORBA::tk_sequence, // typecode kind
           196, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
             180, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-              21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+                            21,
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
-              5,
-              ACE_NTOHL (0x6e616d65),
+                            5,
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffff9c8, // negative offset (-1592)
               3,
               ACE_NTOHL (0x69640000),  // name = id
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffffa0c, // negative offset (-1524)
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffff9f4, // negative offset (-1548)
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffffa7c, // negative offset (-1412)
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
+                            CORBA::tk_TypeCode,
 
 
             0U,
@@ -11727,212 +11522,212 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   11,
-  ACE_NTOHL (0x61747472),
-  ACE_NTOHL (0x69627574),
+  ACE_NTOHL (0x61747472), 
+  ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65730000),  // name = attributes
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   404, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4174),
-    ACE_NTOHL (0x74724465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4174), 
+    ACE_NTOHL (0x74724465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
-    19,
-    ACE_NTOHL (0x41747472),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
+        19,
+    ACE_NTOHL (0x41747472), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     320, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
       304, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4174),
-        ACE_NTOHL (0x74726962),
-        ACE_NTOHL (0x75746544),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4174), 
+        ACE_NTOHL (0x74726962), 
+        ACE_NTOHL (0x75746544), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-        21,
-        ACE_NTOHL (0x41747472),
-        ACE_NTOHL (0x69627574),
-        ACE_NTOHL (0x65446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+                21,
+        ACE_NTOHL (0x41747472), 
+        ACE_NTOHL (0x69627574), 
+        ACE_NTOHL (0x65446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = AttributeDescription
         6, // member count
-        5,
-        ACE_NTOHL (0x6e616d65),
+                5,
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff894, // negative offset (-1900)
         3,
         ACE_NTOHL (0x69640000),  // name = id
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff8d8, // negative offset (-1832)
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff8c0, // negative offset (-1856)
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff948, // negative offset (-1720)
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
+                CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
-        CORBA::tk_enum, // typecode kind
+                CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4174),
-          ACE_NTOHL (0x74726962),
-          ACE_NTOHL (0x7574654d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4174), 
+          ACE_NTOHL (0x74726962), 
+          ACE_NTOHL (0x7574654d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-14,
-          ACE_NTOHL (0x41747472),
-          ACE_NTOHL (0x69627574),
-          ACE_NTOHL (0x654d6f64),
+          14,
+          ACE_NTOHL (0x41747472), 
+          ACE_NTOHL (0x69627574), 
+          ACE_NTOHL (0x654d6f64), 
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
-12,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f4e4f52),
+          12,
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f4e4f52), 
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-14,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f524541),
-          ACE_NTOHL (0x444f4e4c),
+          14,
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f524541), 
+          ACE_NTOHL (0x444f4e4c), 
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+          
 
       0U,
 
 
   8,
-  ACE_NTOHL (0x6d656d62),
+  ACE_NTOHL (0x6d656d62), 
   ACE_NTOHL (0x65727300),  // name = members
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   360, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5661),
-    ACE_NTOHL (0x6c75654d),
-    ACE_NTOHL (0x656d6265),
-    ACE_NTOHL (0x72536571),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5661), 
+    ACE_NTOHL (0x6c75654d), 
+    ACE_NTOHL (0x656d6265), 
+    ACE_NTOHL (0x72536571), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
-    15,
-    ACE_NTOHL (0x56616c75),
-    ACE_NTOHL (0x654d656d),
-    ACE_NTOHL (0x62657253),
+        15,
+    ACE_NTOHL (0x56616c75), 
+    ACE_NTOHL (0x654d656d), 
+    ACE_NTOHL (0x62657253), 
     ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     284, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
       268, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5661),
-        ACE_NTOHL (0x6c75654d),
-        ACE_NTOHL (0x656d6265),
-        ACE_NTOHL (0x723a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5661), 
+        ACE_NTOHL (0x6c75654d), 
+        ACE_NTOHL (0x656d6265), 
+        ACE_NTOHL (0x723a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
-        12,
-        ACE_NTOHL (0x56616c75),
-        ACE_NTOHL (0x654d656d),
+                12,
+        ACE_NTOHL (0x56616c75), 
+        ACE_NTOHL (0x654d656d), 
         ACE_NTOHL (0x62657200),  // name = ValueMember
         7, // member count
-        5,
-        ACE_NTOHL (0x6e616d65),
+                5,
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff708, // negative offset (-2296)
         3,
         ACE_NTOHL (0x69640000),  // name = id
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff74c, // negative offset (-2228)
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff734, // negative offset (-2252)
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff7bc, // negative offset (-2116)
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
-        CORBA::tk_TypeCode,
+                CORBA::tk_TypeCode,
 
         9,
-        ACE_NTOHL (0x74797065),
-        ACE_NTOHL (0x5f646566),
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x5f646566), 
         ACE_NTOHL (0x0),  // name = type_def
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffffb3c, // negative offset (-1220)
         7,
-        ACE_NTOHL (0x61636365),
+        ACE_NTOHL (0x61636365), 
         ACE_NTOHL (0x73730000),  // name = access
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         64, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5669),
-          ACE_NTOHL (0x73696269),
-          ACE_NTOHL (0x6c697479),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5669), 
+          ACE_NTOHL (0x73696269), 
+          ACE_NTOHL (0x6c697479), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
-          11,
-          ACE_NTOHL (0x56697369),
-          ACE_NTOHL (0x62696c69),
+                    11,
+          ACE_NTOHL (0x56697369), 
+          ACE_NTOHL (0x62696c69), 
           ACE_NTOHL (0x74790000),  // name = Visibility
-          CORBA::tk_short,
+                    CORBA::tk_short,
 
 
 
@@ -11940,150 +11735,150 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   13,
-  ACE_NTOHL (0x696e6974),
-  ACE_NTOHL (0x69616c69),
-  ACE_NTOHL (0x7a657273),
+  ACE_NTOHL (0x696e6974), 
+  ACE_NTOHL (0x69616c69), 
+  ACE_NTOHL (0x7a657273), 
   ACE_NTOHL (0x0),  // name = initializers
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   416, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f496e),
-    ACE_NTOHL (0x69746961),
-    ACE_NTOHL (0x6c697a65),
-    ACE_NTOHL (0x72536571),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f496e), 
+    ACE_NTOHL (0x69746961), 
+    ACE_NTOHL (0x6c697a65), 
+    ACE_NTOHL (0x72536571), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InitializerSeq:1.0
-    15,
-    ACE_NTOHL (0x496e6974),
-    ACE_NTOHL (0x69616c69),
-    ACE_NTOHL (0x7a657253),
+        15,
+    ACE_NTOHL (0x496e6974), 
+    ACE_NTOHL (0x69616c69), 
+    ACE_NTOHL (0x7a657253), 
     ACE_NTOHL (0x65710000),  // name = InitializerSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     340, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
       324, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f496e),
-        ACE_NTOHL (0x69746961),
-        ACE_NTOHL (0x6c697a65),
-        ACE_NTOHL (0x723a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f496e), 
+        ACE_NTOHL (0x69746961), 
+        ACE_NTOHL (0x6c697a65), 
+        ACE_NTOHL (0x723a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
-        12,
-        ACE_NTOHL (0x496e6974),
-        ACE_NTOHL (0x69616c69),
+                12,
+        ACE_NTOHL (0x496e6974), 
+        ACE_NTOHL (0x69616c69), 
         ACE_NTOHL (0x7a657200),  // name = Initializer
         2, // member count
-        8,
-        ACE_NTOHL (0x6d656d62),
+                8,
+        ACE_NTOHL (0x6d656d62), 
         ACE_NTOHL (0x65727300),  // name = members
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         220, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           38,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5374),
-          ACE_NTOHL (0x72756374),
-          ACE_NTOHL (0x4d656d62),
-          ACE_NTOHL (0x65725365),
-          ACE_NTOHL (0x713a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5374), 
+          ACE_NTOHL (0x72756374), 
+          ACE_NTOHL (0x4d656d62), 
+          ACE_NTOHL (0x65725365), 
+          ACE_NTOHL (0x713a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-          16,
-          ACE_NTOHL (0x53747275),
-          ACE_NTOHL (0x63744d65),
-          ACE_NTOHL (0x6d626572),
+                    16,
+          ACE_NTOHL (0x53747275), 
+          ACE_NTOHL (0x63744d65), 
+          ACE_NTOHL (0x6d626572), 
           ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-          CORBA::tk_sequence, // typecode kind
+                    CORBA::tk_sequence, // typecode kind
           144, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
             128, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5374),
-              ACE_NTOHL (0x72756374),
-              ACE_NTOHL (0x4d656d62),
-              ACE_NTOHL (0x65723a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5374), 
+              ACE_NTOHL (0x72756374), 
+              ACE_NTOHL (0x4d656d62), 
+              ACE_NTOHL (0x65723a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-              13,
-              ACE_NTOHL (0x53747275),
-              ACE_NTOHL (0x63744d65),
-              ACE_NTOHL (0x6d626572),
+                            13,
+              ACE_NTOHL (0x53747275), 
+              ACE_NTOHL (0x63744d65), 
+              ACE_NTOHL (0x6d626572), 
               ACE_NTOHL (0x0),  // name = StructMember
               3, // member count
-              5,
-              ACE_NTOHL (0x6e616d65),
+                            5,
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffff4d4, // negative offset (-2860)
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
-              CORBA::tk_TypeCode,
+                            CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065),
-              ACE_NTOHL (0x5f646566),
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
               ACE_NTOHL (0x0),  // name = type_def
-              0xffffffff, // indirection
+                            0xffffffff, // indirection
               0xfffff944, // negative offset (-1724)
 
             0U,
 
 
         5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        0xffffffff, // indirection
+                0xffffffff, // indirection
         0xfffff494, // negative offset (-2924)
 
       0U,
 
 
   21,
-  ACE_NTOHL (0x73757070),
-  ACE_NTOHL (0x6f727465),
-  ACE_NTOHL (0x645f696e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636573),
+  ACE_NTOHL (0x73757070), 
+  ACE_NTOHL (0x6f727465), 
+  ACE_NTOHL (0x645f696e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636573), 
   ACE_NTOHL (0x0),  // name = supported_interfaces
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   92, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-    16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+        16,
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       0xffffffff, // indirection
@@ -12092,31 +11887,31 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   21,
-  ACE_NTOHL (0x61627374),
-  ACE_NTOHL (0x72616374),
-  ACE_NTOHL (0x5f626173),
-  ACE_NTOHL (0x655f7661),
-  ACE_NTOHL (0x6c756573),
+  ACE_NTOHL (0x61627374), 
+  ACE_NTOHL (0x72616374), 
+  ACE_NTOHL (0x5f626173), 
+  ACE_NTOHL (0x655f7661), 
+  ACE_NTOHL (0x6c756573), 
   ACE_NTOHL (0x0),  // name = abstract_base_values
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff7c, // negative offset (-132)
   15,
-  ACE_NTOHL (0x69735f74),
-  ACE_NTOHL (0x72756e63),
-  ACE_NTOHL (0x61746162),
+  ACE_NTOHL (0x69735f74), 
+  ACE_NTOHL (0x72756e63), 
+  ACE_NTOHL (0x61746162), 
   ACE_NTOHL (0x6c650000),  // name = is_truncatable
-  CORBA::tk_boolean,
+    CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x62617365),
-  ACE_NTOHL (0x5f76616c),
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f76616c), 
   ACE_NTOHL (0x75650000),  // name = base_value
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xfffff410, // negative offset (-3056)
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
-  CORBA::tk_TypeCode,
+    CORBA::tk_TypeCode,
 
 };
 
@@ -12131,8 +11926,8 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDef_FullValueDescription (
 ::CORBA::TypeCode_ptr CORBA::ValueDef::_tc_FullValueDescription =
   &_tc_TAO_tc_CORBA_ValueDef_FullValueDescription;
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -12141,7 +11936,7 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ValueDef::FullValueDescription * CORBA::ValueDef::describe_value (
     ACE_ENV_SINGLE_ARG_DECL
@@ -12150,10 +11945,10 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.describe_value (
       this
       ACE_ENV_ARG_PARAMETER
@@ -12161,7 +11956,7 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ValueMemberDef_ptr CORBA::ValueDef::create_value_member (
     const char * id,
@@ -12175,10 +11970,10 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.create_value_member (
       this,
       id,
@@ -12191,7 +11986,7 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::AttributeDef_ptr CORBA::ValueDef::create_attribute (
     const char * id,
@@ -12205,10 +12000,10 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.create_attribute (
       this,
       id,
@@ -12221,7 +12016,7 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::OperationDef_ptr CORBA::ValueDef::create_operation (
     const char * id,
@@ -12238,10 +12033,10 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy =
+  _TAO_ValueDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.create_operation (
       this,
       id,
@@ -12257,25 +12052,25 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ValueDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756544),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c756544), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-  9,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65446566),
+    9,
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x0),  // name = ValueDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDef (
     CORBA::tk_objref,
@@ -12295,143 +12090,143 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ValueDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756544),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c756544), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDescription:1.0
-  17,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+    17,
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = ValueDescription
   10, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
+    5,
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+        11,
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
   ACE_NTOHL (0x69640000),  // name = id
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+        13,
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   12,
-  ACE_NTOHL (0x69735f61),
-  ACE_NTOHL (0x62737472),
+  ACE_NTOHL (0x69735f61), 
+  ACE_NTOHL (0x62737472), 
   ACE_NTOHL (0x61637400),  // name = is_abstract
-  CORBA::tk_boolean,
+    CORBA::tk_boolean,
 
   10,
-  ACE_NTOHL (0x69735f63),
-  ACE_NTOHL (0x7573746f),
+  ACE_NTOHL (0x69735f63), 
+  ACE_NTOHL (0x7573746f), 
   ACE_NTOHL (0x6d000000),  // name = is_custom
-  CORBA::tk_boolean,
+    CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff74, // negative offset (-140)
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-    12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+        12,
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   21,
-  ACE_NTOHL (0x73757070),
-  ACE_NTOHL (0x6f727465),
-  ACE_NTOHL (0x645f696e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636573),
+  ACE_NTOHL (0x73757070), 
+  ACE_NTOHL (0x6f727465), 
+  ACE_NTOHL (0x645f696e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636573), 
   ACE_NTOHL (0x0),  // name = supported_interfaces
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   92, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
-    16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+        16,
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       0xffffffff, // indirection
@@ -12440,26 +12235,26 @@ static const CORBA::Long _oc_CORBA_ValueDescription[] =
 
 
   21,
-  ACE_NTOHL (0x61627374),
-  ACE_NTOHL (0x72616374),
-  ACE_NTOHL (0x5f626173),
-  ACE_NTOHL (0x655f7661),
-  ACE_NTOHL (0x6c756573),
+  ACE_NTOHL (0x61627374), 
+  ACE_NTOHL (0x72616374), 
+  ACE_NTOHL (0x5f626173), 
+  ACE_NTOHL (0x655f7661), 
+  ACE_NTOHL (0x6c756573), 
   ACE_NTOHL (0x0),  // name = abstract_base_values
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffff7c, // negative offset (-132)
   15,
-  ACE_NTOHL (0x69735f74),
-  ACE_NTOHL (0x72756e63),
-  ACE_NTOHL (0x61746162),
+  ACE_NTOHL (0x69735f74), 
+  ACE_NTOHL (0x72756e63), 
+  ACE_NTOHL (0x61746162), 
   ACE_NTOHL (0x6c650000),  // name = is_truncatable
-  CORBA::tk_boolean,
+    CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x62617365),
-  ACE_NTOHL (0x5f76616c),
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f76616c), 
   ACE_NTOHL (0x75650000),  // name = base_value
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xfffffe48, // negative offset (-440)
 };
 
@@ -12480,8 +12275,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ValueDescription::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -12490,7 +12285,2913 @@ void CORBA::ValueDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
+int CORBA::ExtValueDef::_tao_class_id = 0;
+
+CORBA::ExtValueDef_ptr
+tao_CORBA_ExtValueDef_duplicate (
+    CORBA::ExtValueDef_ptr p
+  )
+{
+  return CORBA::ExtValueDef::_duplicate (p);
+}
+
+void
+tao_CORBA_ExtValueDef_release (
+    CORBA::ExtValueDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA::ExtValueDef_ptr
+tao_CORBA_ExtValueDef_nil (
+    void
+  )
+{
+  return CORBA::ExtValueDef::_nil ();
+}
+
+CORBA::ExtValueDef_ptr
+tao_CORBA_ExtValueDef_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return CORBA::ExtValueDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+tao_CORBA_ExtValueDef_upcast (
+    void *src
+  )
+{
+  CORBA::ExtValueDef **tmp =
+    ACE_static_cast (CORBA::ExtValueDef **, src);
+  return *tmp;
+}
+
+CORBA::Boolean
+tao_CORBA_ExtValueDef_marshal (
+    CORBA::ExtValueDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
+// *************************************************************
+// CORBA::ExtValueDef_var
+// *************************************************************
+
+CORBA::ExtValueDef_var::ExtValueDef_var (void)
+  : ptr_ (ExtValueDef::_nil ())
+{}
+
+::CORBA::ExtValueDef_ptr
+CORBA::ExtValueDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA::ExtValueDef_var::ExtValueDef_var (const ::CORBA::ExtValueDef_var &p)
+  : TAO_Base_var (),
+    ptr_ (ExtValueDef::_duplicate (p.ptr ()))
+{}
+
+CORBA::ExtValueDef_var::~ExtValueDef_var (void)
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA::ExtValueDef_var &
+CORBA::ExtValueDef_var::operator= (ExtValueDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ExtValueDef_var &
+CORBA::ExtValueDef_var::operator= (const ::CORBA::ExtValueDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA::ExtValueDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA::ExtValueDef_var::operator const ::CORBA::ExtValueDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA::ExtValueDef_var::operator ::CORBA::ExtValueDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtValueDef_ptr
+CORBA::ExtValueDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtValueDef_ptr
+CORBA::ExtValueDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtValueDef_ptr &
+CORBA::ExtValueDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtValueDef_ptr &
+CORBA::ExtValueDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ExtValueDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA::ExtValueDef_ptr
+CORBA::ExtValueDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA::ExtValueDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA::ExtValueDef::_nil ();
+  return val;
+}
+
+::CORBA::ExtValueDef_ptr
+CORBA::ExtValueDef_var::tao_duplicate (ExtValueDef_ptr p)
+{
+  return ::CORBA::ExtValueDef::_duplicate (p);
+}
+
+void
+CORBA::ExtValueDef_var::tao_release (ExtValueDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA::ExtValueDef_ptr
+CORBA::ExtValueDef_var::tao_nil (void)
+{
+  return ::CORBA::ExtValueDef::_nil ();
+}
+
+::CORBA::ExtValueDef_ptr
+CORBA::ExtValueDef_var::tao_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return ::CORBA::ExtValueDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+CORBA::ExtValueDef_var::tao_upcast (void *src)
+{
+  ExtValueDef **tmp =
+    ACE_static_cast (ExtValueDef **, src);
+  return *tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
+// *************************************************************
+// CORBA::ExtValueDef_out
+// *************************************************************
+
+CORBA::ExtValueDef_out::ExtValueDef_out (ExtValueDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA::ExtValueDef::_nil ();
+}
+
+CORBA::ExtValueDef_out::ExtValueDef_out (ExtValueDef_var &p)
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA::ExtValueDef::_nil ();
+}
+
+CORBA::ExtValueDef_out::ExtValueDef_out (const ::CORBA::ExtValueDef_out &p)
+  : ptr_ (ACE_const_cast (ExtValueDef_out &, p).ptr_)
+{}
+
+::CORBA::ExtValueDef_out &
+CORBA::ExtValueDef_out::operator= (const ::CORBA::ExtValueDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtValueDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA::ExtValueDef_out &
+CORBA::ExtValueDef_out::operator= (const ::CORBA::ExtValueDef_var &p)
+{
+  this->ptr_ = ::CORBA::ExtValueDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA::ExtValueDef_out &
+CORBA::ExtValueDef_out::operator= (ExtValueDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA::ExtValueDef_out::operator ::CORBA::ExtValueDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtValueDef_ptr &
+CORBA::ExtValueDef_out::ptr (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::ExtValueDef_ptr
+CORBA::ExtValueDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::ExtInitializerSeq * result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get (const TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get &);
+    
+    ::CORBA::ExtInitializerSeq * _result;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get::TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
+void 
+TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get::result (::CORBA::ExtInitializerSeq * result)
+{
+  // Update the result. 
+  this->_result = result;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const CORBA::ExtInitializerSeq & ext_initializers
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set (const TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set &);
+    const CORBA::ExtInitializerSeq & ext_initializers_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set::TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const CORBA::ExtInitializerSeq & ext_initializers
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      ext_initializers_ (ext_initializers)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<=  this->ext_initializers_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::ExtValueDef::ExtFullValueDescription * result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value (const TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value &);
+    
+    ::CORBA::ExtValueDef::ExtFullValueDescription * _result;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value::TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
+void 
+TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value::result (::CORBA::ExtValueDef::ExtFullValueDescription * result)
+{
+  // Update the result. 
+  this->_result = result;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
+class TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute : public TAO_ClientRequestInfo_i
+{
+public:
+  TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::IDLType_ptr type,
+      CORBA::AttributeMode & mode,
+      const CORBA::ExceptionDefSeq & get_exceptions,
+      const CORBA::ExceptionDefSeq & set_exceptions
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::ExtAttributeDef_ptr result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute (const TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute &);
+    const char * id_;
+    const char * name_;
+    const char * version_;
+    CORBA::IDLType_ptr type_;
+    const CORBA::AttributeMode & mode_;
+    const CORBA::ExceptionDefSeq & get_exceptions_;
+    const CORBA::ExceptionDefSeq & set_exceptions_;
+    
+    ::CORBA::ExtAttributeDef_ptr _result;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+  
+  TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute::TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::IDLType_ptr type,
+      CORBA::AttributeMode & mode,
+      const CORBA::ExceptionDefSeq & get_exceptions,
+      const CORBA::ExceptionDefSeq & set_exceptions
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      id_ (id),
+      name_ (name),
+      version_ (version),
+      type_ (type),
+      mode_ (mode),
+      get_exceptions_ (get_exceptions),
+      set_exceptions_ (set_exceptions)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  
+  parameter_list->length (7);
+  CORBA::ULong len = 0;
+  (*parameter_list)[len].argument <<= id_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= name_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= version_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->type_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->mode_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->get_exceptions_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->set_exceptions_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
+void 
+TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute::result (::CORBA::ExtAttributeDef_ptr result)
+{
+  // Update the result. 
+  this->_result = result;
+}
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//                Base & Remote Proxy  Implementation. 
+//
+
+CORBA::_TAO_ExtValueDef_Proxy_Impl::_TAO_ExtValueDef_Proxy_Impl (void)
+{}
+
+CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::_TAO_ExtValueDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+::CORBA::ExtInitializerSeq * CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
+    CORBA::Object *_collocated_tao_target_
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::ExtInitializerSeq_var _tao_retval;
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+  
+  {
+    CORBA::ExtInitializerSeq *tmp;
+    ACE_NEW_RETURN (tmp, CORBA::ExtInitializerSeq, _tao_retval._retn ());
+    _tao_retval = tmp;
+  }
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "_get_ext_initializers",
+      21,
+      0,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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 ());
+
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ExtInitializerSeq * _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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
+    CORBA::Object *_collocated_tao_target_,
+    const CORBA::ExtInitializerSeq & ext_initializers
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "_set_ext_initializers",
+      21,
+      1,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_,
+          ext_initializers
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK;
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << ext_initializers)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
+                );
+            }
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
+              
+              continue;
+            }
+#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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK;
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+::CORBA::ExtValueDef::ExtFullValueDescription * CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::describe_ext_value (
+    CORBA::Object *_collocated_tao_target_
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::ExtValueDef::ExtFullValueDescription_var _tao_retval;
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+  
+  {
+    CORBA::ExtValueDef::ExtFullValueDescription *tmp;
+    ACE_NEW_RETURN (tmp, CORBA::ExtValueDef::ExtFullValueDescription, _tao_retval._retn ());
+    _tao_retval = tmp;
+  }
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "describe_ext_value",
+      18,
+      0,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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 ());
+
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ExtValueDef::ExtFullValueDescription * _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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
+::CORBA::ExtAttributeDef_ptr CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::create_ext_attribute (
+    CORBA::Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA::IDLType_ptr type,
+    CORBA::AttributeMode mode,
+    const CORBA::ExceptionDefSeq & get_exceptions,
+    const CORBA::ExceptionDefSeq & set_exceptions
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::ExtAttributeDef_var _tao_retval (CORBA::ExtAttributeDef::_nil ());
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+    
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_ext_attribute",
+      20,
+      7,
+      istub->orb_core ()
+    );
+  
+  int _invoke_status;
+  
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors (),
+      &_tao_call,
+      _invoke_status
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute _tao_ri (
+          &_tao_call,
+          _collocated_tao_target_,
+          id,
+          name,
+          version,
+          type,
+          mode,
+          get_exceptions,
+          set_exceptions
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+      
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      
+      ACE_TRY
+        {
+          _tao_vfr.send_request (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              _tao_call.restart_flag (1);
+              continue;
+            }
+          
+#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_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << type) &&
+              (_tao_out << mode) &&
+              (_tao_out << get_exceptions) &&
+              (_tao_out << set_exceptions)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                  CORBA::MARSHAL (
+                      
+                    ),
+                  0
+                );
+            }
+          
+          _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_INTERCEPTOR (
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::ExtAttributeDef_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
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
+#endif  /* TAO_HAS_INTERCEPTORS */
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
+}
+
+//
+//            End  Base & Remote  Proxy Implemeentation. 
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
+
+///////////////////////////////////////////////////////////////////////
+//           Remote & Base  Proxy Broker Implementation
+//
+
+CORBA::_TAO_ExtValueDef_Proxy_Broker::_TAO_ExtValueDef_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtValueDef_Proxy_Broker::~_TAO_ExtValueDef_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtValueDef_Proxy_Broker * (*CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+// Factory Member function Implementation.
+CORBA::_TAO_ExtValueDef_Remote_Proxy_Broker *
+CORBA::_TAO_ExtValueDef_Remote_Proxy_Broker::the_TAO_ExtValueDef_Remote_Proxy_Broker (void)
+{
+  static ::CORBA::_TAO_ExtValueDef_Remote_Proxy_Broker remote_proxy_broker;
+  return &remote_proxy_broker;
+}
+
+CORBA::_TAO_ExtValueDef_Remote_Proxy_Broker::_TAO_ExtValueDef_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtValueDef_Remote_Proxy_Broker::~_TAO_ExtValueDef_Remote_Proxy_Broker (void)
+{
+}
+
+CORBA::_TAO_ExtValueDef_Proxy_Impl&
+CORBA::_TAO_ExtValueDef_Remote_Proxy_Broker::select_proxy (
+    ::CORBA::ExtValueDef *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  return this->remote_proxy_impl_;
+}
+
+//
+//           End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+
+CORBA::ExtValueDef::ExtValueDef (int collocated)
+{
+  this->CORBA_ExtValueDef_setup_collocation (collocated);
+}
+
+void
+CORBA::ExtValueDef::CORBA_ExtValueDef_setup_collocation (int collocated)
+{
+  if (collocated)
+    this->the_TAO_ExtValueDef_Proxy_Broker_ =
+      ::CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer (this);
+  else
+    this->the_TAO_ExtValueDef_Proxy_Broker_ =
+      ::CORBA::_TAO_ExtValueDef_Remote_Proxy_Broker::the_TAO_ExtValueDef_Remote_Proxy_Broker ();
+  
+  this->CORBA_ValueDef_setup_collocation (collocated);
+}
+
+CORBA::ExtValueDef::~ExtValueDef (void)
+{}
+
+void 
+CORBA::ExtValueDef::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtValueDef *tmp = ACE_static_cast (ExtValueDef *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+CORBA::ExtValueDef_ptr
+CORBA::ExtValueDef::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return ExtValueDef::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/ExtValueDef:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
+      ACE_CHECK_RETURN (ExtValueDef::_nil ());
+      
+      if (is_a == 0)
+        {
+          return ExtValueDef::_nil ();
+        }
+    }
+  
+  return ExtValueDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::ExtValueDef_ptr 
+CORBA::ExtValueDef::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return ExtValueDef::_nil ();
+    }
+  
+  if (! obj->_is_local ())
+    {
+      TAO_Stub* stub = obj->_stubobj ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
+      ExtValueDef_ptr default_proxy = ExtValueDef::_nil ();
+      
+      if (
+          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+          obj->_is_collocated () &&
+          CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer != 0
+        )
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ExtValueDef (
+                  stub,
+                  1,
+                  obj->_servant ()
+                ),
+              ExtValueDef::_nil ()
+            );
+        }
+      
+      if (CORBA::is_nil (default_proxy))
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA::ExtValueDef (
+                  stub,
+                  0,
+                  obj->_servant ()
+                ),
+              ExtValueDef::_nil ()
+            );
+        }
+      
+      return default_proxy;
+    }
+  else 
+    return
+      ACE_reinterpret_cast (
+          ExtValueDef_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ExtValueDef::_tao_class_id
+                )
+            )
+        );
+}
+
+CORBA::ExtValueDef_ptr
+CORBA::ExtValueDef::_duplicate (ExtValueDef_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+CORBA::ExtValueDef::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ExtValueDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/ValueDef:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Container:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Contained:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/IDLType:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/IRObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
+}
+
+void *CORBA::ExtValueDef::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, ExtValueDef)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, ValueDef)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::ValueDef_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Container::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Container_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Contained::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Contained_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::IDLType::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::IDLType_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::IRObject::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::IRObject_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
+  return retv;
+}
+
+const char* CORBA::ExtValueDef::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/CORBA/ExtValueDef:1.0";
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::ExtInitializerSeq * CORBA::ExtValueDef::ext_initializers (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_ExtValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_ExtValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return proxy.ext_initializers (
+      this
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+void CORBA::ExtValueDef::ext_initializers (
+    const CORBA::ExtInitializerSeq & ext_initializers
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_ExtValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_ExtValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  proxy.ext_initializers (
+      this,
+      ext_initializers
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExtValueDef_ExtFullValueDescription[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  58,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x7456616c), 
+  ACE_NTOHL (0x75654465), 
+  ACE_NTOHL (0x662f4578), 
+  ACE_NTOHL (0x7446756c), 
+  ACE_NTOHL (0x6c56616c), 
+  ACE_NTOHL (0x75654465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtValueDef/ExtFullValueDescription:1.0
+    24,
+  ACE_NTOHL (0x45787446), 
+  ACE_NTOHL (0x756c6c56), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e00),  // name = ExtFullValueDescription
+  15, // member count
+    5,
+  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x0),  // name = name
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    33,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+        11,
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x65720000),  // name = Identifier
+        CORBA::tk_string, 
+    0U, // string length
+
+  3,
+  ACE_NTOHL (0x69640000),  // name = id
+    CORBA::tk_alias, // typecode kind for typedefs
+  72, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    35,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+        13,
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x0),  // name = RepositoryId
+        CORBA::tk_string, 
+    0U, // string length
+
+  12,
+  ACE_NTOHL (0x69735f61), 
+  ACE_NTOHL (0x62737472), 
+  ACE_NTOHL (0x61637400),  // name = is_abstract
+    CORBA::tk_boolean,
+
+  10,
+  ACE_NTOHL (0x69735f63), 
+  ACE_NTOHL (0x7573746f), 
+  ACE_NTOHL (0x6d000000),  // name = is_custom
+    CORBA::tk_boolean,
+
+  11,
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x696e0000),  // name = defined_in
+    0xffffffff, // indirection
+  0xffffff74, // negative offset (-140)
+  8,
+  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x696f6e00),  // name = version
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    34,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+        12,
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x70656300),  // name = VersionSpec
+        CORBA::tk_string, 
+    0U, // string length
+
+  11,
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e730000),  // name = operations
+    CORBA::tk_alias, // typecode kind for typedefs
+  1340, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    39,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f70), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
+        17,
+    ACE_NTOHL (0x4f704465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x0),  // name = OpDescriptionSeq
+        CORBA::tk_sequence, // typecode kind
+    1260, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      1244, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        43,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f70), 
+        ACE_NTOHL (0x65726174), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
+                21,
+        ACE_NTOHL (0x4f706572), 
+        ACE_NTOHL (0x6174696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x0),  // name = OperationDescription
+        9, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                0xffffffff, // indirection
+        0xfffffdec, // negative offset (-532)
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                0xffffffff, // indirection
+        0xfffffe30, // negative offset (-464)
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                0xffffffff, // indirection
+        0xfffffe18, // negative offset (-488)
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                0xffffffff, // indirection
+        0xfffffea0, // negative offset (-352)
+        7,
+        ACE_NTOHL (0x72657375), 
+        ACE_NTOHL (0x6c740000),  // name = result
+                CORBA::tk_TypeCode,
+
+        5,
+        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x0),  // name = mode
+                CORBA::tk_enum, // typecode kind
+        100, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+          36,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4f70), 
+          ACE_NTOHL (0x65726174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
+          14,
+          ACE_NTOHL (0x4f706572), 
+          ACE_NTOHL (0x6174696f), 
+          ACE_NTOHL (0x6e4d6f64), 
+          ACE_NTOHL (0x65000000),  // name = OperationMode
+          2, // member count
+          10,
+          ACE_NTOHL (0x4f505f4e), 
+          ACE_NTOHL (0x4f524d41), 
+          ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
+          10,
+          ACE_NTOHL (0x4f505f4f), 
+          ACE_NTOHL (0x4e455741), 
+          ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
+          
+        9,
+        ACE_NTOHL (0x636f6e74), 
+        ACE_NTOHL (0x65787473), 
+        ACE_NTOHL (0x0),  // name = contexts
+                CORBA::tk_alias, // typecode kind for typedefs
+        168, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          35,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f436f), 
+          ACE_NTOHL (0x6e746578), 
+          ACE_NTOHL (0x74496453), 
+          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
+                    13,
+          ACE_NTOHL (0x436f6e74), 
+          ACE_NTOHL (0x65787449), 
+          ACE_NTOHL (0x64536571), 
+          ACE_NTOHL (0x0),  // name = ContextIdSeq
+                    CORBA::tk_sequence, // typecode kind
+          96, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_alias, // typecode kind for typedefs
+            80, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              40,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f436f), 
+              ACE_NTOHL (0x6e746578), 
+              ACE_NTOHL (0x74496465), 
+              ACE_NTOHL (0x6e746966), 
+              ACE_NTOHL (0x6965723a), 
+              ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
+                            18,
+              ACE_NTOHL (0x436f6e74), 
+              ACE_NTOHL (0x65787449), 
+              ACE_NTOHL (0x64656e74), 
+              ACE_NTOHL (0x69666965), 
+              ACE_NTOHL (0x72000000),  // name = ContextIdentifier
+                            0xffffffff, // indirection
+              0xfffffc6c, // negative offset (-916)
+
+            0U,
+
+
+        11,
+        ACE_NTOHL (0x70617261), 
+        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x72730000),  // name = parameters
+                CORBA::tk_alias, // typecode kind for typedefs
+        428, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          40,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5061), 
+          ACE_NTOHL (0x72446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
+                    18,
+          ACE_NTOHL (0x50617244), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
+                    CORBA::tk_sequence, // typecode kind
+          348, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_struct, // typecode kind
+            332, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              43,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5061), 
+              ACE_NTOHL (0x72616d65), 
+              ACE_NTOHL (0x74657244), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
+                            21,
+              ACE_NTOHL (0x50617261), 
+              ACE_NTOHL (0x6d657465), 
+              ACE_NTOHL (0x72446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x0),  // name = ParameterDescription
+              4, // member count
+                            5,
+              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x0),  // name = name
+                            0xffffffff, // indirection
+              0xfffffb8c, // negative offset (-1140)
+              5,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x0),  // name = type
+                            CORBA::tk_TypeCode,
+
+              9,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x0),  // name = type_def
+                            CORBA::tk_objref, // typecode kind
+              52, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                30,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x653a312e), 
+                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                                8,
+                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x79706500),  // name = IDLType
+                
+              5,
+              ACE_NTOHL (0x6d6f6465), 
+              ACE_NTOHL (0x0),  // name = mode
+                            CORBA::tk_enum, // typecode kind
+              116, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+                36,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5061), 
+                ACE_NTOHL (0x72616d65), 
+                ACE_NTOHL (0x7465724d), 
+                ACE_NTOHL (0x6f64653a), 
+                ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+                14,
+                ACE_NTOHL (0x50617261), 
+                ACE_NTOHL (0x6d657465), 
+                ACE_NTOHL (0x724d6f64), 
+                ACE_NTOHL (0x65000000),  // name = ParameterMode
+                3, // member count
+                9,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x0),  // name = PARAM_IN
+                10,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f4f55), 
+                ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+                12,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+                
+
+            0U,
+
+
+        11,
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = exceptions
+                CORBA::tk_alias, // typecode kind for typedefs
+        276, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          40,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+                    18,
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+                    CORBA::tk_sequence, // typecode kind
+          196, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_struct, // typecode kind
+            180, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              43,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                            21,
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x0),  // name = ExceptionDescription
+              5, // member count
+                            5,
+              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x0),  // name = name
+                            0xffffffff, // indirection
+              0xfffff9c8, // negative offset (-1592)
+              3,
+              ACE_NTOHL (0x69640000),  // name = id
+                            0xffffffff, // indirection
+              0xfffffa0c, // negative offset (-1524)
+              11,
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x696e0000),  // name = defined_in
+                            0xffffffff, // indirection
+              0xfffff9f4, // negative offset (-1548)
+              8,
+              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x696f6e00),  // name = version
+                            0xffffffff, // indirection
+              0xfffffa7c, // negative offset (-1412)
+              5,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x0),  // name = type
+                            CORBA::tk_TypeCode,
+
+
+            0U,
+
+
+
+      0U,
+
+
+  11,
+  ACE_NTOHL (0x61747472), 
+  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x65730000),  // name = attributes
+    CORBA::tk_alias, // typecode kind for typedefs
+  468, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    44,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x74417474), 
+    ACE_NTOHL (0x72446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
+        22,
+    ACE_NTOHL (0x45787441), 
+    ACE_NTOHL (0x74747244), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
+        CORBA::tk_sequence, // typecode kind
+    380, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      364, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        46,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x74417474), 
+        ACE_NTOHL (0x72696275), 
+        ACE_NTOHL (0x74654465), 
+        ACE_NTOHL (0x73637269), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e3a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
+                24,
+        ACE_NTOHL (0x45787441), 
+        ACE_NTOHL (0x74747269), 
+        ACE_NTOHL (0x62757465), 
+        ACE_NTOHL (0x44657363), 
+        ACE_NTOHL (0x72697074), 
+        ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
+        8, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                0xffffffff, // indirection
+        0xfffff88c, // negative offset (-1908)
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                0xffffffff, // indirection
+        0xfffff8d0, // negative offset (-1840)
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                0xffffffff, // indirection
+        0xfffff8b8, // negative offset (-1864)
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                0xffffffff, // indirection
+        0xfffff940, // negative offset (-1728)
+        5,
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x0),  // name = type
+                CORBA::tk_TypeCode,
+
+        5,
+        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x0),  // name = mode
+                CORBA::tk_enum, // typecode kind
+        104, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+          36,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4174), 
+          ACE_NTOHL (0x74726962), 
+          ACE_NTOHL (0x7574654d), 
+          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
+          14,
+          ACE_NTOHL (0x41747472), 
+          ACE_NTOHL (0x69627574), 
+          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x65000000),  // name = AttributeMode
+          2, // member count
+          12,
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
+          14,
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f524541), 
+          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
+          
+        15,
+        ACE_NTOHL (0x6765745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = get_exceptions
+                0xffffffff, // indirection
+        0xfffffd18, // negative offset (-744)
+        15,
+        ACE_NTOHL (0x7075745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = put_exceptions
+                0xffffffff, // indirection
+        0xfffffcfc, // negative offset (-772)
+
+      0U,
+
+
+  8,
+  ACE_NTOHL (0x6d656d62), 
+  ACE_NTOHL (0x65727300),  // name = members
+    CORBA::tk_alias, // typecode kind for typedefs
+  360, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    37,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5661), 
+    ACE_NTOHL (0x6c75654d), 
+    ACE_NTOHL (0x656d6265), 
+    ACE_NTOHL (0x72536571), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
+        15,
+    ACE_NTOHL (0x56616c75), 
+    ACE_NTOHL (0x654d656d), 
+    ACE_NTOHL (0x62657253), 
+    ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
+        CORBA::tk_sequence, // typecode kind
+    284, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      268, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        34,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5661), 
+        ACE_NTOHL (0x6c75654d), 
+        ACE_NTOHL (0x656d6265), 
+        ACE_NTOHL (0x723a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
+                12,
+        ACE_NTOHL (0x56616c75), 
+        ACE_NTOHL (0x654d656d), 
+        ACE_NTOHL (0x62657200),  // name = ValueMember
+        7, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                0xffffffff, // indirection
+        0xfffff6c8, // negative offset (-2360)
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                0xffffffff, // indirection
+        0xfffff70c, // negative offset (-2292)
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                0xffffffff, // indirection
+        0xfffff6f4, // negative offset (-2316)
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                0xffffffff, // indirection
+        0xfffff77c, // negative offset (-2180)
+        5,
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x0),  // name = type
+                CORBA::tk_TypeCode,
+
+        9,
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x5f646566), 
+        ACE_NTOHL (0x0),  // name = type_def
+                0xffffffff, // indirection
+        0xfffffafc, // negative offset (-1284)
+        7,
+        ACE_NTOHL (0x61636365), 
+        ACE_NTOHL (0x73730000),  // name = access
+                CORBA::tk_alias, // typecode kind for typedefs
+        64, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          33,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5669), 
+          ACE_NTOHL (0x73696269), 
+          ACE_NTOHL (0x6c697479), 
+          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
+                    11,
+          ACE_NTOHL (0x56697369), 
+          ACE_NTOHL (0x62696c69), 
+          ACE_NTOHL (0x74790000),  // name = Visibility
+                    CORBA::tk_short,
+
+
+
+      0U,
+
+
+  13,
+  ACE_NTOHL (0x696e6974), 
+  ACE_NTOHL (0x69616c69), 
+  ACE_NTOHL (0x7a657273), 
+  ACE_NTOHL (0x0),  // name = initializers
+    CORBA::tk_alias, // typecode kind for typedefs
+  452, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    40,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x74496e69), 
+    ACE_NTOHL (0x7469616c), 
+    ACE_NTOHL (0x697a6572), 
+    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtInitializerSeq:1.0
+        18,
+    ACE_NTOHL (0x45787449), 
+    ACE_NTOHL (0x6e697469), 
+    ACE_NTOHL (0x616c697a), 
+    ACE_NTOHL (0x65725365), 
+    ACE_NTOHL (0x71000000),  // name = ExtInitializerSeq
+        CORBA::tk_sequence, // typecode kind
+    372, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      356, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        37,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x74496e69), 
+        ACE_NTOHL (0x7469616c), 
+        ACE_NTOHL (0x697a6572), 
+        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInitializer:1.0
+                15,
+        ACE_NTOHL (0x45787449), 
+        ACE_NTOHL (0x6e697469), 
+        ACE_NTOHL (0x616c697a), 
+        ACE_NTOHL (0x65720000),  // name = ExtInitializer
+        3, // member count
+                8,
+        ACE_NTOHL (0x6d656d62), 
+        ACE_NTOHL (0x65727300),  // name = members
+                CORBA::tk_alias, // typecode kind for typedefs
+        220, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          38,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5374), 
+          ACE_NTOHL (0x72756374), 
+          ACE_NTOHL (0x4d656d62), 
+          ACE_NTOHL (0x65725365), 
+          ACE_NTOHL (0x713a312e), 
+          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
+                    16,
+          ACE_NTOHL (0x53747275), 
+          ACE_NTOHL (0x63744d65), 
+          ACE_NTOHL (0x6d626572), 
+          ACE_NTOHL (0x53657100),  // name = StructMemberSeq
+                    CORBA::tk_sequence, // typecode kind
+          144, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_struct, // typecode kind
+            128, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              35,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5374), 
+              ACE_NTOHL (0x72756374), 
+              ACE_NTOHL (0x4d656d62), 
+              ACE_NTOHL (0x65723a31), 
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
+                            13,
+              ACE_NTOHL (0x53747275), 
+              ACE_NTOHL (0x63744d65), 
+              ACE_NTOHL (0x6d626572), 
+              ACE_NTOHL (0x0),  // name = StructMember
+              3, // member count
+                            5,
+              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x0),  // name = name
+                            0xffffffff, // indirection
+              0xfffff488, // negative offset (-2936)
+              5,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x0),  // name = type
+                            CORBA::tk_TypeCode,
+
+              9,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x0),  // name = type_def
+                            0xffffffff, // indirection
+              0xfffff8f8, // negative offset (-1800)
+
+            0U,
+
+
+        11,
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = exceptions
+                0xffffffff, // indirection
+        0xfffff9b4, // negative offset (-1612)
+        5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                0xffffffff, // indirection
+        0xfffff430, // negative offset (-3024)
+
+      0U,
+
+
+  21,
+  ACE_NTOHL (0x73757070), 
+  ACE_NTOHL (0x6f727465), 
+  ACE_NTOHL (0x645f696e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636573), 
+  ACE_NTOHL (0x0),  // name = supported_interfaces
+    CORBA::tk_alias, // typecode kind for typedefs
+  92, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    38,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
+        16,
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
+        CORBA::tk_sequence, // typecode kind
+    16, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      0xffffffff, // indirection
+      0xfffff404, // negative offset (-3068)
+      0U,
+
+
+  21,
+  ACE_NTOHL (0x61627374), 
+  ACE_NTOHL (0x72616374), 
+  ACE_NTOHL (0x5f626173), 
+  ACE_NTOHL (0x655f7661), 
+  ACE_NTOHL (0x6c756573), 
+  ACE_NTOHL (0x0),  // name = abstract_base_values
+    0xffffffff, // indirection
+  0xffffff7c, // negative offset (-132)
+  15,
+  ACE_NTOHL (0x69735f74), 
+  ACE_NTOHL (0x72756e63), 
+  ACE_NTOHL (0x61746162), 
+  ACE_NTOHL (0x6c650000),  // name = is_truncatable
+    CORBA::tk_boolean,
+
+  11,
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f76616c), 
+  ACE_NTOHL (0x75650000),  // name = base_value
+    0xffffffff, // indirection
+  0xfffff3ac, // negative offset (-3156)
+  5,
+  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x0),  // name = type
+    CORBA::tk_TypeCode,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtValueDef_ExtFullValueDescription (
+    CORBA::tk_struct,
+    sizeof (_oc_CORBA_ExtValueDef_ExtFullValueDescription),
+    (char *) &_oc_CORBA_ExtValueDef_ExtFullValueDescription,
+    0,
+    sizeof (CORBA::ExtValueDef::ExtFullValueDescription)
+  );
+
+::CORBA::TypeCode_ptr CORBA::ExtValueDef::_tc_ExtFullValueDescription =
+  &_tc_TAO_tc_CORBA_ExtValueDef_ExtFullValueDescription;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
+
+void CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExtFullValueDescription *tmp = ACE_static_cast (ExtFullValueDescription*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::ExtValueDef::ExtFullValueDescription * CORBA::ExtValueDef::describe_ext_value (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_ExtValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_ExtValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return proxy.describe_ext_value (
+      this
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
+::CORBA::ExtAttributeDef_ptr CORBA::ExtValueDef::create_ext_attribute (
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA::IDLType_ptr type,
+    CORBA::AttributeMode mode,
+    const CORBA::ExceptionDefSeq & get_exceptions,
+    const CORBA::ExceptionDefSeq & set_exceptions
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  _TAO_ExtValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_ExtValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return proxy.create_ext_attribute (
+      this,
+      id,
+      name,
+      version,
+      type,
+      mode,
+      get_exceptions,
+      set_exceptions
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ExtValueDef[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  34,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x7456616c), 
+  ACE_NTOHL (0x75654465), 
+  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtValueDef:1.0
+    12,
+  ACE_NTOHL (0x45787456), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x44656600),  // name = ExtValueDef
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtValueDef (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_ExtValueDef),
+    (char *) &_oc_CORBA_ExtValueDef,
+    0,
+    sizeof (CORBA::ExtValueDef)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ExtValueDef,
+    &_tc_TAO_tc_CORBA_ExtValueDef
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ValueBoxDef::_tao_class_id = 0;
 
@@ -12537,8 +15238,17 @@ tao_CORBA_ValueBoxDef_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_ValueBoxDef_marshal (
+    CORBA::ValueBoxDef_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::ValueBoxDef_var
@@ -12588,7 +15298,7 @@ CORBA::ValueBoxDef_var::operator const ::CORBA::ValueBoxDef_ptr &() const // cas
   return this->ptr_;
 }
 
-CORBA::ValueBoxDef_var::operator ::CORBA::ValueBoxDef_ptr &() // cast
+CORBA::ValueBoxDef_var::operator ::CORBA::ValueBoxDef_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -12664,7 +15374,7 @@ CORBA::ValueBoxDef_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::ValueBoxDef_out
@@ -12726,12 +15436,12 @@ CORBA::ValueBoxDef_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get : public TAO_ClientRequestInfo_i
 {
@@ -12743,29 +15453,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::IDLType_ptr result);
-
+    
   private:
     TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get (const TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get &);
-
+    
     ::CORBA::IDLType_ptr _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -12778,7 +15488,7 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -12790,11 +15500,11 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12803,22 +15513,22 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (::CORBA::IDLType_ptr result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set : public TAO_ClientRequestInfo_i
 {
@@ -12831,10 +15541,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -12843,15 +15553,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set &);
     CORBA::IDLType_ptr original_type_def_;
   };
-
+  
   // TAO_IDL - Generated from
-  // 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_ValueBoxDef_original_type_def_set::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       original_type_def_ (original_type_def)
@@ -12865,15 +15575,15 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->original_type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -12885,11 +15595,11 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12898,7 +15608,7 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -12907,10 +15617,10 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (ACE_ENV_S
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 CORBA::_TAO_ValueBoxDef_Proxy_Impl::_TAO_ValueBoxDef_Proxy_Impl (void)
@@ -12922,7 +15632,7 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (v
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 ::CORBA::IDLType_ptr CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
     CORBA::Object *_collocated_tao_target_
@@ -12934,12 +15644,12 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (v
 {
   CORBA::IDLType_var _tao_retval (CORBA::IDLType::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_original_type_def",
@@ -12947,22 +15657,22 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (v
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get _tao_ri (
           &_tao_call,
@@ -12970,14 +15680,14 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (v
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -12985,86 +15695,78 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (v
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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 ());
-
-
-              _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 ();
-
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_INTERCEPTOR_THROW_RETURN (
-                          CORBA::MARSHAL (
-                              TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                            ),
-                          0
-                        );
-                    }
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              ACE_ENV_ARG_PARAMETER
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-#if TAO_HAS_INTERCEPTORS == 1
-                  ::CORBA::IDLType_ptr _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
+          
+          _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_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              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
+                );
+            }
+          
+#if TAO_HAS_INTERCEPTORS == 1
+          ::CORBA::IDLType_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
         {
@@ -13074,61 +15776,63 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (v
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
-
-return _tao_retval._retn ();
+  
+  return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
     CORBA::Object *_collocated_tao_target_,
@@ -13140,12 +15844,12 @@ void CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_original_type_def",
@@ -13153,22 +15857,22 @@ void CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set _tao_ri (
           &_tao_call,
@@ -13177,14 +15881,14 @@ void CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13192,78 +15896,70 @@ void CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           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.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.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          
+          if (!(
+              (_tao_out << original_type_def)
+              ))
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::MARSHAL (
+                      
+                    )
                 );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
-              if (!(
-                  (_tao_out << original_type_def)
-                  ))
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::MARSHAL (
+            }
+          
+          _invoke_status =
+            _tao_call.invoke (0, 0 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;
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW (
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
                     )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-
+                );
+            }
+          else if (_invoke_status == TAO_INVOKE_RESTART)
+            {
+              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
+                  _tao_vfr.receive_other (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-
-#if TAO_HAS_INTERCEPTORS == 1
+                )
+              
+              continue;
             }
+#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
         {
@@ -13273,63 +15969,65 @@ void CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
-          const PortableInterceptor::ReplyStatus _tao_status =
+          
+          PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
-      const PortableInterceptor::ReplyStatus _tao_status =
+      
+      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)
-
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
+      
+      break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -13376,8 +16074,8 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:225
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
 
 CORBA::ValueBoxDef::ValueBoxDef (int collocated)
 {
@@ -13393,14 +16091,14 @@ CORBA::ValueBoxDef::CORBA_ValueBoxDef_setup_collocation (int collocated)
   else
     this->the_TAO_ValueBoxDef_Proxy_Broker_ =
       ::CORBA::_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker ();
-
+  
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
 CORBA::ValueBoxDef::~ValueBoxDef (void)
 {}
 
-void
+void 
 CORBA::ValueBoxDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ValueBoxDef *tmp = ACE_static_cast (ValueBoxDef *, _tao_void_pointer);
@@ -13417,7 +16115,7 @@ CORBA::ValueBoxDef::_narrow (
     {
       return ValueBoxDef::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -13426,17 +16124,17 @@ CORBA::ValueBoxDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ValueBoxDef::_nil ());
-
+      
       if (is_a == 0)
         {
           return ValueBoxDef::_nil ();
         }
     }
-
+  
   return ValueBoxDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ValueBoxDef_ptr
+CORBA::ValueBoxDef_ptr 
 CORBA::ValueBoxDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -13446,18 +16144,18 @@ CORBA::ValueBoxDef::_unchecked_narrow (
     {
       return ValueBoxDef::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-
+      
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-
+      
       ValueBoxDef_ptr default_proxy = ValueBoxDef::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -13475,7 +16173,7 @@ CORBA::ValueBoxDef::_unchecked_narrow (
               ValueBoxDef::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -13488,10 +16186,10 @@ CORBA::ValueBoxDef::_unchecked_narrow (
               ValueBoxDef::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
       ACE_reinterpret_cast (
           ValueBoxDef_ptr,
@@ -13511,7 +16209,7 @@ CORBA::ValueBoxDef::_duplicate (ValueBoxDef_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -13562,7 +16260,7 @@ CORBA::ValueBoxDef::_is_a (
 void *CORBA::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ValueBoxDef)::_tao_class_id)
@@ -13637,12 +16335,12 @@ void *CORBA::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -13652,7 +16350,7 @@ const char* CORBA::ValueBoxDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::IDLType_ptr CORBA::ValueBoxDef::original_type_def (
     ACE_ENV_SINGLE_ARG_DECL
@@ -13661,10 +16359,10 @@ const char* CORBA::ValueBoxDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_ValueBoxDef_Proxy_Impl &proxy =
+  _TAO_ValueBoxDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueBoxDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.original_type_def (
       this
       ACE_ENV_ARG_PARAMETER
@@ -13672,7 +16370,7 @@ const char* CORBA::ValueBoxDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void CORBA::ValueBoxDef::original_type_def (
     CORBA::IDLType_ptr original_type_def
@@ -13682,10 +16380,10 @@ void CORBA::ValueBoxDef::original_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueBoxDef_Proxy_Impl &proxy =
+  _TAO_ValueBoxDef_Proxy_Impl &proxy = 
     this->the_TAO_ValueBoxDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.original_type_def (
       this,
       original_type_def
@@ -13694,26 +16392,26 @@ void CORBA::ValueBoxDef::original_type_def (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ValueBoxDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756542),
-  ACE_NTOHL (0x6f784465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c756542), 
+  ACE_NTOHL (0x6f784465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueBoxDef:1.0
-  12,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65426f78),
+    12,
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65426f78), 
   ACE_NTOHL (0x44656600),  // name = ValueBoxDef
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueBoxDef (
     CORBA::tk_objref,
@@ -13733,9 +16431,9 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -13747,26 +16445,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::FixedDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_FixedDef,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::FixedDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::FixedDef>::insert (
+      _tao_any,
+      CORBA::FixedDef::_tao_any_destructor,
+      CORBA::_tc_FixedDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -13775,60 +16466,35 @@ operator>>= (
     CORBA::FixedDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::FixedDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_FixedDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::FixedDef>::extract (
+        _tao_any,
+        CORBA::FixedDef::_tao_any_destructor,
+        CORBA::_tc_FixedDef,
+        _tao_elem
       );
+}
 
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_FixedDef,
-            1,
-            _tao_elem,
-            CORBA::FixedDef::_tao_any_destructor
-          );
-
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::FixedDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-
-  _tao_elem = CORBA::FixedDef::_nil ();
-  return 0;
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::FixedDef>::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::FixedDef,CORBA::FixedDef_var>;
+  template class TAO::Any_Impl_T<CORBA::FixedDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::FixedDef,CORBA::FixedDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::FixedDef, CORBA::FixedDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::FixedDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -13836,16 +16502,12 @@ void operator<<= (
     const CORBA::ValueMember &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ValueMember,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ValueMember>::insert_copy (
+      _tao_any,
+      CORBA::ValueMember::_tao_any_destructor,
+      CORBA::_tc_ValueMember,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -13854,19 +16516,12 @@ void operator<<= (
     CORBA::ValueMember *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ValueMember,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ValueMember::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ValueMember>::insert (
+      _tao_any,
+      CORBA::ValueMember::_tao_any_destructor,
+      CORBA::_tc_ValueMember,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -13887,75 +16542,24 @@ CORBA::Boolean operator>>= (
     const CORBA::ValueMember *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ValueMember
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::ValueMember*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        CORBA::ValueMember *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ValueMember,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ValueMember,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ValueMember::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueMember>::extract (
+        _tao_any,
+        CORBA::ValueMember::_tao_any_destructor,
+        CORBA::_tc_ValueMember,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ValueMember>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ValueMember>
+#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
 
 // Copying insertion.
 void operator<<= (
@@ -13963,16 +16567,12 @@ void operator<<= (
     const CORBA::ValueMemberSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ValueMemberSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert_copy (
+      _tao_any,
+      CORBA::ValueMemberSeq::_tao_any_destructor,
+      CORBA::_tc_ValueMemberSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -13981,19 +16581,12 @@ void operator<<= (
     CORBA::ValueMemberSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ValueMemberSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ValueMemberSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert (
+      _tao_any,
+      CORBA::ValueMemberSeq::_tao_any_destructor,
+      CORBA::_tc_ValueMemberSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -14002,8 +16595,8 @@ CORBA::Boolean operator>>= (
     CORBA::ValueMemberSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::ValueMemberSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ValueMemberSeq *&,
       _tao_elem
     );
 }
@@ -14014,77 +16607,19 @@ CORBA::Boolean operator>>= (
     const CORBA::ValueMemberSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ValueMemberSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::ValueMemberSeq*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        CORBA::ValueMemberSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ValueMemberSeq,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ValueMemberSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ValueMemberSeq::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::extract (
+        _tao_any,
+        CORBA::ValueMemberSeq::_tao_any_destructor,
+        CORBA::_tc_ValueMemberSeq,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -14096,26 +16631,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::ValueMemberDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ValueMemberDef,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::ValueMemberDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ValueMemberDef>::insert (
+      _tao_any,
+      CORBA::ValueMemberDef::_tao_any_destructor,
+      CORBA::_tc_ValueMemberDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -14124,62 +16652,37 @@ operator>>= (
     CORBA::ValueMemberDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ValueMemberDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ValueMemberDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ValueMemberDef>::extract (
+        _tao_any,
+        CORBA::ValueMemberDef::_tao_any_destructor,
+        CORBA::_tc_ValueMemberDef,
+        _tao_elem
       );
+}
 
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ValueMemberDef,
-            1,
-            _tao_elem,
-            CORBA::ValueMemberDef::_tao_any_destructor
-          );
-
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::ValueMemberDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-
-  _tao_elem = CORBA::ValueMemberDef::_nil ();
-  return 0;
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ValueMemberDef>::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::ValueMemberDef,CORBA::ValueMemberDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ValueMemberDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::ValueMemberDef,CORBA::ValueMemberDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ValueMemberDef, CORBA::ValueMemberDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ValueMemberDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -14191,26 +16694,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::ValueDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ValueDef,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::ValueDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ValueDef>::insert (
+      _tao_any,
+      CORBA::ValueDef::_tao_any_destructor,
+      CORBA::_tc_ValueDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -14219,60 +16715,35 @@ operator>>= (
     CORBA::ValueDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ValueDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ValueDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ValueDef>::extract (
+        _tao_any,
+        CORBA::ValueDef::_tao_any_destructor,
+        CORBA::_tc_ValueDef,
+        _tao_elem
       );
+}
 
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ValueDef,
-            1,
-            _tao_elem,
-            CORBA::ValueDef::_tao_any_destructor
-          );
-
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::ValueDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-
-  _tao_elem = CORBA::ValueDef::_nil ();
-  return 0;
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ValueDef>::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::ValueDef,CORBA::ValueDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ValueDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ValueDef, CORBA::ValueDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ValueDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -14280,16 +16751,12 @@ void operator<<= (
     const CORBA::ValueDef::FullValueDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::ValueDef::_tc_FullValueDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::insert_copy (
+      _tao_any,
+      CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
+      CORBA::ValueDef::_tc_FullValueDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -14298,19 +16765,12 @@ void operator<<= (
     CORBA::ValueDef::FullValueDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::ValueDef::_tc_FullValueDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ValueDef::FullValueDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::insert (
+      _tao_any,
+      CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
+      CORBA::ValueDef::_tc_FullValueDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -14331,75 +16791,24 @@ CORBA::Boolean operator>>= (
     const CORBA::ValueDef::FullValueDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::ValueDef::_tc_FullValueDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::ValueDef::FullValueDescription*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        CORBA::ValueDef::FullValueDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ValueDef::FullValueDescription,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::ValueDef::_tc_FullValueDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ValueDef::FullValueDescription::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::extract (
+        _tao_any,
+        CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
+        CORBA::ValueDef::_tc_FullValueDescription,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>
+#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
 
 // Copying insertion.
 void operator<<= (
@@ -14407,16 +16816,12 @@ void operator<<= (
     const CORBA::ValueDescription &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ValueDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::insert_copy (
+      _tao_any,
+      CORBA::ValueDescription::_tao_any_destructor,
+      CORBA::_tc_ValueDescription,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -14425,19 +16830,12 @@ void operator<<= (
     CORBA::ValueDescription *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ValueDescription,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::ValueDescription::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::insert (
+      _tao_any,
+      CORBA::ValueDescription::_tao_any_destructor,
+      CORBA::_tc_ValueDescription,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -14458,77 +16856,154 @@ CORBA::Boolean operator>>= (
     const CORBA::ValueDescription *&_tao_elem
   )
 {
-  _tao_elem = 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::extract (
+        _tao_any,
+        CORBA::ValueDescription::_tao_any_destructor,
+        CORBA::_tc_ValueDescription,
+        _tao_elem
+      );
+}
 
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ValueDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ValueDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ValueDescription
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtValueDef_ptr _tao_elem
+  )
+{
+  CORBA::ExtValueDef_ptr _tao_objptr =
+    CORBA::ExtValueDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
 
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const CORBA::ValueDescription*,
-            _tao_any.value ()
-          );
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtValueDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ExtValueDef>::insert (
+      _tao_any,
+      CORBA::ExtValueDef::_tao_any_destructor,
+      CORBA::_tc_ExtValueDef,
+      *_tao_elem
+    );
+}
 
-        return 1;
-      }
-    else
-      {
-        CORBA::ValueDescription *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::ValueDescription,
-            0
-          );
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtValueDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ExtValueDef>::extract (
+        _tao_any,
+        CORBA::ExtValueDef::_tao_any_destructor,
+        CORBA::_tc_ExtValueDef,
+        _tao_elem
+      );
+}
 
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ExtValueDef>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
 
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_ValueDescription,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::ValueDescription::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO_Object_Manager<CORBA::ExtValueDef,CORBA::ExtValueDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ExtValueDef>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<CORBA::ExtValueDef, CORBA::ExtValueDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ExtValueDef>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-  return 0;
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtValueDef::ExtFullValueDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>::insert_copy (
+      _tao_any,
+      CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor,
+      CORBA::ExtValueDef::_tc_ExtFullValueDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtValueDef::ExtFullValueDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>::insert (
+      _tao_any,
+      CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor,
+      CORBA::ExtValueDef::_tc_ExtFullValueDescription,
+      _tao_elem
+    );
 }
 
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtValueDef::ExtFullValueDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ExtValueDef::ExtFullValueDescription *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtValueDef::ExtFullValueDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>::extract (
+        _tao_any,
+        CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor,
+        CORBA::ExtValueDef::_tc_ExtFullValueDescription,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -14540,26 +17015,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::ValueBoxDef_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_ValueBoxDef,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::ValueBoxDef::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::ValueBoxDef>::insert (
+      _tao_any,
+      CORBA::ValueBoxDef::_tao_any_destructor,
+      CORBA::_tc_ValueBoxDef,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -14568,60 +17036,35 @@ operator>>= (
     CORBA::ValueBoxDef_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::ValueBoxDef::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_ValueBoxDef
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::ValueBoxDef>::extract (
+        _tao_any,
+        CORBA::ValueBoxDef::_tao_any_destructor,
+        CORBA::_tc_ValueBoxDef,
+        _tao_elem
       );
+}
 
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ValueBoxDef,
-            1,
-            _tao_elem,
-            CORBA::ValueBoxDef::_tao_any_destructor
-          );
-
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = CORBA::ValueBoxDef::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-
-  _tao_elem = CORBA::ValueBoxDef::_nil ();
-  return 0;
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::ValueBoxDef>::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::ValueBoxDef,CORBA::ValueBoxDef_var>;
+  template class TAO::Any_Impl_T<CORBA::ValueBoxDef>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::ValueBoxDef,CORBA::ValueBoxDef_var>
+# pragma instantiate TAO_Object_Manager<CORBA::ValueBoxDef, CORBA::ValueBoxDef_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::ValueBoxDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -14640,12 +17083,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-
+    
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-
+    
     // Narrow to the right type.
     _tao_objref =
       CORBA::FixedDef::_unchecked_narrow (
@@ -14664,7 +17107,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -14672,20 +17115,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -14695,7 +17138,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -14705,32 +17148,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -14749,12 +17192,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-
+    
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-
+    
     // Narrow to the right type.
     _tao_objref =
       CORBA::ValueMemberDef::_unchecked_narrow (
@@ -14773,7 +17216,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -14792,12 +17235,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-
+    
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-
+    
     // Narrow to the right type.
     _tao_objref =
       CORBA::ValueDef::_unchecked_narrow (
@@ -14816,7 +17259,50 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExtValueDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExtValueDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    
+    if ((strm >> obj.inout ()) == 0)
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
+    _tao_objref =
+      CORBA::ExtValueDef::_unchecked_narrow (
+          obj.in ()
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -14835,12 +17321,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-
+    
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-
+    
     // Narrow to the right type.
     _tao_objref =
       CORBA::ValueBoxDef::_unchecked_narrow (
@@ -14857,3 +17343,5 @@ CORBA::Boolean operator>> (
   ACE_ENDTRY;
   return 0;
 }
+
+
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index 687333f41bd..953a8b658cc 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -20,19 +20,24 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDC_H_
 #define _TAO_IDL_ORIG_IFR_EXTENDEDC_H_
 
 #include "ace/pre.h"
 
-#include "IFR_BasicC.h"
+#include "tao/corba.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+#include "ifr_client_export.h"
+
+#include "IFR_BasicC.h"
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -57,20 +62,17 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  CORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:334
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_FIXEDDEF___PTR_CH_)
 #define _CORBA_FIXEDDEF___PTR_CH_
-
+  
   class FixedDef;
   typedef FixedDef *FixedDef_ptr;
 
@@ -78,31 +80,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_FIXEDDEF___VAR_CH_)
 #define _CORBA_FIXEDDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export FixedDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export FixedDef_var : public TAO_Base_var
   {
   public:
     FixedDef_var (void); // default constructor
-    FixedDef_var (FixedDef_ptr p) : ptr_ (p) {}
+    FixedDef_var (FixedDef_ptr p) : ptr_ (p) {} 
     FixedDef_var (const FixedDef_var &); // copy constructor
     ~FixedDef_var (void); // destructor
-
+    
     FixedDef_var &operator= (FixedDef_ptr);
     FixedDef_var &operator= (const FixedDef_var &);
     FixedDef_ptr operator-> (void) const;
-
+    
     operator const FixedDef_ptr &() const;
     operator FixedDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     FixedDef_ptr in (void) const;
     FixedDef_ptr &inout (void);
     FixedDef_ptr &out (void);
     FixedDef_ptr _retn (void);
     FixedDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static FixedDef_ptr tao_duplicate (FixedDef_ptr);
@@ -110,25 +112,25 @@ TAO_NAMESPACE  CORBA
     static FixedDef_ptr tao_nil (void);
     static FixedDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     FixedDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    FixedDef_var (const TAO_Base_var & rhs);
-    FixedDef_var & operator= (const TAO_Base_var & rhs);
+    FixedDef_var (const TAO_Base_var &rhs);
+    FixedDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_FIXEDDEF___OUT_CH_)
 #define _CORBA_FIXEDDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export FixedDef_out
   {
   public:
@@ -141,24 +143,24 @@ TAO_NAMESPACE  CORBA
     operator FixedDef_ptr &();
     FixedDef_ptr &ptr (void);
     FixedDef_ptr operator-> (void);
-
+  
   private:
     FixedDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_FIXEDDEF_CH_)
 #define _CORBA_FIXEDDEF_CH_
-
+  
   class _TAO_FixedDef_Proxy_Impl;
   class _TAO_FixedDef_Remote_Proxy_Impl;
   class _TAO_FixedDef_Proxy_Broker;
   class _TAO_FixedDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export FixedDef
     : public virtual CORBA::IDLType
   {
@@ -166,40 +168,40 @@ TAO_NAMESPACE  CORBA
     typedef FixedDef_ptr _ptr_type;
     typedef FixedDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static FixedDef_ptr _duplicate (FixedDef_ptr obj);
-
+    
     static FixedDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static FixedDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static FixedDef_ptr _nil (void)
       {
         return (FixedDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::UShort digits (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void digits (
         CORBA::UShort digits
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -207,20 +209,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Short scale (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void scale (
         CORBA::Short scale
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -228,65 +230,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_FixedDef_Proxy_Broker *the_TAO_FixedDef_Proxy_Broker_;
-
+  
   protected:
     FixedDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_FixedDef_setup_collocation (int collocated);
-
+    
     FixedDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~FixedDef (void);
-
+    
     friend class _TAO_FixedDef_Remote_Proxy_Impl;
     friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
     friend class _TAO_FixedDef_Direct_Proxy_Impl;
-
+  
   private:
     FixedDef (const FixedDef &);
     void operator= (const FixedDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Impl
     : public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_FixedDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::UShort digits (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -294,10 +297,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void digits (
         CORBA::Object *_collocated_tao_target_,
         CORBA::UShort digits
@@ -306,10 +309,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::Short scale (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -317,10 +320,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void scale (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Short scale
@@ -329,23 +332,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_FixedDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_FixedDef_Remote_Proxy_Impl
     : public virtual _TAO_FixedDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -353,12 +356,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_FixedDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_FixedDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::UShort digits (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -366,10 +369,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void digits (
         CORBA::Object *_collocated_tao_target_,
         CORBA::UShort digits
@@ -378,10 +381,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::Short scale (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -389,10 +392,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void scale (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Short scale
@@ -402,23 +405,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Broker
   {
   public:
@@ -427,67 +430,67 @@ TAO_NAMESPACE  CORBA
         FixedDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_FixedDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_FixedDef_Remote_Proxy_Broker
     : public virtual _TAO_FixedDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_FixedDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_FixedDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_FixedDef_Proxy_Impl &select_proxy (
         FixedDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_FixedDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_FixedDef_Remote_Proxy_Broker *the_TAO_FixedDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FixedDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class ValueMember_var;
-
+  
   struct TAO_IFR_Client_Export ValueMember
   {
     typedef ValueMember_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -497,10 +500,10 @@ TAO_NAMESPACE  CORBA
     CORBA::IDLType_var type_def;
     CORBA::Visibility access;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_IFR_Client_Export ValueMember_var
   {
   public:
@@ -508,33 +511,33 @@ TAO_NAMESPACE  CORBA
     ValueMember_var (ValueMember *);
     ValueMember_var (const ValueMember_var &);
     ~ValueMember_var (void);
-
+    
     ValueMember_var &operator= (ValueMember *);
     ValueMember_var &operator= (const ValueMember_var &);
     ValueMember *operator-> (void);
     const ValueMember *operator-> (void) const;
-
+    
     operator const ValueMember &() const;
     operator ValueMember &();
     operator ValueMember &() const;
-
+    
     // Variable-size types only.
     operator ValueMember *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ValueMember &in (void) const;
     ValueMember &inout (void);
     ValueMember *&out (void);
     ValueMember *_retn (void);
     ValueMember *ptr (void) const;
-
+  
   private:
     ValueMember *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_IFR_Client_Export ValueMember_out
   {
   public:
@@ -546,32 +549,32 @@ TAO_NAMESPACE  CORBA
     operator ValueMember *&();
     ValueMember *&ptr (void);
     ValueMember *operator-> (void);
-
+    
   private:
     ValueMember *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ValueMember_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueMember;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+  
+  // 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_CORBA_VALUEMEMBERSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CH_
-
+  
   class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -585,15 +588,15 @@ TAO_NAMESPACE  CORBA
         const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void);
-
+    
     // = Accessors.
     ValueMember &operator[] (CORBA::ULong i);
     const ValueMember &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static ValueMember *allocbuf (CORBA::ULong size);
     static void freebuf (ValueMember *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -609,47 +612,47 @@ TAO_NAMESPACE  CORBA
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_VALUEMEMBERSEQ_CH_)
 #define _CORBA_VALUEMEMBERSEQ_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ValueMemberSeq;
   class ValueMemberSeq_var;
-
+  
   // *************************************************************
   // CORBA::ValueMemberSeq
   // *************************************************************
-
-  class TAO_IFR_Client_Export ValueMemberSeq : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_IFR_Client_Export ValueMemberSeq : 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_CORBA_ValueMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ValueMember>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ValueMemberSeq (void);
     ValueMemberSeq (CORBA::ULong max);
     ValueMemberSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ValueMember *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ValueMember *buffer, 
         CORBA::Boolean release = 0
       );
     ValueMemberSeq (const ValueMemberSeq &);
     ~ValueMemberSeq (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef ValueMemberSeq_var _var_type;
   };
 
@@ -657,14 +660,14 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_VALUEMEMBERSEQ___VAR_CH_)
 #define _CORBA_VALUEMEMBERSEQ___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::ValueMemberSeq_var
   // *************************************************************
-
+  
   class TAO_IFR_Client_Export ValueMemberSeq_var
   {
   public:
@@ -672,29 +675,29 @@ TAO_NAMESPACE  CORBA
     ValueMemberSeq_var (ValueMemberSeq *);
     ValueMemberSeq_var (const ValueMemberSeq_var &);
     ~ValueMemberSeq_var (void);
-
+    
     ValueMemberSeq_var &operator= (ValueMemberSeq *);
     ValueMemberSeq_var &operator= (const ValueMemberSeq_var &);
     ValueMemberSeq *operator-> (void);
     const ValueMemberSeq *operator-> (void) const;
-
+    
     operator const ValueMemberSeq &() const;
     operator ValueMemberSeq &();
     operator ValueMemberSeq &() const;
-
+    
     // Variable-size base types only.
     operator ValueMemberSeq *&();
-
+    
     ValueMember & operator[] (CORBA::ULong index);
     const ValueMember & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ValueMemberSeq &in (void) const;
     ValueMemberSeq &inout (void);
     ValueMemberSeq *&out (void);
     ValueMemberSeq *_retn (void);
     ValueMemberSeq *ptr (void) const;
-
+  
   private:
     ValueMemberSeq *ptr_;
   };
@@ -703,10 +706,10 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_VALUEMEMBERSEQ___OUT_CH_)
 #define _CORBA_VALUEMEMBERSEQ___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_IFR_Client_Export ValueMemberSeq_out
   {
   public:
@@ -719,7 +722,7 @@ TAO_NAMESPACE  CORBA
     ValueMemberSeq *&ptr (void);
     ValueMemberSeq *operator-> (void);
     ValueMember & operator[] (CORBA::ULong index);
-
+  
   private:
     ValueMemberSeq *&ptr_;
     // Assignment from T_var not allowed.
@@ -727,18 +730,18 @@ TAO_NAMESPACE  CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueMemberSeq;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_VALUEMEMBERDEF___PTR_CH_)
 #define _CORBA_VALUEMEMBERDEF___PTR_CH_
-
+  
   class ValueMemberDef;
   typedef ValueMemberDef *ValueMemberDef_ptr;
 
@@ -746,31 +749,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_VALUEMEMBERDEF___VAR_CH_)
 #define _CORBA_VALUEMEMBERDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ValueMemberDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ValueMemberDef_var : public TAO_Base_var
   {
   public:
     ValueMemberDef_var (void); // default constructor
-    ValueMemberDef_var (ValueMemberDef_ptr p) : ptr_ (p) {}
+    ValueMemberDef_var (ValueMemberDef_ptr p) : ptr_ (p) {} 
     ValueMemberDef_var (const ValueMemberDef_var &); // copy constructor
     ~ValueMemberDef_var (void); // destructor
-
+    
     ValueMemberDef_var &operator= (ValueMemberDef_ptr);
     ValueMemberDef_var &operator= (const ValueMemberDef_var &);
     ValueMemberDef_ptr operator-> (void) const;
-
+    
     operator const ValueMemberDef_ptr &() const;
     operator ValueMemberDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ValueMemberDef_ptr in (void) const;
     ValueMemberDef_ptr &inout (void);
     ValueMemberDef_ptr &out (void);
     ValueMemberDef_ptr _retn (void);
     ValueMemberDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ValueMemberDef_ptr tao_duplicate (ValueMemberDef_ptr);
@@ -778,25 +781,25 @@ TAO_NAMESPACE  CORBA
     static ValueMemberDef_ptr tao_nil (void);
     static ValueMemberDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ValueMemberDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ValueMemberDef_var (const TAO_Base_var & rhs);
-    ValueMemberDef_var & operator= (const TAO_Base_var & rhs);
+    ValueMemberDef_var (const TAO_Base_var &rhs);
+    ValueMemberDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_VALUEMEMBERDEF___OUT_CH_)
 #define _CORBA_VALUEMEMBERDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ValueMemberDef_out
   {
   public:
@@ -809,24 +812,24 @@ TAO_NAMESPACE  CORBA
     operator ValueMemberDef_ptr &();
     ValueMemberDef_ptr &ptr (void);
     ValueMemberDef_ptr operator-> (void);
-
+  
   private:
     ValueMemberDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_VALUEMEMBERDEF_CH_)
 #define _CORBA_VALUEMEMBERDEF_CH_
-
+  
   class _TAO_ValueMemberDef_Proxy_Impl;
   class _TAO_ValueMemberDef_Remote_Proxy_Impl;
   class _TAO_ValueMemberDef_Proxy_Broker;
   class _TAO_ValueMemberDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export ValueMemberDef
     : public virtual CORBA::Contained
   {
@@ -834,50 +837,50 @@ TAO_NAMESPACE  CORBA
     typedef ValueMemberDef_ptr _ptr_type;
     typedef ValueMemberDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static ValueMemberDef_ptr _duplicate (ValueMemberDef_ptr obj);
-
+    
     static ValueMemberDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ValueMemberDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ValueMemberDef_ptr _nil (void)
       {
         return (ValueMemberDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void type_def (
         CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -885,20 +888,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Visibility access (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void access (
         CORBA::Visibility access
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -906,65 +909,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ValueMemberDef_Proxy_Broker *the_TAO_ValueMemberDef_Proxy_Broker_;
-
+  
   protected:
     ValueMemberDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ValueMemberDef_setup_collocation (int collocated);
-
+    
     ValueMemberDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ValueMemberDef (void);
-
+    
     friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
     friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
-
+  
   private:
     ValueMemberDef (const ValueMemberDef &);
     void operator= (const ValueMemberDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Impl
     : public virtual CORBA::_TAO_Contained_Proxy_Impl
   {
   public:
     virtual ~_TAO_ValueMemberDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -972,10 +976,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::IDLType_ptr type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -983,10 +987,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr type_def
@@ -995,10 +999,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::Visibility access (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1006,10 +1010,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void access (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Visibility access
@@ -1018,23 +1022,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_ValueMemberDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_ValueMemberDef_Remote_Proxy_Impl
     : public virtual _TAO_ValueMemberDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -1042,12 +1046,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ValueMemberDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ValueMemberDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1055,10 +1059,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::IDLType_ptr type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1066,10 +1070,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr type_def
@@ -1078,10 +1082,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::Visibility access (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1089,10 +1093,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void access (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Visibility access
@@ -1102,23 +1106,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Broker
   {
   public:
@@ -1127,64 +1131,64 @@ TAO_NAMESPACE  CORBA
         ValueMemberDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_ValueMemberDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_ValueMemberDef_Remote_Proxy_Broker
     : public virtual _TAO_ValueMemberDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ValueMemberDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ValueMemberDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_ValueMemberDef_Proxy_Impl &select_proxy (
         ValueMemberDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_ValueMemberDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ValueMemberDef_Remote_Proxy_Broker *the_TAO_ValueMemberDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueMemberDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_VALUEDEF___PTR_CH_)
 #define _CORBA_VALUEDEF___PTR_CH_
-
+  
   class ValueDef;
   typedef ValueDef *ValueDef_ptr;
 
@@ -1192,31 +1196,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_VALUEDEF___VAR_CH_)
 #define _CORBA_VALUEDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ValueDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ValueDef_var : public TAO_Base_var
   {
   public:
     ValueDef_var (void); // default constructor
-    ValueDef_var (ValueDef_ptr p) : ptr_ (p) {}
+    ValueDef_var (ValueDef_ptr p) : ptr_ (p) {} 
     ValueDef_var (const ValueDef_var &); // copy constructor
     ~ValueDef_var (void); // destructor
-
+    
     ValueDef_var &operator= (ValueDef_ptr);
     ValueDef_var &operator= (const ValueDef_var &);
     ValueDef_ptr operator-> (void) const;
-
+    
     operator const ValueDef_ptr &() const;
     operator ValueDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ValueDef_ptr in (void) const;
     ValueDef_ptr &inout (void);
     ValueDef_ptr &out (void);
     ValueDef_ptr _retn (void);
     ValueDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ValueDef_ptr tao_duplicate (ValueDef_ptr);
@@ -1224,25 +1228,25 @@ TAO_NAMESPACE  CORBA
     static ValueDef_ptr tao_nil (void);
     static ValueDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ValueDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ValueDef_var (const TAO_Base_var & rhs);
-    ValueDef_var & operator= (const TAO_Base_var & rhs);
+    ValueDef_var (const TAO_Base_var &rhs);
+    ValueDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_VALUEDEF___OUT_CH_)
 #define _CORBA_VALUEDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ValueDef_out
   {
   public:
@@ -1255,24 +1259,24 @@ TAO_NAMESPACE  CORBA
     operator ValueDef_ptr &();
     ValueDef_ptr &ptr (void);
     ValueDef_ptr operator-> (void);
-
+  
   private:
     ValueDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_VALUEDEF_CH_)
 #define _CORBA_VALUEDEF_CH_
-
+  
   class _TAO_ValueDef_Proxy_Impl;
   class _TAO_ValueDef_Remote_Proxy_Impl;
   class _TAO_ValueDef_Proxy_Broker;
   class _TAO_ValueDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export ValueDef
     : public virtual CORBA::Container,
       public virtual CORBA::Contained,
@@ -1282,40 +1286,40 @@ TAO_NAMESPACE  CORBA
     typedef ValueDef_ptr _ptr_type;
     typedef ValueDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static ValueDef_ptr _duplicate (ValueDef_ptr obj);
-
+    
     static ValueDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ValueDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ValueDef_ptr _nil (void)
       {
         return (ValueDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void supported_interfaces (
         const CORBA::InterfaceDefSeq & supported_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1323,20 +1327,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::InitializerSeq * initializers (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void initializers (
         const CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1344,20 +1348,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ValueDef_ptr base_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void base_value (
         CORBA::ValueDef_ptr base_value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1365,20 +1369,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ValueDefSeq * abstract_base_values (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void abstract_base_values (
         const CORBA::ValueDefSeq & abstract_base_values
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1386,20 +1390,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean is_abstract (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void is_abstract (
         CORBA::Boolean is_abstract
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1407,20 +1411,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean is_custom (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void is_custom (
         CORBA::Boolean is_custom
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1428,20 +1432,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean is_truncatable (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void is_truncatable (
         CORBA::Boolean is_truncatable
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1449,10 +1453,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean is_a (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1460,16 +1464,16 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_structure/structure_ch.cpp:49
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    
     class FullValueDescription_var;
-
+    
     struct TAO_IFR_Client_Export FullValueDescription
     {
       typedef FullValueDescription_var _var_type;
-
+      
       static void _tao_any_destructor (void *);
       TAO_String_Manager name;
       TAO_String_Manager id;
@@ -1487,10 +1491,10 @@ TAO_NAMESPACE  CORBA
       TAO_String_Manager base_value;
       CORBA::TypeCode_var type;
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_structure.cpp:71
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+    
     class TAO_IFR_Client_Export FullValueDescription_var
     {
     public:
@@ -1498,33 +1502,33 @@ TAO_NAMESPACE  CORBA
       FullValueDescription_var (FullValueDescription *);
       FullValueDescription_var (const FullValueDescription_var &);
       ~FullValueDescription_var (void);
-
+      
       FullValueDescription_var &operator= (FullValueDescription *);
       FullValueDescription_var &operator= (const FullValueDescription_var &);
       FullValueDescription *operator-> (void);
       const FullValueDescription *operator-> (void) const;
-
+      
       operator const FullValueDescription &() const;
       operator FullValueDescription &();
       operator FullValueDescription &() const;
-
+      
       // Variable-size types only.
       operator FullValueDescription *&();
-
-      // in, inout, out, _retn
+      
+      // in, inout, out, _retn 
       const FullValueDescription &in (void) const;
       FullValueDescription &inout (void);
       FullValueDescription *&out (void);
       FullValueDescription *_retn (void);
       FullValueDescription *ptr (void) const;
-
+    
     private:
       FullValueDescription *ptr_;
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_structure.cpp:445
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+    
     class TAO_IFR_Client_Export FullValueDescription_out
     {
     public:
@@ -1536,31 +1540,31 @@ TAO_NAMESPACE  CORBA
       operator FullValueDescription *&();
       FullValueDescription *&ptr (void);
       FullValueDescription *operator-> (void);
-
+      
     private:
       FullValueDescription *&ptr_;
       // Assignment from T_var not allowed.
       void operator= (const FullValueDescription_var &);
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_typecode/typecode_decl.cpp:44
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
     static ::CORBA::TypeCode_ptr _tc_FullValueDescription;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ValueDef::FullValueDescription * describe_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::ValueMemberDef_ptr create_value_member (
         const char * id,
         const char * name,
@@ -1572,10 +1576,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
@@ -1587,10 +1591,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
@@ -1605,67 +1609,68 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ValueDef_Proxy_Broker *the_TAO_ValueDef_Proxy_Broker_;
-
+  
   protected:
     ValueDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ValueDef_setup_collocation (int collocated);
-
+    
     ValueDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ValueDef (void);
-
+    
     friend class _TAO_ValueDef_Remote_Proxy_Impl;
     friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
+  
   private:
     ValueDef (const ValueDef &);
     void operator= (const ValueDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Container_Proxy_Impl,
-      public virtual CORBA::_TAO_Contained_Proxy_Impl,
+    : public virtual CORBA::_TAO_Container_Proxy_Impl, 
+      public virtual CORBA::_TAO_Contained_Proxy_Impl, 
       public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_ValueDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1673,10 +1678,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void supported_interfaces (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::InterfaceDefSeq & supported_interfaces
@@ -1685,10 +1690,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::InitializerSeq * initializers (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1696,10 +1701,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void initializers (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::InitializerSeq & initializers
@@ -1708,10 +1713,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ValueDef_ptr base_value (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1719,10 +1724,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void base_value (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ValueDef_ptr base_value
@@ -1731,10 +1736,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ValueDefSeq * abstract_base_values (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1742,10 +1747,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void abstract_base_values (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ValueDefSeq & abstract_base_values
@@ -1754,10 +1759,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::Boolean is_abstract (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1765,10 +1770,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void is_abstract (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Boolean is_abstract
@@ -1777,10 +1782,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::Boolean is_custom (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1788,10 +1793,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void is_custom (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Boolean is_custom
@@ -1800,10 +1805,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::Boolean is_truncatable (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1811,10 +1816,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void is_truncatable (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Boolean is_truncatable
@@ -1823,10 +1828,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::Boolean is_a (
         CORBA::Object *_collocated_tao_target_,
         const char * id
@@ -1835,10 +1840,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ValueDef::FullValueDescription * describe_value (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1846,10 +1851,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::ValueMemberDef_ptr create_value_member (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -1862,10 +1867,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -1878,10 +1883,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::OperationDef_ptr create_operation (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -1897,23 +1902,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_ValueDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_ValueDef_Remote_Proxy_Impl
     : public virtual _TAO_ValueDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -1923,12 +1928,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ValueDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ValueDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1936,10 +1941,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void supported_interfaces (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::InterfaceDefSeq & supported_interfaces
@@ -1948,10 +1953,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::InitializerSeq * initializers (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1959,10 +1964,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void initializers (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::InitializerSeq & initializers
@@ -1971,10 +1976,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ValueDef_ptr base_value (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1982,10 +1987,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void base_value (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ValueDef_ptr base_value
@@ -1994,10 +1999,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ValueDefSeq * abstract_base_values (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2005,10 +2010,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void abstract_base_values (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ValueDefSeq & abstract_base_values
@@ -2017,10 +2022,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::Boolean is_abstract (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2028,10 +2033,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void is_abstract (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Boolean is_abstract
@@ -2040,10 +2045,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::Boolean is_custom (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2051,10 +2056,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void is_custom (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Boolean is_custom
@@ -2063,10 +2068,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::Boolean is_truncatable (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2074,10 +2079,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void is_truncatable (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Boolean is_truncatable
@@ -2086,10 +2091,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::Boolean is_a (
         CORBA::Object *_collocated_tao_target_,
         const char * id
@@ -2098,10 +2103,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ValueDef::FullValueDescription * describe_value (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2109,10 +2114,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::ValueMemberDef_ptr create_value_member (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -2125,10 +2130,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -2141,10 +2146,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::OperationDef_ptr create_operation (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -2161,23 +2166,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Broker
   {
   public:
@@ -2186,67 +2191,67 @@ TAO_NAMESPACE  CORBA
         ValueDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_ValueDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_ValueDef_Remote_Proxy_Broker
     : public virtual _TAO_ValueDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ValueDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ValueDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_ValueDef_Proxy_Impl &select_proxy (
         ValueDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_ValueDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ValueDef_Remote_Proxy_Broker *the_TAO_ValueDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueDef;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class ValueDescription_var;
-
+  
   struct TAO_IFR_Client_Export ValueDescription
   {
     typedef ValueDescription_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -2259,10 +2264,10 @@ TAO_NAMESPACE  CORBA
     CORBA::Boolean is_truncatable;
     TAO_String_Manager base_value;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_IFR_Client_Export ValueDescription_var
   {
   public:
@@ -2270,33 +2275,33 @@ TAO_NAMESPACE  CORBA
     ValueDescription_var (ValueDescription *);
     ValueDescription_var (const ValueDescription_var &);
     ~ValueDescription_var (void);
-
+    
     ValueDescription_var &operator= (ValueDescription *);
     ValueDescription_var &operator= (const ValueDescription_var &);
     ValueDescription *operator-> (void);
     const ValueDescription *operator-> (void) const;
-
+    
     operator const ValueDescription &() const;
     operator ValueDescription &();
     operator ValueDescription &() const;
-
+    
     // Variable-size types only.
     operator ValueDescription *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ValueDescription &in (void) const;
     ValueDescription &inout (void);
     ValueDescription *&out (void);
     ValueDescription *_retn (void);
     ValueDescription *ptr (void) const;
-
+  
   private:
     ValueDescription *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_IFR_Client_Export ValueDescription_out
   {
   public:
@@ -2308,24 +2313,544 @@ TAO_NAMESPACE  CORBA
     operator ValueDescription *&();
     ValueDescription *&ptr (void);
     ValueDescription *operator-> (void);
-
+    
   private:
     ValueDescription *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ValueDescription_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_ValueDescription;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
+#if !defined (_CORBA_EXTVALUEDEF___PTR_CH_)
+#define _CORBA_EXTVALUEDEF___PTR_CH_
+  
+  class ExtValueDef;
+  typedef ExtValueDef *ExtValueDef_ptr;
 
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTVALUEDEF___VAR_CH_)
+#define _CORBA_EXTVALUEDEF___VAR_CH_
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ExtValueDef_var : public TAO_Base_var
+  {
+  public:
+    ExtValueDef_var (void); // default constructor
+    ExtValueDef_var (ExtValueDef_ptr p) : ptr_ (p) {} 
+    ExtValueDef_var (const ExtValueDef_var &); // copy constructor
+    ~ExtValueDef_var (void); // destructor
+    
+    ExtValueDef_var &operator= (ExtValueDef_ptr);
+    ExtValueDef_var &operator= (const ExtValueDef_var &);
+    ExtValueDef_ptr operator-> (void) const;
+    
+    operator const ExtValueDef_ptr &() const;
+    operator ExtValueDef_ptr &();
+    // in, inout, out, _retn 
+    ExtValueDef_ptr in (void) const;
+    ExtValueDef_ptr &inout (void);
+    ExtValueDef_ptr &out (void);
+    ExtValueDef_ptr _retn (void);
+    ExtValueDef_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ExtValueDef_ptr tao_duplicate (ExtValueDef_ptr);
+    static void tao_release (ExtValueDef_ptr);
+    static ExtValueDef_ptr tao_nil (void);
+    static ExtValueDef_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+  
+  private:
+    ExtValueDef_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ExtValueDef_var (const TAO_Base_var &rhs);
+    ExtValueDef_var &operator= (const TAO_Base_var &rhs);
+  };
 
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueDescription;
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTVALUEDEF___OUT_CH_)
+#define _CORBA_EXTVALUEDEF___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
+  class TAO_IFR_Client_Export ExtValueDef_out
+  {
+  public:
+    ExtValueDef_out (ExtValueDef_ptr &);
+    ExtValueDef_out (ExtValueDef_var &);
+    ExtValueDef_out (const ExtValueDef_out &);
+    ExtValueDef_out &operator= (const ExtValueDef_out &);
+    ExtValueDef_out &operator= (const ExtValueDef_var &);
+    ExtValueDef_out &operator= (ExtValueDef_ptr);
+    operator ExtValueDef_ptr &();
+    ExtValueDef_ptr &ptr (void);
+    ExtValueDef_ptr operator-> (void);
+  
+  private:
+    ExtValueDef_ptr &ptr_;
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
+#if !defined (_CORBA_EXTVALUEDEF_CH_)
+#define _CORBA_EXTVALUEDEF_CH_
+  
+  class _TAO_ExtValueDef_Proxy_Impl;
+  class _TAO_ExtValueDef_Remote_Proxy_Impl;
+  class _TAO_ExtValueDef_Proxy_Broker;
+  class _TAO_ExtValueDef_Remote_Proxy_Broker;
+  
+  class TAO_IFR_Client_Export ExtValueDef
+    : public virtual CORBA::ValueDef
+  {
+  public:
+    typedef ExtValueDef_ptr _ptr_type;
+    typedef ExtValueDef_var _var_type;
+    static int _tao_class_id;
+    
+    // The static operations.
+    static ExtValueDef_ptr _duplicate (ExtValueDef_ptr obj);
+    
+    static ExtValueDef_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ExtValueDef_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ExtValueDef_ptr _nil (void)
+      {
+        return (ExtValueDef_ptr)0;
+      }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::ExtInitializerSeq * ext_initializers (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void ext_initializers (
+        const CORBA::ExtInitializerSeq & ext_initializers
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    
+    class ExtFullValueDescription_var;
+    
+    struct TAO_IFR_Client_Export ExtFullValueDescription
+    {
+      typedef ExtFullValueDescription_var _var_type;
+      
+      static void _tao_any_destructor (void *);
+      TAO_String_Manager name;
+      TAO_String_Manager id;
+      CORBA::Boolean is_abstract;
+      CORBA::Boolean is_custom;
+      TAO_String_Manager defined_in;
+      TAO_String_Manager version;
+      ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations;
+      ACE_NESTED_CLASS (CORBA, ExtAttrDescriptionSeq) attributes;
+      ACE_NESTED_CLASS (CORBA, ValueMemberSeq) members;
+      ACE_NESTED_CLASS (CORBA, ExtInitializerSeq) initializers;
+      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) supported_interfaces;
+      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) abstract_base_values;
+      CORBA::Boolean is_truncatable;
+      TAO_String_Manager base_value;
+      CORBA::TypeCode_var type;
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+    
+    class TAO_IFR_Client_Export ExtFullValueDescription_var
+    {
+    public:
+      ExtFullValueDescription_var (void);
+      ExtFullValueDescription_var (ExtFullValueDescription *);
+      ExtFullValueDescription_var (const ExtFullValueDescription_var &);
+      ~ExtFullValueDescription_var (void);
+      
+      ExtFullValueDescription_var &operator= (ExtFullValueDescription *);
+      ExtFullValueDescription_var &operator= (const ExtFullValueDescription_var &);
+      ExtFullValueDescription *operator-> (void);
+      const ExtFullValueDescription *operator-> (void) const;
+      
+      operator const ExtFullValueDescription &() const;
+      operator ExtFullValueDescription &();
+      operator ExtFullValueDescription &() const;
+      
+      // Variable-size types only.
+      operator ExtFullValueDescription *&();
+      
+      // in, inout, out, _retn 
+      const ExtFullValueDescription &in (void) const;
+      ExtFullValueDescription &inout (void);
+      ExtFullValueDescription *&out (void);
+      ExtFullValueDescription *_retn (void);
+      ExtFullValueDescription *ptr (void) const;
+    
+    private:
+      ExtFullValueDescription *ptr_;
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+    
+    class TAO_IFR_Client_Export ExtFullValueDescription_out
+    {
+    public:
+      ExtFullValueDescription_out (ExtFullValueDescription *&);
+      ExtFullValueDescription_out (ExtFullValueDescription_var &);
+      ExtFullValueDescription_out (const ExtFullValueDescription_out &);
+      ExtFullValueDescription_out &operator= (const ExtFullValueDescription_out &);
+      ExtFullValueDescription_out &operator= (ExtFullValueDescription *);
+      operator ExtFullValueDescription *&();
+      ExtFullValueDescription *&ptr (void);
+      ExtFullValueDescription *operator-> (void);
+      
+    private:
+      ExtFullValueDescription *&ptr_;
+      // Assignment from T_var not allowed.
+      void operator= (const ExtFullValueDescription_var &);
+    };
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_ExtFullValueDescription;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::IDLType_ptr type,
+        CORBA::AttributeMode mode,
+        const CORBA::ExceptionDefSeq & get_exceptions,
+        const CORBA::ExceptionDefSeq & set_exceptions
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  private:
+    _TAO_ExtValueDef_Proxy_Broker *the_TAO_ExtValueDef_Proxy_Broker_;
+  
+  protected:
+    ExtValueDef (int collocated = 0);
+    
+    // These methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode.
+    virtual void CORBA_ExtValueDef_setup_collocation (int collocated);
+    
+    ExtValueDef (
+        TAO_Stub *objref, 
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0
+      );
+    virtual ~ExtValueDef (void);
+    
+    friend class _TAO_ExtValueDef_Remote_Proxy_Impl;
+    friend class _TAO_ExtValueDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_ExtValueDef_Direct_Proxy_Impl;
+  
+  private:
+    ExtValueDef (const ExtValueDef &);
+    void operator= (const ExtValueDef &);
+  };
+  
+  // The Proxy Implementations are used by each interface to
+  // perform a call. Each different implementation encapsulates
+  // an invocation logic.
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base Proxy Impl. Declaration
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
+  class TAO_IFR_Client_Export _TAO_ExtValueDef_Proxy_Impl
+    : public virtual CORBA::_TAO_ValueDef_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_ExtValueDef_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
+    virtual ::CORBA::ExtInitializerSeq * ext_initializers (
+        CORBA::Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
+    virtual void ext_initializers (
+        CORBA::Object *_collocated_tao_target_,
+        const CORBA::ExtInitializerSeq & ext_initializers
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
+    virtual ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
+        CORBA::Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
+    virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
+        CORBA::Object *_collocated_tao_target_,
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::IDLType_ptr type,
+        CORBA::AttributeMode mode,
+        const CORBA::ExceptionDefSeq & get_exceptions,
+        const CORBA::ExceptionDefSeq & set_exceptions
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+  
+  protected:
+    _TAO_ExtValueDef_Proxy_Impl (void);
+  };
+  
+  //
+  //               End Base Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                Remote Proxy Impl. Declaration
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
+  class TAO_IFR_Client_Export _TAO_ExtValueDef_Remote_Proxy_Impl
+    : public virtual _TAO_ExtValueDef_Proxy_Impl,
+      public virtual TAO_Remote_Object_Proxy_Impl,
+      public virtual CORBA::_TAO_ValueDef_Remote_Proxy_Impl
+  {
+  public:
+    _TAO_ExtValueDef_Remote_Proxy_Impl (void);
+    
+    virtual ~_TAO_ExtValueDef_Remote_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    virtual ::CORBA::ExtInitializerSeq * ext_initializers (
+        CORBA::Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    virtual void ext_initializers (
+        CORBA::Object *_collocated_tao_target_,
+        const CORBA::ExtInitializerSeq & ext_initializers
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    virtual ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
+        CORBA::Object *_collocated_tao_target_
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
+        CORBA::Object *_collocated_tao_target_,
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::IDLType_ptr type,
+        CORBA::AttributeMode mode,
+        const CORBA::ExceptionDefSeq & get_exceptions,
+        const CORBA::ExceptionDefSeq & set_exceptions
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
+  
+  //
+  //             End Remote Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  // The Proxy Brokers are used by each interface to get
+  // the right proxy for performing a call. In the new 
+  // collocation scheme, the proxy to be used can vary on
+  // a call by call basis.
+  
+  ///////////////////////////////////////////////////////////////////////
+  //                 Base Proxy Broker Declaration 
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
+  class TAO_IFR_Client_Export _TAO_ExtValueDef_Proxy_Broker
+  {
+  public:
+    virtual ~_TAO_ExtValueDef_Proxy_Broker (void);
+    virtual _TAO_ExtValueDef_Proxy_Impl &select_proxy (
+        ExtValueDef *object
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+  protected:
+    _TAO_ExtValueDef_Proxy_Broker (void);
+    
+  };
+  
+  //
+  //              End Base Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
+  
+    
+  ///////////////////////////////////////////////////////////////////////
+  //                 Remote Proxy Broker Declaration 
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
+  class TAO_IFR_Client_Export _TAO_ExtValueDef_Remote_Proxy_Broker
+    : public virtual _TAO_ExtValueDef_Proxy_Broker
+  {
+  public: 
+    _TAO_ExtValueDef_Remote_Proxy_Broker (void);
+    
+    virtual ~_TAO_ExtValueDef_Remote_Proxy_Broker (void);
+    
+    virtual _TAO_ExtValueDef_Proxy_Impl &select_proxy (
+        ExtValueDef *object
+        ACE_ENV_ARG_DECL
+      );
+    
+  private:
+    _TAO_ExtValueDef_Remote_Proxy_Impl remote_proxy_impl_;
+  
+  public:
+    // This member function is used to get an handle to the unique instance
+    // of the Remote Proxy Broker that is available for a given
+    // interface.
+    static _TAO_ExtValueDef_Remote_Proxy_Broker *the_TAO_ExtValueDef_Remote_Proxy_Broker (void);
+  };
+  
+  //
+  //              End Remote Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtValueDef;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_VALUEBOXDEF___PTR_CH_)
 #define _CORBA_VALUEBOXDEF___PTR_CH_
-
+  
   class ValueBoxDef;
   typedef ValueBoxDef *ValueBoxDef_ptr;
 
@@ -2333,31 +2858,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_VALUEBOXDEF___VAR_CH_)
 #define _CORBA_VALUEBOXDEF___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_IFR_Client_Export ValueBoxDef_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_IFR_Client_Export ValueBoxDef_var : public TAO_Base_var
   {
   public:
     ValueBoxDef_var (void); // default constructor
-    ValueBoxDef_var (ValueBoxDef_ptr p) : ptr_ (p) {}
+    ValueBoxDef_var (ValueBoxDef_ptr p) : ptr_ (p) {} 
     ValueBoxDef_var (const ValueBoxDef_var &); // copy constructor
     ~ValueBoxDef_var (void); // destructor
-
+    
     ValueBoxDef_var &operator= (ValueBoxDef_ptr);
     ValueBoxDef_var &operator= (const ValueBoxDef_var &);
     ValueBoxDef_ptr operator-> (void) const;
-
+    
     operator const ValueBoxDef_ptr &() const;
     operator ValueBoxDef_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ValueBoxDef_ptr in (void) const;
     ValueBoxDef_ptr &inout (void);
     ValueBoxDef_ptr &out (void);
     ValueBoxDef_ptr _retn (void);
     ValueBoxDef_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ValueBoxDef_ptr tao_duplicate (ValueBoxDef_ptr);
@@ -2365,25 +2890,25 @@ TAO_NAMESPACE  CORBA
     static ValueBoxDef_ptr tao_nil (void);
     static ValueBoxDef_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ValueBoxDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ValueBoxDef_var (const TAO_Base_var & rhs);
-    ValueBoxDef_var & operator= (const TAO_Base_var & rhs);
+    ValueBoxDef_var (const TAO_Base_var &rhs);
+    ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_VALUEBOXDEF___OUT_CH_)
 #define _CORBA_VALUEBOXDEF___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IFR_Client_Export ValueBoxDef_out
   {
   public:
@@ -2396,24 +2921,24 @@ TAO_NAMESPACE  CORBA
     operator ValueBoxDef_ptr &();
     ValueBoxDef_ptr &ptr (void);
     ValueBoxDef_ptr operator-> (void);
-
+  
   private:
     ValueBoxDef_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_VALUEBOXDEF_CH_)
 #define _CORBA_VALUEBOXDEF_CH_
-
+  
   class _TAO_ValueBoxDef_Proxy_Impl;
   class _TAO_ValueBoxDef_Remote_Proxy_Impl;
   class _TAO_ValueBoxDef_Proxy_Broker;
   class _TAO_ValueBoxDef_Remote_Proxy_Broker;
-
+  
   class TAO_IFR_Client_Export ValueBoxDef
     : public virtual CORBA::TypedefDef
   {
@@ -2421,40 +2946,40 @@ TAO_NAMESPACE  CORBA
     typedef ValueBoxDef_ptr _ptr_type;
     typedef ValueBoxDef_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static ValueBoxDef_ptr _duplicate (ValueBoxDef_ptr obj);
-
+    
     static ValueBoxDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ValueBoxDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ValueBoxDef_ptr _nil (void)
       {
         return (ValueBoxDef_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::IDLType_ptr original_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void original_type_def (
         CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2462,65 +2987,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ValueBoxDef_Proxy_Broker *the_TAO_ValueBoxDef_Proxy_Broker_;
-
+  
   protected:
     ValueBoxDef (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ValueBoxDef_setup_collocation (int collocated);
-
+    
     ValueBoxDef (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ValueBoxDef (void);
-
+    
     friend class _TAO_ValueBoxDef_Remote_Proxy_Impl;
     friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ValueBoxDef_Direct_Proxy_Impl;
-
+  
   private:
     ValueBoxDef (const ValueBoxDef &);
     void operator= (const ValueBoxDef &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Impl
     : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl
   {
   public:
     virtual ~_TAO_ValueBoxDef_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::IDLType_ptr original_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2528,10 +3054,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void original_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr original_type_def
@@ -2540,23 +3066,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_ValueBoxDef_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_IFR_Client_Export _TAO_ValueBoxDef_Remote_Proxy_Impl
     : public virtual _TAO_ValueBoxDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -2564,12 +3090,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ValueBoxDef_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ValueBoxDef_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::IDLType_ptr original_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2577,10 +3103,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void original_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr original_type_def
@@ -2590,23 +3116,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Broker
   {
   public:
@@ -2615,60 +3141,60 @@ TAO_NAMESPACE  CORBA
         ValueBoxDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_ValueBoxDef_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_IFR_Client_Export _TAO_ValueBoxDef_Remote_Proxy_Broker
     : public virtual _TAO_ValueBoxDef_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ValueBoxDef_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ValueBoxDef_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_ValueBoxDef_Proxy_Impl &select_proxy (
         ValueBoxDef *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_ValueBoxDef_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ValueBoxDef_Remote_Proxy_Broker *the_TAO_ValueBoxDef_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueBoxDef;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module CORBA
@@ -2676,7 +3202,7 @@ TAO_NAMESPACE_CLOSE // module CORBA
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80
 
 extern TAO_IFR_Client_Export
 CORBA::_TAO_FixedDef_Proxy_Broker *
@@ -2697,20 +3223,26 @@ CORBA::_TAO_ValueDef_Proxy_Broker *
   );
 
 extern TAO_IFR_Client_Export
+CORBA::_TAO_ExtValueDef_Proxy_Broker *
+(*CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
+
+extern TAO_IFR_Client_Export
 CORBA::_TAO_ValueBoxDef_Proxy_Broker *
 (*CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::FixedDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueMember &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMember*); // noncopying version
@@ -2718,7 +3250,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Val
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueMember *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueMemberSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMemberSeq*); // noncopying version
@@ -2726,21 +3258,21 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Val
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueMemberSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMemberDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMemberDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueMemberDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueDef::FullValueDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef::FullValueDescription*); // noncopying version
@@ -2748,7 +3280,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Val
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueDef::FullValueDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDescription*); // noncopying version
@@ -2756,31 +3288,46 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Val
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueDescription *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr); // copying
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr *); // non-copying
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtValueDef_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtValueDef::ExtFullValueDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef::ExtFullValueDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtValueDef::ExtFullValueDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtValueDef::ExtFullValueDescription *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueBoxDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::FixedDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::FixedDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueMember &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueMember &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_ValueMemberSeq_H_
 #define _TAO_CDR_OP_CORBA_ValueMemberSeq_H_
@@ -2797,42 +3344,54 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ValueMemberSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueMemberDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueMemberDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueDef::FullValueDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueDef::FullValueDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueDescription &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtValueDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtValueDef_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtValueDef::ExtFullValueDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtValueDef::ExtFullValueDescription &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueBoxDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBoxDef_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1016
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "IFR_ExtendedC.i"
@@ -2848,3 +3407,5 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBox
 
 #include "ace/post.h"
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.i b/TAO/tao/IFR_Client/IFR_ExtendedC.i
index 70fd4c97bed..4c500652a3a 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.i
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.i
@@ -21,7 +21,7 @@
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_FIXEDDEF___CI_)
 #define _CORBA_FIXEDDEF___CI_
@@ -37,10 +37,17 @@ CORBA::FixedDef::FixedDef (
   this->CORBA_FixedDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::FixedDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::ValueMember_var
@@ -190,7 +197,7 @@ CORBA::ValueMember_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::ValueMember_out
@@ -251,7 +258,7 @@ CORBA::ValueMember_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -467,7 +474,7 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::replace (
 #define _CORBA_VALUEMEMBERSEQ_CI_
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class CORBA::ValueMemberSeq_var
@@ -637,7 +644,7 @@ CORBA::ValueMemberSeq_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
 
 // *************************************************************
 // Inline operations for class CORBA::ValueMemberSeq_out
@@ -709,7 +716,7 @@ CORBA::ValueMemberSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_VALUEMEMBERDEF___CI_)
 #define _CORBA_VALUEMEMBERDEF___CI_
@@ -725,10 +732,17 @@ CORBA::ValueMemberDef::ValueMemberDef (
   this->CORBA_ValueMemberDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::ValueMemberDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::ValueDef::FullValueDescription_var
@@ -878,7 +892,7 @@ CORBA::ValueDef::FullValueDescription_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::ValueDef::FullValueDescription_out
@@ -939,7 +953,7 @@ CORBA::ValueDef::FullValueDescription_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_VALUEDEF___CI_)
 #define _CORBA_VALUEDEF___CI_
@@ -955,10 +969,17 @@ CORBA::ValueDef::ValueDef (
   this->CORBA_ValueDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::ValueDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class CORBA::ValueDescription_var
@@ -1108,7 +1129,7 @@ CORBA::ValueDescription_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class CORBA::ValueDescription_out
@@ -1169,7 +1190,244 @@ CORBA::ValueDescription_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
+// *************************************************************
+// Inline operations for class CORBA::ExtValueDef::ExtFullValueDescription_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_var::ExtFullValueDescription_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_var::ExtFullValueDescription_var (ExtFullValueDescription *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_var::ExtFullValueDescription_var (const ::CORBA::ExtValueDef::ExtFullValueDescription_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ExtValueDef::ExtFullValueDescription (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_var::~ExtFullValueDescription_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_var &
+CORBA::ExtValueDef::ExtFullValueDescription_var::operator= (ExtFullValueDescription *_tao_struct_var)
+{
+  delete this->ptr_;
+  this->ptr_ = _tao_struct_var;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ExtValueDef::ExtFullValueDescription_var &
+CORBA::ExtValueDef::ExtFullValueDescription_var::operator= (const ::CORBA::ExtValueDef::ExtFullValueDescription_var &_tao_struct_var)
+{
+  if (this != &_tao_struct_var)
+    {
+      if (_tao_struct_var.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ExtFullValueDescription *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ExtFullValueDescription (*_tao_struct_var.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ExtFullValueDescription *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE const ::CORBA::ExtValueDef::ExtFullValueDescription *
+CORBA::ExtValueDef::ExtFullValueDescription_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription *
+CORBA::ExtValueDef::ExtFullValueDescription_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_var::operator const ::CORBA::ExtValueDef::ExtFullValueDescription &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_var::operator ::CORBA::ExtValueDef::ExtFullValueDescription &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_var::operator ::CORBA::ExtValueDef::ExtFullValueDescription &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_var::operator ::CORBA::ExtValueDef::ExtFullValueDescription *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const ::CORBA::ExtValueDef::ExtFullValueDescription &
+CORBA::ExtValueDef::ExtFullValueDescription_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription &
+CORBA::ExtValueDef::ExtFullValueDescription_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+// Mapping for variable size.
+ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription *&
+CORBA::ExtValueDef::ExtFullValueDescription_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription *
+CORBA::ExtValueDef::ExtFullValueDescription_var::_retn (void)
+{
+  ::CORBA::ExtValueDef::ExtFullValueDescription *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription *
+CORBA::ExtValueDef::ExtFullValueDescription_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 CORBA::ExtValueDef::ExtFullValueDescription_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_out::ExtFullValueDescription_out (::CORBA::ExtValueDef::ExtFullValueDescription *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_out::ExtFullValueDescription_out (ExtFullValueDescription_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_out::ExtFullValueDescription_out (const ::CORBA::ExtValueDef::ExtFullValueDescription_out &p)
+  : ptr_ (ACE_const_cast (ExtFullValueDescription_out&, p).ptr_)
+{}
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_out &
+CORBA::ExtValueDef::ExtFullValueDescription_out::operator= (const ::CORBA::ExtValueDef::ExtFullValueDescription_out &p)
+{
+  this->ptr_ = ACE_const_cast (ExtFullValueDescription_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtFullValueDescription_out &
+CORBA::ExtValueDef::ExtFullValueDescription_out::operator= (ExtFullValueDescription *_tao_struct_out)
+{
+  this->ptr_ = _tao_struct_out;
+  return *this;
+}
+
+ACE_INLINE 
+CORBA::ExtValueDef::ExtFullValueDescription_out::operator ::CORBA::ExtValueDef::ExtFullValueDescription *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription *&
+CORBA::ExtValueDef::ExtFullValueDescription_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription *
+CORBA::ExtValueDef::ExtFullValueDescription_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
+#if !defined (_CORBA_EXTVALUEDEF___CI_)
+#define _CORBA_EXTVALUEDEF___CI_
+
+ACE_INLINE
+CORBA::ExtValueDef::ExtValueDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
+{
+  this->CORBA_ExtValueDef_setup_collocation (_tao_collocated);
+}
+
+ACE_INLINE
+CORBA::Boolean
+CORBA::ExtValueDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_VALUEBOXDEF___CI_)
 #define _CORBA_VALUEBOXDEF___CI_
@@ -1185,10 +1443,17 @@ CORBA::ValueBoxDef::ValueBoxDef (
   this->CORBA_ValueBoxDef_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::ValueBoxDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -1201,7 +1466,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1215,7 +1480,7 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.defined_in.in ()) &&
     (strm << _tao_aggregate.version.in ()) &&
     (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.type_def.in ()) &&
+    _tao_aggregate.type_def.in ()->marshal (strm) &&
     (strm << _tao_aggregate.access)
    )
     {
@@ -1252,7 +1517,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_ValueMemberSeq_I_
 #define _TAO_CDR_OP_CORBA_ValueMemberSeq_I_
@@ -1270,7 +1535,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ValueMemberSeq_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -1283,7 +1548,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -1296,7 +1561,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1363,7 +1628,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1420,7 +1685,87 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ExtValueDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ExtValueDef_ptr &
+  );
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ExtValueDef::ExtFullValueDescription &_tao_aggregate
+  )
+{
+  if (
+    (strm << _tao_aggregate.name.in ()) &&
+    (strm << _tao_aggregate.id.in ()) &&
+    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_abstract)) &&
+    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_custom)) &&
+    (strm << _tao_aggregate.defined_in.in ()) &&
+    (strm << _tao_aggregate.version.in ()) &&
+    (strm << _tao_aggregate.operations) &&
+    (strm << _tao_aggregate.attributes) &&
+    (strm << _tao_aggregate.members) &&
+    (strm << _tao_aggregate.initializers) &&
+    (strm << _tao_aggregate.supported_interfaces) &&
+    (strm << _tao_aggregate.abstract_base_values) &&
+    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_truncatable)) &&
+    (strm << _tao_aggregate.base_value.in ()) &&
+    (strm << _tao_aggregate.type.in ())
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ExtValueDef::ExtFullValueDescription &_tao_aggregate
+  )
+{
+  if (
+    (strm >> _tao_aggregate.name.out ()) &&
+    (strm >> _tao_aggregate.id.out ()) &&
+    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_abstract)) &&
+    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_custom)) &&
+    (strm >> _tao_aggregate.defined_in.out ()) &&
+    (strm >> _tao_aggregate.version.out ()) &&
+    (strm >> _tao_aggregate.operations) &&
+    (strm >> _tao_aggregate.attributes) &&
+    (strm >> _tao_aggregate.members) &&
+    (strm >> _tao_aggregate.initializers) &&
+    (strm >> _tao_aggregate.supported_interfaces) &&
+    (strm >> _tao_aggregate.abstract_base_values) &&
+    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_truncatable)) &&
+    (strm >> _tao_aggregate.base_value.out ()) &&
+    (strm >> _tao_aggregate.type.out ())
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -1432,3 +1777,4 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
     CORBA::ValueBoxDef_ptr &
   );
 
+
diff --git a/TAO/tao/IFR_Client/Makefile b/TAO/tao/IFR_Client/Makefile
index c3976673e4b..22955f2ea0e 100644
--- a/TAO/tao/IFR_Client/Makefile
+++ b/TAO/tao/IFR_Client/Makefile
@@ -120,12 +120,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -138,13 +135,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -154,6 +151,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -172,25 +187,41 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i IFR_BaseC.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
@@ -201,10 +232,14 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -219,13 +254,11 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -242,12 +275,17 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -259,21 +297,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -286,14 +309,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -337,10 +352,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -350,11 +385,11 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/IFR_BasicC.o .obj/IFR_BasicC.so .shobj/IFR_BasicC.o .shobj/IFR_BasicC.so: IFR_BasicC.cpp IFR_BasicC.h \
-  $(ACE_ROOT)/ace/pre.h IFR_BaseC.h ifr_client_export.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -383,34 +418,9 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -423,13 +433,17 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -439,6 +453,25 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -457,60 +490,131 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i IFR_BaseC.i IFR_BasicC.i \
-  $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/MProfile.i \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  ifr_client_export.h IFR_BaseC.h IFR_BaseC.i IFR_BasicC.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -525,40 +629,9 @@ endif
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -571,14 +644,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -622,10 +687,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -635,11 +720,11 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/IFR_ExtendedC.o .obj/IFR_ExtendedC.so .shobj/IFR_ExtendedC.o .shobj/IFR_ExtendedC.so: IFR_ExtendedC.cpp IFR_ExtendedC.h \
-  $(ACE_ROOT)/ace/pre.h IFR_BasicC.h IFR_BaseC.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -668,34 +753,9 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -708,13 +768,17 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -724,6 +788,25 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -742,60 +825,131 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i IFR_BaseC.i IFR_BasicC.i \
-  IFR_ExtendedC.i $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/MProfile.i \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  ifr_client_export.h IFR_BasicC.h IFR_BaseC.h IFR_BaseC.i IFR_BasicC.i \
+  IFR_ExtendedC.i $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -810,40 +964,9 @@ endif
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -856,14 +979,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -907,10 +1022,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -920,11 +1055,11 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/IFR_ComponentsC.o .obj/IFR_ComponentsC.so .shobj/IFR_ComponentsC.o .shobj/IFR_ComponentsC.so: IFR_ComponentsC.cpp IFR_ComponentsC.h \
-  $(ACE_ROOT)/ace/pre.h ifr_client_export.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl IFR_ExtendedC.h IFR_BasicC.h \
-  IFR_BaseC.h $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -953,34 +1088,9 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -993,13 +1103,17 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1009,6 +1123,25 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1027,61 +1160,132 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i IFR_BaseC.i IFR_BasicC.i \
-  IFR_ExtendedC.i IFR_ComponentsC.i \
-  $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/MProfile.i \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  ifr_client_export.h IFR_ExtendedC.h IFR_BasicC.h IFR_BaseC.h \
+  IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i IFR_ComponentsC.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -1096,40 +1300,9 @@ endif
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -1142,14 +1315,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1193,10 +1358,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -1251,7 +1436,8 @@ endif
   $(ACE_ROOT)/ace/Exception_Macros.h ifr_client_export.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -1282,7 +1468,8 @@ endif
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1326,19 +1513,34 @@ endif
   $(ACE_ROOT)/ace/Timer_Queue_T.i \
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h IFR_ExtendedC.h IFR_BasicC.h \
-  IFR_BaseC.h $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h IFR_ExtendedC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
   $(TAO_ROOT)/tao/Sequence.i \
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
@@ -1346,39 +1548,76 @@ endif
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i IFR_BaseC.i IFR_BasicC.i \
-  IFR_ExtendedC.i $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i IFR_BasicC.h \
+  IFR_BaseC.h IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -1394,22 +1633,6 @@ endif
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -1425,14 +1648,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1473,10 +1688,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
diff --git a/TAO/tao/IFR_Client/TAO_IFR_Client.dsp b/TAO/tao/IFR_Client/TAO_IFR_Client.dsp
index af9c797f6c5..af095ac548c 100644
--- a/TAO/tao/IFR_Client/TAO_IFR_Client.dsp
+++ b/TAO/tao/IFR_Client/TAO_IFR_Client.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IFR_BASIC_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GR- /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IFR_BASIC_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -100,7 +100,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -128,7 +128,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GR- /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -155,10 +155,12 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\IFR_BaseC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

 SOURCE=.\IFR_BasicC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -167,10 +169,12 @@ SOURCE=.\IFR_Client_Adapter_Impl.cpp
 # Begin Source File

 

 SOURCE=.\IFR_ComponentsC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

 SOURCE=.\IFR_ExtendedC.cpp

+# ADD CPP /GR

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h
index a725c032b91..8fbd7f0dc1c 100644
--- a/TAO/tao/IFR_Client_Adapter.h
+++ b/TAO/tao/IFR_Client_Adapter.h
@@ -24,6 +24,12 @@
 #include "ace/Service_Object.h"
 #include "ace/CORBA_macros.h"
 
+namespace CORBA
+{
+  class InterfaceDef;
+  typedef InterfaceDef *InterfaceDef_ptr;
+};
+
 /**
  * @class TAO_IFR_Client_Adapter
  *
diff --git a/TAO/tao/IFR_TypeCodes.cpp b/TAO/tao/IFR_TypeCodes.cpp
deleted file mode 100644
index 7203e32eac5..00000000000
--- a/TAO/tao/IFR_TypeCodes.cpp
+++ /dev/null
@@ -1,356 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "tao/corbafwd.h"
-
-ACE_RCSID (tao, 
-           IFR_TypeCodes, 
-           "$Id$")
-
-// These Interface Repository typecodes and constants are in
-// the CORBA namespace. The typecodes are set to 0 here. If the 
-// IFR_Client library is built and linked, the library initializer 
-// will set them to their correct values. The constants are set to
-// the correct values in this file, since it doesn't take up any
-// more space to do that.
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryId, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Identifier, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ScopedName, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_VersionSpec, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextIdentifier, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IRObject, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DefinitionKind, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Contained, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContainedSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Repository, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Container, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ModuleDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConstantDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IDLType, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnumDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AliasDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AbstractInterfaceDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_LocalInterfaceDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NativeDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDefSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AbstractInterfaceDefSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_LocalInterfaceDefSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDefSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueBoxDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructMember, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructMemberSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Initializer, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InitializerSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionMember, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionMemberSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnumMemberSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ModuleDescription, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConstantDescription, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TypedefDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TypeDescription, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WstringDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FixedDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SequenceDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ArrayDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDescription, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDefSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExcDescriptionSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeMode, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeDescription, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveKind, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterMode, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterDescription, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParDescriptionSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextIdSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationMode, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationDescription, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryIdSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OpDescriptionSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttrDescriptionSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDescription, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMember, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMemberSeq, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMemberDef, 0)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDescription, 0)
-TAO_NAMESPACE_END
-
diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl
index 21064aa7983..835a640776e 100644
--- a/TAO/tao/IIOP.pidl
+++ b/TAO/tao/IIOP.pidl
@@ -8,7 +8,7 @@
 //   is:
 //
 //     tao_idl \
-//        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+//        -o orig -Gp -Gd -Ge 1
 //          -Wb,export_macro=TAO_Export \
 //          -Wb,export_include="tao/TAO_Export.h" \
 //          -Wb,pre_include="ace/pre.h" \
@@ -39,8 +39,4 @@ module IIOP
   };
 };
 
-
-
-#pragma prefix ""
-
 #endif  /* TAO_IIOP_PIDL */
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index 928dd51e586..2d0745c3e3c 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -19,486 +19,603 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
 #include "tao/IIOPC.h"
 #include "tao/Typecode.h"
-#include "tao/Any.h"
+#include "tao/Any_T.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
 #include "IIOPC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IIOP_ListenPoint[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
-  12, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400),  // name = ListenPoint
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x2f4c6973), 
+  ACE_NTOHL (0x74656e50), 
+  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
+    12,
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x656e506f), 
+  ACE_NTOHL (0x696e7400),  // name = ListenPoint
   2, // member count
-  5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0),  // name = host
-  CORBA::tk_string,
+    5,
+  ACE_NTOHL (0x686f7374), 
+  ACE_NTOHL (0x0),  // name = host
+    CORBA::tk_string, 
   0U, // string length
-  5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0),  // name = port
-  CORBA::tk_ushort,
+  5,
+  ACE_NTOHL (0x706f7274), 
+  ACE_NTOHL (0x0),  // name = port
+    CORBA::tk_ushort,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPoint (CORBA::tk_struct, sizeof (_oc_IIOP_ListenPoint), (char *) &_oc_IIOP_ListenPoint, 0, sizeof (IIOP::ListenPoint));
+
+static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPoint (
+    CORBA::tk_struct,
+    sizeof (_oc_IIOP_ListenPoint),
+    (char *) &_oc_IIOP_ListenPoint,
+    0,
+    sizeof (IIOP::ListenPoint)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IIOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ListenPoint, &_tc_TAO_tc_IIOP_ListenPoint)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ListenPoint,
+    &_tc_TAO_tc_IIOP_ListenPoint
+  )
 TAO_NAMESPACE_END
-void IIOP::ListenPoint::_tao_any_destructor (void *x)
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void IIOP::ListenPoint::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ListenPoint *tmp = ACE_static_cast (ListenPoint*,x);
+  ListenPoint *tmp = ACE_static_cast (ListenPoint*, _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)
+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_);
-
+      IIOP::ListenPoint *old =
+        ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
+        {
+          tmp[i] = old[i];
+        }
+      
       if (this->release_)
-        _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (old);
-
+        {
+          _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (old);
+        }
     }
-    this->buffer_ = tmp;
-  }
+  
+  this->buffer_ = tmp;
+}
 
-  void
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
+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) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-
+    }
+  
+  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 */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IIOP_LISTENPOINTLIST_CS_)
 #define _IIOP_LISTENPOINTLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // IIOP::ListenPointList
 // *************************************************************
 
 IIOP::ListenPointList::ListenPointList (void)
 {}
-IIOP::ListenPointList::ListenPointList (CORBA::ULong max) // uses max size
-  :
+
+IIOP::ListenPointList::ListenPointList (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IIOP_ListenPointList
+_TAO_Unbounded_Sequence_IIOP_ListenPointList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IIOP::ListenPoint>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<IIOP::ListenPoint>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-IIOP::ListenPointList::ListenPointList (CORBA::ULong max, CORBA::ULong length, IIOP::ListenPoint *buffer, CORBA::Boolean release)
-  :
+
+IIOP::ListenPointList::ListenPointList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IIOP::ListenPoint *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IIOP_ListenPointList
+_TAO_Unbounded_Sequence_IIOP_ListenPointList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IIOP::ListenPoint>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<IIOP::ListenPoint>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-IIOP::ListenPointList::ListenPointList (const ListenPointList &seq) // copy ctor
-  :
+
+IIOP::ListenPointList::ListenPointList (const ListenPointList &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IIOP_ListenPointList
+_TAO_Unbounded_Sequence_IIOP_ListenPointList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IIOP::ListenPoint>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<IIOP::ListenPoint>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 IIOP::ListenPointList::~ListenPointList (void) // dtor
 {}
-void IIOP::ListenPointList::_tao_any_destructor (void *x)
+
+void IIOP::ListenPointList::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ListenPointList *tmp = ACE_static_cast (ListenPointList*,x);
+  ListenPointList *tmp = ACE_static_cast (ListenPointList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IIOP_ListenPointList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
-  16, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e744c), ACE_NTOHL (0x69737400),  // name = ListenPointList
-  CORBA::tk_sequence, // typecode kind
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x2f4c6973), 
+  ACE_NTOHL (0x74656e50), 
+  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
+    16,
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x656e506f), 
+  ACE_NTOHL (0x696e744c), 
+  ACE_NTOHL (0x69737400),  // name = ListenPointList
+    CORBA::tk_sequence, // typecode kind
   116, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     100, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
-      12, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400),  // name = ListenPoint
+      33,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x49494f50), 
+      ACE_NTOHL (0x2f4c6973), 
+      ACE_NTOHL (0x74656e50), 
+      ACE_NTOHL (0x6f696e74), 
+      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
+            12,
+      ACE_NTOHL (0x4c697374), 
+      ACE_NTOHL (0x656e506f), 
+      ACE_NTOHL (0x696e7400),  // name = ListenPoint
       2, // member count
-      5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0),  // name = host
-      CORBA::tk_string,
+            5,
+      ACE_NTOHL (0x686f7374), 
+      ACE_NTOHL (0x0),  // name = host
+            CORBA::tk_string, 
       0U, // string length
-      5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0),  // name = port
-      CORBA::tk_ushort,
+      5,
+      ACE_NTOHL (0x706f7274), 
+      ACE_NTOHL (0x0),  // name = port
+            CORBA::tk_ushort,
 
 
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPointList (CORBA::tk_alias, sizeof (_oc_IIOP_ListenPointList), (char *) &_oc_IIOP_ListenPointList, 0, sizeof (IIOP::ListenPointList));
+
+static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPointList (
+    CORBA::tk_alias,
+    sizeof (_oc_IIOP_ListenPointList),
+    (char *) &_oc_IIOP_ListenPointList,
+    0,
+    sizeof (IIOP::ListenPointList)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IIOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ListenPointList, &_tc_TAO_tc_IIOP_ListenPointList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ListenPointList,
+    &_tc_TAO_tc_IIOP_ListenPointList
+  )
 TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f426944), ACE_NTOHL (0x69724949), ACE_NTOHL (0x4f505365), ACE_NTOHL (0x72766963), ACE_NTOHL (0x65436f6e), ACE_NTOHL (0x74657874), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0
-  24, ACE_NTOHL (0x42694469), ACE_NTOHL (0x7249494f), ACE_NTOHL (0x50536572), ACE_NTOHL (0x76696365), ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787400),  // name = BiDirIIOPServiceContext
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x2f426944), 
+  ACE_NTOHL (0x69724949), 
+  ACE_NTOHL (0x4f505365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65436f6e), 
+  ACE_NTOHL (0x74657874), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0
+    24,
+  ACE_NTOHL (0x42694469), 
+  ACE_NTOHL (0x7249494f), 
+  ACE_NTOHL (0x50536572), 
+  ACE_NTOHL (0x76696365), 
+  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x65787400),  // name = BiDirIIOPServiceContext
   1, // member count
-  14, ACE_NTOHL (0x6c697374), ACE_NTOHL (0x656e5f70), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x73000000),  // name = listen_points
-  CORBA::tk_alias, // typecode kind for typedefs
+    14,
+  ACE_NTOHL (0x6c697374), 
+  ACE_NTOHL (0x656e5f70), 
+  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x73000000),  // name = listen_points
+    CORBA::tk_alias, // typecode kind for typedefs
   192, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
-    16, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e744c), ACE_NTOHL (0x69737400),  // name = ListenPointList
-    CORBA::tk_sequence, // typecode kind
+    37,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x49494f50), 
+    ACE_NTOHL (0x2f4c6973), 
+    ACE_NTOHL (0x74656e50), 
+    ACE_NTOHL (0x6f696e74), 
+    ACE_NTOHL (0x4c697374), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
+        16,
+    ACE_NTOHL (0x4c697374), 
+    ACE_NTOHL (0x656e506f), 
+    ACE_NTOHL (0x696e744c), 
+    ACE_NTOHL (0x69737400),  // name = ListenPointList
+        CORBA::tk_sequence, // typecode kind
     116, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
       100, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
-        12, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400),  // name = ListenPoint
+        33,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x49494f50), 
+        ACE_NTOHL (0x2f4c6973), 
+        ACE_NTOHL (0x74656e50), 
+        ACE_NTOHL (0x6f696e74), 
+        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
+                12,
+        ACE_NTOHL (0x4c697374), 
+        ACE_NTOHL (0x656e506f), 
+        ACE_NTOHL (0x696e7400),  // name = ListenPoint
         2, // member count
-        5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0),  // name = host
-        CORBA::tk_string,
+                5,
+        ACE_NTOHL (0x686f7374), 
+        ACE_NTOHL (0x0),  // name = host
+                CORBA::tk_string, 
         0U, // string length
-        5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0),  // name = port
-        CORBA::tk_ushort,
+        5,
+        ACE_NTOHL (0x706f7274), 
+        ACE_NTOHL (0x0),  // name = port
+                CORBA::tk_ushort,
 
 
       0U,
 
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IIOP_BiDirIIOPServiceContext (CORBA::tk_struct, sizeof (_oc_IIOP_BiDirIIOPServiceContext), (char *) &_oc_IIOP_BiDirIIOPServiceContext, 0, sizeof (IIOP::BiDirIIOPServiceContext));
+
+static CORBA::TypeCode _tc_TAO_tc_IIOP_BiDirIIOPServiceContext (
+    CORBA::tk_struct,
+    sizeof (_oc_IIOP_BiDirIIOPServiceContext),
+    (char *) &_oc_IIOP_BiDirIIOPServiceContext,
+    0,
+    sizeof (IIOP::BiDirIIOPServiceContext)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IIOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BiDirIIOPServiceContext, &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_BiDirIIOPServiceContext,
+    &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext
+  )
 TAO_NAMESPACE_END
-void IIOP::BiDirIIOPServiceContext::_tao_any_destructor (void *x)
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void IIOP::BiDirIIOPServiceContext::_tao_any_destructor (void *_tao_void_pointer)
 {
-  BiDirIIOPServiceContext *tmp = ACE_static_cast (BiDirIIOPServiceContext*,x);
+  BiDirIIOPServiceContext *tmp = ACE_static_cast (BiDirIIOPServiceContext*, _tao_void_pointer);
   delete tmp;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const IIOP::ListenPoint &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IIOP::ListenPoint &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::insert_copy (
+      _tao_any,
+      IIOP::ListenPoint::_tao_any_destructor,
       IIOP::_tc_ListenPoint,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, IIOP::ListenPoint *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IIOP::ListenPoint *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::insert (
+      _tao_any,
+      IIOP::ListenPoint::_tao_any_destructor,
       IIOP::_tc_ListenPoint,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IIOP::ListenPoint::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IIOP::ListenPoint *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IIOP::ListenPoint *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const IIOP::ListenPoint*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const IIOP::ListenPoint *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::ListenPoint *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IIOP::ListenPoint *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IIOP::_tc_ListenPoint ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IIOP::ListenPoint*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IIOP::ListenPoint *tmp;
-      ACE_NEW_RETURN (tmp, IIOP::ListenPoint, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IIOP::_tc_ListenPoint,
-            1,
-            ACE_static_cast (void *, tmp),
-            IIOP::ListenPoint::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::extract (
+        _tao_any,
+        IIOP::ListenPoint::_tao_any_destructor,
+        IIOP::_tc_ListenPoint,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<IIOP::ListenPoint>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<IIOP::ListenPoint>
+#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
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const IIOP::ListenPointList &_tao_elem
-  ) // copying
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        IIOP::_tc_ListenPointList,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert_copy (
+      _tao_any,
+      IIOP::ListenPointList::_tao_any_destructor,
+      IIOP::_tc_ListenPointList,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, IIOP::ListenPointList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IIOP::ListenPointList *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert (
+      _tao_any,
+      IIOP::ListenPointList::_tao_any_destructor,
       IIOP::_tc_ListenPointList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IIOP::ListenPointList::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IIOP::ListenPointList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IIOP::ListenPointList *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IIOP::ListenPointList*&,
+  return _tao_any >>= ACE_const_cast (
+      const IIOP::ListenPointList *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::ListenPointList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IIOP::ListenPointList *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IIOP::_tc_ListenPointList ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IIOP::ListenPointList*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IIOP::ListenPointList *tmp;
-      ACE_NEW_RETURN (tmp, IIOP::ListenPointList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IIOP::_tc_ListenPointList,
-            1,
-            ACE_static_cast (void *, tmp),
-            IIOP::ListenPointList::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::extract (
+        _tao_any,
+        IIOP::ListenPointList::_tao_any_destructor,
+        IIOP::_tc_ListenPointList,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, const IIOP::BiDirIIOPServiceContext &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IIOP::BiDirIIOPServiceContext &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::insert_copy (
+      _tao_any,
+      IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
       IIOP::_tc_BiDirIIOPServiceContext,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, IIOP::BiDirIIOPServiceContext *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IIOP::BiDirIIOPServiceContext *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::insert (
+      _tao_any,
+      IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
       IIOP::_tc_BiDirIIOPServiceContext,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IIOP::BiDirIIOPServiceContext::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IIOP::BiDirIIOPServiceContext *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IIOP::BiDirIIOPServiceContext *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const IIOP::BiDirIIOPServiceContext*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const IIOP::BiDirIIOPServiceContext *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::BiDirIIOPServiceContext *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IIOP::BiDirIIOPServiceContext *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IIOP::_tc_BiDirIIOPServiceContext
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IIOP::BiDirIIOPServiceContext*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IIOP::BiDirIIOPServiceContext *tmp;
-      ACE_NEW_RETURN (tmp, IIOP::BiDirIIOPServiceContext, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IIOP::_tc_BiDirIIOPServiceContext,
-            1,
-            ACE_static_cast (void *, tmp),
-            IIOP::BiDirIIOPServiceContext::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::extract (
+        _tao_any,
+        IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
+        IIOP::_tc_BiDirIIOPServiceContext,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const IIOP::ListenPointList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -507,21 +624,37 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h
index a868d5df5a2..a8ca954fe85 100644
--- a/TAO/tao/IIOPC.h
+++ b/TAO/tao/IIOPC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IIOPC_H
-#define TAO_IDL_IIOPC_H
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_IIOPC_H_
+#define _TAO_IDL_ORIG_IIOPC_H_
 
 #include "ace/pre.h"
 #include "tao/TAO_Export.h"
@@ -40,7 +43,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
@@ -55,53 +57,67 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  IIOP
 {
-  struct ListenPoint;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class ListenPoint_var;
-
+  
   struct TAO_Export ListenPoint
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ListenPoint_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
     TAO_String_Manager host;
     CORBA::UShort port;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export ListenPoint_var
   {
   public:
-    ListenPoint_var (void); // default constructor
+    ListenPoint_var (void);
     ListenPoint_var (ListenPoint *);
-    ListenPoint_var (const ListenPoint_var &); // copy constructor
-    ~ListenPoint_var (void); // destructor
-
+    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;
-    operator ListenPoint *&(); // variable-size types only
-
-    // in, inout, out, _retn
+    
+    // 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:
@@ -113,143 +129,167 @@ TAO_NAMESPACE  IIOP
     operator ListenPoint *&();
     ListenPoint *&ptr (void);
     ListenPoint *operator-> (void);
-
+    
   private:
     ListenPoint *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const ListenPoint_var &);
   };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ListenPoint;
-
+  
+  // 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_NESTED_MACRO _TAO_Unbounded_Sequence_IIOP_ListenPointList : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-
-      _TAO_Unbounded_Sequence_IIOP_ListenPointList (void); // Default constructor.
-      _TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum);
-      _TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum,
+  
+  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); // Dtor.
-      // = 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);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-      ListenPoint *get_buffer (CORBA::Boolean orphan = 0);
-      const ListenPoint *get_buffer (void) const;
-      void replace (CORBA::ULong max,
+        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);
-    };
+        CORBA::Boolean release
+      );
+  };
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#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;
-
+  
   // *************************************************************
-  // ListenPointList
+  // 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
 
-  class TAO_Export ListenPointList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList
+  _TAO_Unbounded_Sequence_IIOP_ListenPointList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<ListenPoint>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<ListenPoint>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    ListenPointList (void); // default ctor
-    ListenPointList (CORBA::ULong max); // uses max size
+    ListenPointList (void);
+    ListenPointList (CORBA::ULong max);
     ListenPointList (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      ListenPoint *buffer,
-      CORBA::Boolean release = 0
-    );
-    ListenPointList (const ListenPointList &); // copy ctor
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ListenPoint *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ListenPointList (const ListenPointList &);
     ~ListenPointList (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef ListenPointList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
   };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_IIOP_LISTENPOINTLIST___VAR_CH_)
 #define _IIOP_LISTENPOINTLIST___VAR_CH_
-
+  
+  // 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); // default constructor
+    ListenPointList_var (void);
     ListenPointList_var (ListenPointList *);
-    ListenPointList_var (const ListenPointList_var &); // copy constructor
-    ~ListenPointList_var (void); // destructor
-
+    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;
-    operator ListenPointList *&(); // variable-size base types only
-
+    
+    // Variable-size base types only.
+    operator ListenPointList *&();
+    
     ListenPoint & operator[] (CORBA::ULong index);
     const ListenPoint & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ListenPointList &in (void) const;
     ListenPointList &inout (void);
     ListenPointList *&out (void);
     ListenPointList *_retn (void);
     ListenPointList *ptr (void) const;
-
+  
   private:
     ListenPointList *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_IIOP_LISTENPOINTLIST___OUT_CH_)
 #define _IIOP_LISTENPOINTLIST___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export ListenPointList_out
   {
   public:
@@ -262,62 +302,70 @@ TAO_NAMESPACE  IIOP
     ListenPointList *&ptr (void);
     ListenPointList *operator-> (void);
     ListenPoint & operator[] (CORBA::ULong index);
-
+  
   private:
     ListenPointList *&ptr_;
-    // assignment from T_var not allowed
+    // Assignment from T_var not allowed.
     void operator= (const ListenPointList_var &);
   };
 
-
 #endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ListenPointList;
-
-  struct BiDirIIOPServiceContext;
+  
+  // 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_ListenPointList;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class BiDirIIOPServiceContext_var;
-
+  
   struct TAO_Export BiDirIIOPServiceContext
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef BiDirIIOPServiceContext_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
-
-    ACE_NESTED_CLASS (IIOP, ListenPointList) listen_points;
+    
+    static void _tao_any_destructor (void *);
+    IIOP::ListenPointList listen_points;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export BiDirIIOPServiceContext_var
   {
   public:
-    BiDirIIOPServiceContext_var (void); // default constructor
+    BiDirIIOPServiceContext_var (void);
     BiDirIIOPServiceContext_var (BiDirIIOPServiceContext *);
-    BiDirIIOPServiceContext_var (const BiDirIIOPServiceContext_var &); // copy constructor
-    ~BiDirIIOPServiceContext_var (void); // destructor
-
+    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;
-    operator BiDirIIOPServiceContext *&(); // variable-size types only
-
-    // in, inout, out, _retn
+    
+    // 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:
@@ -329,37 +377,62 @@ TAO_NAMESPACE  IIOP
     operator BiDirIIOPServiceContext *&();
     BiDirIIOPServiceContext *&ptr (void);
     BiDirIIOPServiceContext *operator-> (void);
-
+    
   private:
     BiDirIIOPServiceContext *&ptr_;
-    // assignment from T_var not allowed
+    // 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;
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext;
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module IIOP
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPoint &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPoint*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPoint *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPoint *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPointList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPointList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPointList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPointList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IIOP::BiDirIIOPServiceContext &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IIOP::BiDirIIOPServiceContext*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::BiDirIIOPServiceContext *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOPServiceContext *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_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
+
 #if !defined _TAO_CDR_OP_IIOP_ListenPointList_H_
 #define _TAO_CDR_OP_IIOP_ListenPointList_H_
 
@@ -374,11 +447,19 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_IIOP_ListenPointList_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::BiDirIIOPServiceContext &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceContext &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "IIOPC.i"
@@ -388,5 +469,10 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceCont
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/IIOPC.i b/TAO/tao/IIOPC.i
index df1e0b8bbcd..bd3a849fa93 100644
--- a/TAO/tao/IIOPC.i
+++ b/TAO/tao/IIOPC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class IIOP::ListenPoint_var
 // *************************************************************
 
 ACE_INLINE
-IIOP::ListenPoint_var::ListenPoint_var (void) // default constructor
+IIOP::ListenPoint_var::ListenPoint_var (void)
   : ptr_ (0)
 {}
 
@@ -34,46 +38,56 @@ IIOP::ListenPoint_var::ListenPoint_var (ListenPoint *p)
 {}
 
 ACE_INLINE
-IIOP::ListenPoint_var::ListenPoint_var (const ::IIOP::ListenPoint_var &p) // copy constructor
+IIOP::ListenPoint_var::ListenPoint_var (const ::IIOP::ListenPoint_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IIOP::ListenPoint (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IIOP::ListenPoint (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IIOP::ListenPoint_var::~ListenPoint_var (void) // destructor
+IIOP::ListenPoint_var::~ListenPoint_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IIOP::ListenPoint_var &
-IIOP::ListenPoint_var::operator= (ListenPoint *p)
+ACE_INLINE
+IIOP::ListenPoint_var &
+IIOP::ListenPoint_var::operator= (ListenPoint *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::IIOP::ListenPoint_var &
-IIOP::ListenPoint_var::operator= (const ::IIOP::ListenPoint_var &p)
+ACE_INLINE
+::IIOP::ListenPoint_var &
+IIOP::ListenPoint_var::operator= (const ::IIOP::ListenPoint_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
         {
-          IIOP::ListenPoint *deep_copy = 
-            new IIOP::ListenPoint (*p.ptr_);
+          ListenPoint *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ListenPoint (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              IIOP::ListenPoint *tmp = deep_copy;
+              ListenPoint *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -114,7 +128,7 @@ IIOP::ListenPoint_var::operator ::IIOP::ListenPoint &() const // cast
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IIOP::ListenPoint_var::operator ::IIOP::ListenPoint *&() // cast 
 {
@@ -133,7 +147,7 @@ IIOP::ListenPoint_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::IIOP::ListenPoint *&
 IIOP::ListenPoint_var::out (void)
 {
@@ -156,6 +170,9 @@ 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
 // *************************************************************
@@ -168,7 +185,7 @@ IIOP::ListenPoint_out::ListenPoint_out (::IIOP::ListenPoint *&p)
 }
 
 ACE_INLINE
-IIOP::ListenPoint_out::ListenPoint_out (ListenPoint_var &p) // constructor from _var
+IIOP::ListenPoint_out::ListenPoint_out (ListenPoint_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -176,21 +193,23 @@ IIOP::ListenPoint_out::ListenPoint_out (ListenPoint_var &p) // constructor from
 }
 
 ACE_INLINE
-IIOP::ListenPoint_out::ListenPoint_out (const ::IIOP::ListenPoint_out &p) // copy constructor
+IIOP::ListenPoint_out::ListenPoint_out (const ::IIOP::ListenPoint_out &p)
   : ptr_ (ACE_const_cast (ListenPoint_out&, p).ptr_)
 {}
 
-ACE_INLINE IIOP::ListenPoint_out &
+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 *p)
+ACE_INLINE
+IIOP::ListenPoint_out &
+IIOP::ListenPoint_out::operator= (ListenPoint *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -212,192 +231,231 @@ 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_
 
-  // = Static operations.
-  ACE_INLINE IIOP::ListenPoint *
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    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)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : 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,
+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)
+    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)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
+{
+}
+
+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_);
+      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];
+        {
+          tmp1[i] = tmp2[i];
+        }
       
       this->buffer_ = tmp1;
     }
-    else
+  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)
-  // Assignment operator.
-  {
-    if (this == &rhs)
+}
+
+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->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_);
-      }
+        {
+          // 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;
-  }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  // = Accessors.
-  ACE_INLINE IIOP::ListenPoint &
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    IIOP::ListenPoint* tmp = ACE_reinterpret_cast(IIOP::ListenPoint*,this->buffer_);
-    return tmp[i];
-  }
+  IIOP::ListenPoint *tmp1 =
+    ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
+  IIOP::ListenPoint * const tmp2 =
+    ACE_reinterpret_cast (IIOP::ListenPoint * ACE_CAST_CONST, rhs.buffer_);
   
-  ACE_INLINE const IIOP::ListenPoint &
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    IIOP::ListenPoint * const tmp = ACE_reinterpret_cast (IIOP::ListenPoint* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tmp1[i] = tmp2[i];
+    }
   
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
+  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;
   
-  ACE_INLINE IIOP::ListenPoint *
-  IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::get_buffer (CORBA::Boolean orphan)
-  {
-    IIOP::ListenPoint *result = 0;
-    if (orphan == 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;
-      }
+        {
+          result =
+            _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
       else
-      {
-        result = ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_);
-      }
+        {
+          result =
+            ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_);
+        }
     }
-    else // if (orphan == 1)
+  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;
-      }
+        {
+          // 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_);
-  }
+  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;
   
-  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)
+  if (this->buffer_ && this->release_ == 1)
     {
-      IIOP::ListenPoint *tmp = ACE_reinterpret_cast(IIOP::ListenPoint*,this->buffer_);
+      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 */
+  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) // default constructor
+IIOP::ListenPointList_var::ListenPointList_var (void)
   : ptr_ (0)
 {}
 
@@ -407,21 +465,26 @@ IIOP::ListenPointList_var::ListenPointList_var (ListenPointList *p)
 {}
 
 ACE_INLINE
-IIOP::ListenPointList_var::ListenPointList_var (const ::IIOP::ListenPointList_var &p) // copy constructor
+IIOP::ListenPointList_var::ListenPointList_var (const ::IIOP::ListenPointList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IIOP::ListenPointList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IIOP::ListenPointList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IIOP::ListenPointList_var::~ListenPointList_var (void) // destructor
+IIOP::ListenPointList_var::~ListenPointList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IIOP::ListenPointList_var &
+ACE_INLINE
+IIOP::ListenPointList_var &
 IIOP::ListenPointList_var::operator= (ListenPointList *p)
 {
   delete this->ptr_;
@@ -429,8 +492,9 @@ IIOP::ListenPointList_var::operator= (ListenPointList *p)
   return *this;
 }
 
-ACE_INLINE IIOP::ListenPointList_var &
-IIOP::ListenPointList_var::operator= (const ::IIOP::ListenPointList_var &p) // deep copy
+ACE_INLINE
+::IIOP::ListenPointList_var &
+IIOP::ListenPointList_var::operator= (const ::IIOP::ListenPointList_var &p)
 {
   if (this != &p)
     {
@@ -441,12 +505,16 @@ IIOP::ListenPointList_var::operator= (const ::IIOP::ListenPointList_var &p) // d
         }
       else
         {
-          IIOP::ListenPointList *deep_copy = 
-            new IIOP::ListenPointList (*p.ptr_);
+          ListenPointList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ListenPointList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              IIOP::ListenPointList *tmp = deep_copy;
+              ListenPointList *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -457,69 +525,75 @@ IIOP::ListenPointList_var::operator= (const ::IIOP::ListenPointList_var &p) // d
   return *this;
 }
 
-ACE_INLINE const ::IIOP::ListenPointList *
+ACE_INLINE
+const ::IIOP::ListenPointList *
 IIOP::ListenPointList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IIOP::ListenPointList *
+ACE_INLINE
+::IIOP::ListenPointList *
 IIOP::ListenPointList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IIOP::ListenPointList_var::operator const ::IIOP::ListenPointList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IIOP::ListenPointList_var::operator ::IIOP::ListenPointList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IIOP::ListenPointList_var::operator ::IIOP::ListenPointList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IIOP::ListenPointList_var::operator ::IIOP::ListenPointList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE IIOP::ListenPoint &
+ACE_INLINE
+IIOP::ListenPoint &
 IIOP::ListenPointList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const IIOP::ListenPoint &
+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 &
+ACE_INLINE
+const ::IIOP::ListenPointList &
 IIOP::ListenPointList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::IIOP::ListenPointList &
+ACE_INLINE
+::IIOP::ListenPointList &
 IIOP::ListenPointList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::IIOP::ListenPointList *&
+ACE_INLINE
+::IIOP::ListenPointList *&
 IIOP::ListenPointList_var::out (void)
 {
   delete this->ptr_;
@@ -527,7 +601,8 @@ IIOP::ListenPointList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::IIOP::ListenPointList *
+ACE_INLINE
+::IIOP::ListenPointList *
 IIOP::ListenPointList_var::_retn (void)
 {
   ::IIOP::ListenPointList *tmp = this->ptr_;
@@ -535,12 +610,16 @@ IIOP::ListenPointList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::IIOP::ListenPointList *
+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
 // *************************************************************
@@ -553,7 +632,7 @@ IIOP::ListenPointList_out::ListenPointList_out (ListenPointList *&p)
 }
 
 ACE_INLINE
-IIOP::ListenPointList_out::ListenPointList_out (ListenPointList_var &p) // constructor from _var
+IIOP::ListenPointList_out::ListenPointList_out (ListenPointList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -561,57 +640,64 @@ IIOP::ListenPointList_out::ListenPointList_out (ListenPointList_var &p) // const
 }
 
 ACE_INLINE
-IIOP::ListenPointList_out::ListenPointList_out (const ::IIOP::ListenPointList_out &p) // copy constructor
+IIOP::ListenPointList_out::ListenPointList_out (const ::IIOP::ListenPointList_out &p)
   : ptr_ (ACE_const_cast (ListenPointList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::IIOP::ListenPointList_out &
+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 &
+ACE_INLINE
+::IIOP::ListenPointList_out &
 IIOP::ListenPointList_out::operator= (ListenPointList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IIOP::ListenPointList_out::operator ::IIOP::ListenPointList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IIOP::ListenPointList *&
+ACE_INLINE
+::IIOP::ListenPointList *&
 IIOP::ListenPointList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IIOP::ListenPointList *
+ACE_INLINE
+::IIOP::ListenPointList *
 IIOP::ListenPointList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE IIOP::ListenPoint &
+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) // default constructor
+IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (void)
   : ptr_ (0)
 {}
 
@@ -621,46 +707,56 @@ IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (BiDirIIOPService
 {}
 
 ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (const ::IIOP::BiDirIIOPServiceContext_var &p) // copy constructor
+IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (const ::IIOP::BiDirIIOPServiceContext_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IIOP::BiDirIIOPServiceContext (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IIOP::BiDirIIOPServiceContext (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::~BiDirIIOPServiceContext_var (void) // destructor
+IIOP::BiDirIIOPServiceContext_var::~BiDirIIOPServiceContext_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IIOP::BiDirIIOPServiceContext_var &
-IIOP::BiDirIIOPServiceContext_var::operator= (BiDirIIOPServiceContext *p)
+ACE_INLINE
+IIOP::BiDirIIOPServiceContext_var &
+IIOP::BiDirIIOPServiceContext_var::operator= (BiDirIIOPServiceContext *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext_var &
-IIOP::BiDirIIOPServiceContext_var::operator= (const ::IIOP::BiDirIIOPServiceContext_var &p)
+ACE_INLINE
+::IIOP::BiDirIIOPServiceContext_var &
+IIOP::BiDirIIOPServiceContext_var::operator= (const ::IIOP::BiDirIIOPServiceContext_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
         {
-          IIOP::BiDirIIOPServiceContext *deep_copy = 
-            new IIOP::BiDirIIOPServiceContext (*p.ptr_);
+          BiDirIIOPServiceContext *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              BiDirIIOPServiceContext (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              IIOP::BiDirIIOPServiceContext *tmp = deep_copy;
+              BiDirIIOPServiceContext *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -701,7 +797,7 @@ IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext &()
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext *&() // cast 
 {
@@ -720,7 +816,7 @@ IIOP::BiDirIIOPServiceContext_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::IIOP::BiDirIIOPServiceContext *&
 IIOP::BiDirIIOPServiceContext_var::out (void)
 {
@@ -743,6 +839,9 @@ 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
 // *************************************************************
@@ -755,7 +854,7 @@ IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (::IIOP::BiDirIIO
 }
 
 ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (BiDirIIOPServiceContext_var &p) // constructor from _var
+IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (BiDirIIOPServiceContext_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -763,21 +862,23 @@ IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (BiDirIIOPService
 }
 
 ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (const ::IIOP::BiDirIIOPServiceContext_out &p) // copy constructor
+IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (const ::IIOP::BiDirIIOPServiceContext_out &p)
   : ptr_ (ACE_const_cast (BiDirIIOPServiceContext_out&, p).ptr_)
 {}
 
-ACE_INLINE IIOP::BiDirIIOPServiceContext_out &
+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 *p)
+ACE_INLINE
+IIOP::BiDirIIOPServiceContext_out &
+IIOP::BiDirIIOPServiceContext_out::operator= (BiDirIIOPServiceContext *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -799,30 +900,49 @@ IIOP::BiDirIIOPServiceContext_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IIOP::ListenPoint &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IIOP::ListenPoint &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.host.in ()) &&
     (strm << _tao_aggregate.port)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IIOP::ListenPoint &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IIOP::ListenPoint &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.host.out ()) &&
     (strm >> _tao_aggregate.port)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_IIOP_ListenPointList_I_
 #define _TAO_CDR_OP_IIOP_ListenPointList_I_
@@ -831,6 +951,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const IIOP::ListenPointList &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     IIOP::ListenPointList &
@@ -838,25 +959,42 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IIOP_ListenPointList_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IIOP::BiDirIIOPServiceContext &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IIOP::BiDirIIOPServiceContext &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.listen_points)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IIOP::BiDirIIOPServiceContext &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IIOP::BiDirIIOPServiceContext &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.listen_points)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 705c8a05f62..64665e89673 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -86,7 +86,7 @@ TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
 // TODO =
 //    2) For V1.[1,2] there are tagged components
 int
-TAO_IIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
+TAO_IIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
                                    TAO_MProfile &mprofile,
                                    CORBA::Short priority)
 {
@@ -107,7 +107,7 @@ TAO_IIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_IIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+TAO_IIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
                                        TAO_MProfile &mprofile,
                                        CORBA::Short priority)
 {
@@ -155,7 +155,7 @@ TAO_IIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_IIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
+TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
                                           TAO_MProfile &mprofile,
                                           CORBA::Short priority)
 {
@@ -759,7 +759,7 @@ TAO_IIOP_Acceptor::endpoint_count (void)
 
 int
 TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                               TAO_ObjectKey &object_key)
+                               TAO::ObjectKey &object_key)
 {
   // Create the decoding stream from the encapsulation in the buffer,
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index af914c9a7e1..266ca9f43ff 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -78,14 +78,14 @@ public:
                             int version_minor,
                             const char *options = 0);
   virtual int close (void);
-  virtual int create_profile (const TAO_ObjectKey &object_key,
+  virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
   virtual int is_collocated (const TAO_Endpoint *endpoint);
   virtual CORBA::ULong endpoint_count (void);
 
   virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO_ObjectKey &key);
+                          TAO::ObjectKey &key);
 
   /**
    * Set the host name for the given addr.
@@ -143,13 +143,13 @@ protected:
 
   /// Helper method to add a new profile to the mprofile for
   /// each endpoint.
-  int create_new_profile (const TAO_ObjectKey &object_key,
+  int create_new_profile (const TAO::ObjectKey &object_key,
                           TAO_MProfile &mprofile,
                           CORBA::Short priority);
 
   /// Helper method to create a profile that contains all of
   /// our endpoints.
-  int create_shared_profile (const TAO_ObjectKey &object_key,
+  int create_shared_profile (const TAO::ObjectKey &object_key,
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
 
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index bab1a8cb940..494316c07f9 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -31,7 +31,7 @@ TAO_IIOP_Profile::object_key_delimiter (void) const
 
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                                    const TAO_ObjectKey &object_key,
+                                    const TAO::ObjectKey &object_key,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
   : TAO_Profile (IOP::TAG_INTERNET_IOP, orb_core, version),
@@ -45,7 +45,7 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr &addr,
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
                                     CORBA::UShort port,
-                                    const TAO_ObjectKey &object_key,
+                                    const TAO::ObjectKey &object_key,
                                     const ACE_INET_Addr &addr,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
@@ -293,7 +293,7 @@ TAO_IIOP_Profile::parse_string (const char *ior
         this->endpoint_.host_ = CORBA::string_dup (tmp_host);
     }
 
-  TAO_ObjectKey::decode_string_to_sequence (this->object_key_, okd + 1);
+  TAO::ObjectKey::decode_string_to_sequence (this->object_key_, okd + 1);
 }
 
 CORBA::Boolean
@@ -377,8 +377,8 @@ char *
 TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
-  TAO_ObjectKey::encode_sequence_to_string (key.inout (),
-                                            this->object_key_);
+  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
+                                             this->object_key_);
 
   u_int buflen = (8 /* "corbaloc" */ +
                   1 /* colon separator */ +
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 8b55bead27f..63cc8c5c7ee 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -53,7 +53,7 @@ public:
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
   TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO_ObjectKey &object_key,
+                    const TAO::ObjectKey &object_key,
                     const TAO_GIOP_Message_Version &version,
                     TAO_ORB_Core *orb_core);
 
@@ -61,7 +61,7 @@ public:
   /// doesn't require any address resolution processing.
   TAO_IIOP_Profile (const char *host,
                     CORBA::UShort port,
-                    const TAO_ObjectKey &object_key,
+                    const TAO::ObjectKey &object_key,
                     const ACE_INET_Addr &addr,
                     const TAO_GIOP_Message_Version &version,
                     TAO_ORB_Core *orb_core);
@@ -112,11 +112,11 @@ public:
   virtual int encode_endpoints (void);
 
   /// @@ deprecated. return a reference to the Object Key.
-  virtual const TAO_ObjectKey &object_key (void) const;
+  virtual const TAO::ObjectKey &object_key (void) const;
 
   /// Return a pointer to the Object Key.  The caller owns the memory
   /// allocated for the returned key.
-  virtual TAO_ObjectKey *_key (void) const;
+  virtual TAO::ObjectKey *_key (void) const;
 
   /// Return pointer to the head of this profile's endpoints list.
   virtual TAO_Endpoint *endpoint (void);
@@ -185,7 +185,7 @@ protected:
 private:
 
   /// object_key associated with this profile.
-  TAO_ObjectKey object_key_;
+  TAO::ObjectKey object_key_;
 
   /// Our tagged profile
   IOP::TaggedProfile tagged_profile_;
diff --git a/TAO/tao/IIOP_Profile.i b/TAO/tao/IIOP_Profile.i
index b498170ce78..c6b0657e10e 100644
--- a/TAO/tao/IIOP_Profile.i
+++ b/TAO/tao/IIOP_Profile.i
@@ -1,19 +1,19 @@
 // -*- C++ -*-
 // $Id$
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_IIOP_Profile::object_key (void) const
 {
   return this->object_key_;
 }
 
-ACE_INLINE TAO_ObjectKey *
+ACE_INLINE TAO::ObjectKey *
 TAO_IIOP_Profile::_key (void) const
 {
-  TAO_ObjectKey *key = 0;
+  TAO::ObjectKey *key = 0;
 
   ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (this->object_key_),
+                  TAO::ObjectKey (this->object_key_),
                   0);
 
   return key;
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
index 8e111dc8c94..c6278c09f30 100644
--- a/TAO/tao/IOP.pidl
+++ b/TAO/tao/IOP.pidl
@@ -10,7 +10,7 @@
  * command:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include=TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 4054502091b..196a19e9b22 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IOPC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "IOPC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,23 +44,26 @@
 #include "IOPC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_ProfileId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x50726f66),
-  ACE_NTOHL (0x696c6549),
-  ACE_NTOHL (0x643a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x50726f66), 
+  ACE_NTOHL (0x696c6549), 
+  ACE_NTOHL (0x643a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-  10,
-  ACE_NTOHL (0x50726f66),
-  ACE_NTOHL (0x696c6549),
+    10,
+  ACE_NTOHL (0x50726f66), 
+  ACE_NTOHL (0x696c6549), 
   ACE_NTOHL (0x64000000),  // name = ProfileId
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
 };
 
@@ -69,63 +77,62 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ProfileId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ProfileId, &_tc_TAO_tc_IOP_ProfileId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ProfileId,
+    &_tc_TAO_tc_IOP_ProfileId
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_INTERNET_IOP, 0U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_MULTIPLE_COMPONENTS, 1U)
-TAO_NAMESPACE_END
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_TaggedProfile[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x65645072),
-  ACE_NTOHL (0x6f66696c),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x65645072), 
+  ACE_NTOHL (0x6f66696c), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-  14,
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x65645072),
-  ACE_NTOHL (0x6f66696c),
+    14,
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x65645072), 
+  ACE_NTOHL (0x6f66696c), 
   ACE_NTOHL (0x65000000),  // name = TaggedProfile
   2, // member count
-  4,
+    4,
   ACE_NTOHL (0x74616700),  // name = tag
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x50726f66),
-    ACE_NTOHL (0x696c6549),
-    ACE_NTOHL (0x643a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x50726f66), 
+    ACE_NTOHL (0x696c6549), 
+    ACE_NTOHL (0x643a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-    10,
-    ACE_NTOHL (0x50726f66),
-    ACE_NTOHL (0x696c6549),
+        10,
+    ACE_NTOHL (0x50726f66), 
+    ACE_NTOHL (0x696c6549), 
     ACE_NTOHL (0x64000000),  // name = ProfileId
-    CORBA::tk_ulong,
+        CORBA::tk_ulong,
 
 
   13,
-  ACE_NTOHL (0x70726f66),
-  ACE_NTOHL (0x696c655f),
-  ACE_NTOHL (0x64617461),
+  ACE_NTOHL (0x70726f66), 
+  ACE_NTOHL (0x696c655f), 
+  ACE_NTOHL (0x64617461), 
   ACE_NTOHL (0x0),  // name = profile_data
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
@@ -144,134 +151,161 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_TaggedProfile, &_tc_TAO_tc_IOP_TaggedProfile)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TaggedProfile,
+    &_tc_TAO_tc_IOP_TaggedProfile
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void IOP::TaggedProfile::_tao_any_destructor (void *_tao_void_pointer)
 {
   TaggedProfile *tmp = ACE_static_cast (TaggedProfile*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CS_)
 #define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // IOP::TaggedProfile::_tao_seq_Octet
 // *************************************************************
 
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
-IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  :
+
+IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+
+IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Octet *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  :
+
+IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 IOP::TaggedProfile::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
 {}
+
 void IOP::TaggedProfile::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer)
 {
   _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_IOR[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   24,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x494f523a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x494f523a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-  4,
+    4,
   ACE_NTOHL (0x494f5200),  // name = IOR
   2, // member count
-  8,
-  ACE_NTOHL (0x74797065),
+    8,
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x5f696400),  // name = type_id
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   9,
-  ACE_NTOHL (0x70726f66),
-  ACE_NTOHL (0x696c6573),
+  ACE_NTOHL (0x70726f66), 
+  ACE_NTOHL (0x696c6573), 
   ACE_NTOHL (0x0),  // name = profiles
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       34,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x65645072),
-      ACE_NTOHL (0x6f66696c),
-      ACE_NTOHL (0x653a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x65645072), 
+      ACE_NTOHL (0x6f66696c), 
+      ACE_NTOHL (0x653a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-      14,
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x65645072),
-      ACE_NTOHL (0x6f66696c),
+            14,
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x65645072), 
+      ACE_NTOHL (0x6f66696c), 
       ACE_NTOHL (0x65000000),  // name = TaggedProfile
       2, // member count
-      4,
+            4,
       ACE_NTOHL (0x74616700),  // name = tag
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x50726f66),
-        ACE_NTOHL (0x696c6549),
-        ACE_NTOHL (0x643a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x50726f66), 
+        ACE_NTOHL (0x696c6549), 
+        ACE_NTOHL (0x643a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-        10,
-        ACE_NTOHL (0x50726f66),
-        ACE_NTOHL (0x696c6549),
+                10,
+        ACE_NTOHL (0x50726f66), 
+        ACE_NTOHL (0x696c6549), 
         ACE_NTOHL (0x64000000),  // name = ProfileId
-        CORBA::tk_ulong,
+                CORBA::tk_ulong,
 
 
       13,
-      ACE_NTOHL (0x70726f66),
-      ACE_NTOHL (0x696c655f),
-      ACE_NTOHL (0x64617461),
+      ACE_NTOHL (0x70726f66), 
+      ACE_NTOHL (0x696c655f), 
+      ACE_NTOHL (0x64617461), 
       ACE_NTOHL (0x0),  // name = profile_data
-      CORBA::tk_sequence, // typecode kind
+            CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_octet,
@@ -293,15 +327,24 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_IOR (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IOR, &_tc_TAO_tc_IOP_IOR)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IOR,
+    &_tc_TAO_tc_IOP_IOR
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void IOP::IOR::_tao_any_destructor (void *_tao_void_pointer)
 {
   IOR *tmp = ACE_static_cast (IOR*, _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)
 
@@ -313,18 +356,23 @@ IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_allocate_buff
 {
   IOP::TaggedProfile* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    IOP::TaggedProfile *old = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (old);
-
-  }
+    {
+      IOP::TaggedProfile *old =
+        ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -332,89 +380,110 @@ void
 IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  IOP::TaggedProfile *tmp = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  IOP::TaggedProfile *tmp =
+    ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_);
   _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) // Dtor.
+IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_)
 #define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // IOP::IOR::_tao_seq_TaggedProfile
 // *************************************************************
 
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (void)
 {}
-IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max) // uses max size
-  :
+
+IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::TaggedProfile>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedProfile *buffer, CORBA::Boolean release)
-  :
+
+IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IOP::TaggedProfile *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::TaggedProfile>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &seq) // copy ctor
-  :
+
+IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::TaggedProfile>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 IOP::IOR::_tao_seq_TaggedProfile::~_tao_seq_TaggedProfile (void) // dtor
 {}
+
 void IOP::IOR::_tao_seq_TaggedProfile::_tao_any_destructor (void *_tao_void_pointer)
 {
   _tao_seq_TaggedProfile *tmp = ACE_static_cast (_tao_seq_TaggedProfile*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_ComponentId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6d70),
-  ACE_NTOHL (0x6f6e656e),
-  ACE_NTOHL (0x7449643a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x7449643a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-  12,
-  ACE_NTOHL (0x436f6d70),
-  ACE_NTOHL (0x6f6e656e),
+    12,
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
   ACE_NTOHL (0x74496400),  // name = ComponentId
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
 };
 
@@ -428,55 +497,62 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ComponentId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ComponentId, &_tc_TAO_tc_IOP_ComponentId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ComponentId,
+    &_tc_TAO_tc_IOP_ComponentId
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_TaggedComponent[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-  16,
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6d706f6e),
+    16,
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
   ACE_NTOHL (0x656e7400),  // name = TaggedComponent
   2, // member count
-  4,
+    4,
   ACE_NTOHL (0x74616700),  // name = tag
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x436f6d70),
-    ACE_NTOHL (0x6f6e656e),
-    ACE_NTOHL (0x7449643a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x436f6d70), 
+    ACE_NTOHL (0x6f6e656e), 
+    ACE_NTOHL (0x7449643a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-    12,
-    ACE_NTOHL (0x436f6d70),
-    ACE_NTOHL (0x6f6e656e),
+        12,
+    ACE_NTOHL (0x436f6d70), 
+    ACE_NTOHL (0x6f6e656e), 
     ACE_NTOHL (0x74496400),  // name = ComponentId
-    CORBA::tk_ulong,
+        CORBA::tk_ulong,
 
 
   15,
-  ACE_NTOHL (0x636f6d70),
-  ACE_NTOHL (0x6f6e656e),
-  ACE_NTOHL (0x745f6461),
+  ACE_NTOHL (0x636f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x745f6461), 
   ACE_NTOHL (0x74610000),  // name = component_data
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
@@ -495,63 +571,89 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_TaggedComponent, &_tc_TAO_tc_IOP_TaggedComponent)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TaggedComponent,
+    &_tc_TAO_tc_IOP_TaggedComponent
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void IOP::TaggedComponent::_tao_any_destructor (void *_tao_void_pointer)
 {
   TaggedComponent *tmp = ACE_static_cast (TaggedComponent*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CS_)
 #define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // IOP::TaggedComponent::_tao_seq_Octet
 // *************************************************************
 
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
-IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  :
+
+IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+
+IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Octet *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  :
+
+IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 IOP::TaggedComponent::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
 {}
+
 void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer)
 {
   _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// 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)
 
@@ -563,18 +665,23 @@ IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_allocate_buffer (COR
 {
   IOP::TaggedComponent* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (old);
-
-  }
+    {
+      IOP::TaggedComponent *old =
+        ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -582,145 +689,166 @@ void
 IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  IOP::TaggedComponent *tmp =
+    ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
   _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) // Dtor.
+IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_)
 #define _IOP_MULTIPLECOMPONENTPROFILE_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // IOP::MultipleComponentProfile
 // *************************************************************
 
 IOP::MultipleComponentProfile::MultipleComponentProfile (void)
 {}
-IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max) // uses max size
-  :
+
+IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  :
+
+IOP::MultipleComponentProfile::MultipleComponentProfile (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IOP::TaggedComponent *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-IOP::MultipleComponentProfile::MultipleComponentProfile (const MultipleComponentProfile &seq) // copy ctor
-  :
+
+IOP::MultipleComponentProfile::MultipleComponentProfile (const MultipleComponentProfile &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 IOP::MultipleComponentProfile::~MultipleComponentProfile (void) // dtor
 {}
+
 void IOP::MultipleComponentProfile::_tao_any_destructor (void *_tao_void_pointer)
 {
   MultipleComponentProfile *tmp = ACE_static_cast (MultipleComponentProfile*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x4d756c74),
-  ACE_NTOHL (0x69706c65),
-  ACE_NTOHL (0x436f6d70),
-  ACE_NTOHL (0x6f6e656e),
-  ACE_NTOHL (0x7450726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x69706c65), 
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x7450726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/MultipleComponentProfile:1.0
-  25,
-  ACE_NTOHL (0x4d756c74),
-  ACE_NTOHL (0x69706c65),
-  ACE_NTOHL (0x436f6d70),
-  ACE_NTOHL (0x6f6e656e),
-  ACE_NTOHL (0x7450726f),
-  ACE_NTOHL (0x66696c65),
+    25,
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x69706c65), 
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x7450726f), 
+  ACE_NTOHL (0x66696c65), 
   ACE_NTOHL (0x0),  // name = MultipleComponentProfile
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x6564436f),
-      ACE_NTOHL (0x6d706f6e),
-      ACE_NTOHL (0x656e743a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e743a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-      16,
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x6564436f),
-      ACE_NTOHL (0x6d706f6e),
+            16,
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
       ACE_NTOHL (0x656e7400),  // name = TaggedComponent
       2, // member count
-      4,
+            4,
       ACE_NTOHL (0x74616700),  // name = tag
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x436f6d70),
-        ACE_NTOHL (0x6f6e656e),
-        ACE_NTOHL (0x7449643a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x7449643a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-        12,
-        ACE_NTOHL (0x436f6d70),
-        ACE_NTOHL (0x6f6e656e),
+                12,
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
         ACE_NTOHL (0x74496400),  // name = ComponentId
-        CORBA::tk_ulong,
+                CORBA::tk_ulong,
 
 
       15,
-      ACE_NTOHL (0x636f6d70),
-      ACE_NTOHL (0x6f6e656e),
-      ACE_NTOHL (0x745f6461),
+      ACE_NTOHL (0x636f6d70), 
+      ACE_NTOHL (0x6f6e656e), 
+      ACE_NTOHL (0x745f6461), 
       ACE_NTOHL (0x74610000),  // name = component_data
-      CORBA::tk_sequence, // typecode kind
+            CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_octet,
@@ -742,9 +870,15 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_MultipleComponentProfile, &_tc_TAO_tc_IOP_MultipleComponentProfile)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_MultipleComponentProfile,
+    &_tc_TAO_tc_IOP_MultipleComponentProfile
+  )
 TAO_NAMESPACE_END
 
+// 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)
 
@@ -756,18 +890,23 @@ IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_allocate_buffer (CORBA::U
 {
   IOP::TaggedComponent* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (old);
-
-  }
+    {
+      IOP::TaggedComponent *old =
+        ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -775,141 +914,162 @@ void
 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  IOP::TaggedComponent *tmp =
+    ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
   _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) // Dtor.
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_)
 #define _IOP_TAGGEDCOMPONENTLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // IOP::TaggedComponentList
 // *************************************************************
 
 IOP::TaggedComponentList::TaggedComponentList (void)
 {}
-IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max) // uses max size
-  :
+
+IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_TaggedComponentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  :
+
+IOP::TaggedComponentList::TaggedComponentList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IOP::TaggedComponent *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_TaggedComponentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-IOP::TaggedComponentList::TaggedComponentList (const TaggedComponentList &seq) // copy ctor
-  :
+
+IOP::TaggedComponentList::TaggedComponentList (const TaggedComponentList &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_TaggedComponentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 IOP::TaggedComponentList::~TaggedComponentList (void) // dtor
 {}
+
 void IOP::TaggedComponentList::_tao_any_destructor (void *_tao_void_pointer)
 {
   TaggedComponentList *tmp = ACE_static_cast (TaggedComponentList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_TaggedComponentList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e744c),
-  ACE_NTOHL (0x6973743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e744c), 
+  ACE_NTOHL (0x6973743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponentList:1.0
-  20,
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e744c),
+    20,
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e744c), 
   ACE_NTOHL (0x69737400),  // name = TaggedComponentList
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x6564436f),
-      ACE_NTOHL (0x6d706f6e),
-      ACE_NTOHL (0x656e743a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e743a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-      16,
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x6564436f),
-      ACE_NTOHL (0x6d706f6e),
+            16,
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
       ACE_NTOHL (0x656e7400),  // name = TaggedComponent
       2, // member count
-      4,
+            4,
       ACE_NTOHL (0x74616700),  // name = tag
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x436f6d70),
-        ACE_NTOHL (0x6f6e656e),
-        ACE_NTOHL (0x7449643a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x7449643a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-        12,
-        ACE_NTOHL (0x436f6d70),
-        ACE_NTOHL (0x6f6e656e),
+                12,
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
         ACE_NTOHL (0x74496400),  // name = ComponentId
-        CORBA::tk_ulong,
+                CORBA::tk_ulong,
 
 
       15,
-      ACE_NTOHL (0x636f6d70),
-      ACE_NTOHL (0x6f6e656e),
-      ACE_NTOHL (0x745f6461),
+      ACE_NTOHL (0x636f6d70), 
+      ACE_NTOHL (0x6f6e656e), 
+      ACE_NTOHL (0x745f6461), 
       ACE_NTOHL (0x74610000),  // name = component_data
-      CORBA::tk_sequence, // typecode kind
+            CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_octet,
@@ -931,9 +1091,15 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_TaggedComponentList, &_tc_TAO_tc_IOP_TaggedComponentList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TaggedComponentList,
+    &_tc_TAO_tc_IOP_TaggedComponentList
+  )
 TAO_NAMESPACE_END
 
+// 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)
 
@@ -945,18 +1111,23 @@ IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_allocate_buffer (CORBA::UL
 {
   IOP::TaggedComponent* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (old);
-
-  }
+    {
+      IOP::TaggedComponent *old =
+        ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -964,141 +1135,162 @@ void
 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  IOP::TaggedComponent *tmp =
+    ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
   _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void) // Dtor.
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_)
 #define _IOP_TAGGEDCOMPONENTSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // IOP::TaggedComponentSeq
 // *************************************************************
 
 IOP::TaggedComponentSeq::TaggedComponentSeq (void)
 {}
-IOP::TaggedComponentSeq::TaggedComponentSeq (CORBA::ULong max) // uses max size
-  :
+
+IOP::TaggedComponentSeq::TaggedComponentSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-IOP::TaggedComponentSeq::TaggedComponentSeq (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  :
+
+IOP::TaggedComponentSeq::TaggedComponentSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IOP::TaggedComponent *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-IOP::TaggedComponentSeq::TaggedComponentSeq (const TaggedComponentSeq &seq) // copy ctor
-  :
+
+IOP::TaggedComponentSeq::TaggedComponentSeq (const TaggedComponentSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 IOP::TaggedComponentSeq::~TaggedComponentSeq (void) // dtor
 {}
+
 void IOP::TaggedComponentSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
   TaggedComponentSeq *tmp = ACE_static_cast (TaggedComponentSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7453),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7453), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/TaggedComponentSeq:1.0
-  19,
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7453),
+    19,
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7453), 
   ACE_NTOHL (0x65710000),  // name = TaggedComponentSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x6564436f),
-      ACE_NTOHL (0x6d706f6e),
-      ACE_NTOHL (0x656e743a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e743a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-      16,
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x6564436f),
-      ACE_NTOHL (0x6d706f6e),
+            16,
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
       ACE_NTOHL (0x656e7400),  // name = TaggedComponent
       2, // member count
-      4,
+            4,
       ACE_NTOHL (0x74616700),  // name = tag
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x436f6d70),
-        ACE_NTOHL (0x6f6e656e),
-        ACE_NTOHL (0x7449643a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x7449643a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-        12,
-        ACE_NTOHL (0x436f6d70),
-        ACE_NTOHL (0x6f6e656e),
+                12,
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
         ACE_NTOHL (0x74496400),  // name = ComponentId
-        CORBA::tk_ulong,
+                CORBA::tk_ulong,
 
 
       15,
-      ACE_NTOHL (0x636f6d70),
-      ACE_NTOHL (0x6f6e656e),
-      ACE_NTOHL (0x745f6461),
+      ACE_NTOHL (0x636f6d70), 
+      ACE_NTOHL (0x6f6e656e), 
+      ACE_NTOHL (0x745f6461), 
       ACE_NTOHL (0x74610000),  // name = component_data
-      CORBA::tk_sequence, // typecode kind
+            CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_octet,
@@ -1120,66 +1312,33 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentSeq (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_TaggedComponentSeq, &_tc_TAO_tc_IOP_TaggedComponentSeq)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TaggedComponentSeq,
+    &_tc_TAO_tc_IOP_TaggedComponentSeq
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ORB_TYPE, 0U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CODE_SETS, 1U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ALTERNATE_IIOP_ADDRESS, 3U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_COMPLETE_OBJECT_KEY, 5U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ENDPOINT_ID_POSITION, 6U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_LOCATION_POLICY, 12U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_STRING_BINDING, 100U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_BINDING_NAME, 101U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_NO_PIPES, 102U)
-TAO_NAMESPACE_END
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_ServiceId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636549),
-  ACE_NTOHL (0x643a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636549), 
+  ACE_NTOHL (0x643a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-  10,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636549),
+    10,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636549), 
   ACE_NTOHL (0x64000000),  // name = ServiceId
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
 };
 
@@ -1193,57 +1352,64 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServiceId, &_tc_TAO_tc_IOP_ServiceId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceId,
+    &_tc_TAO_tc_IOP_ServiceId
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_ServiceContext[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636543),
-  ACE_NTOHL (0x6f6e7465),
-  ACE_NTOHL (0x78743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636543), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
-  15,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636543),
-  ACE_NTOHL (0x6f6e7465),
+    15,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636543), 
+  ACE_NTOHL (0x6f6e7465), 
   ACE_NTOHL (0x78740000),  // name = ServiceContext
   2, // member count
-  11,
-  ACE_NTOHL (0x636f6e74),
-  ACE_NTOHL (0x6578745f),
+    11,
+  ACE_NTOHL (0x636f6e74), 
+  ACE_NTOHL (0x6578745f), 
   ACE_NTOHL (0x69640000),  // name = context_id
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636549),
-    ACE_NTOHL (0x643a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x53657276), 
+    ACE_NTOHL (0x69636549), 
+    ACE_NTOHL (0x643a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-    10,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636549),
+        10,
+    ACE_NTOHL (0x53657276), 
+    ACE_NTOHL (0x69636549), 
     ACE_NTOHL (0x64000000),  // name = ServiceId
-    CORBA::tk_ulong,
+        CORBA::tk_ulong,
 
 
   13,
-  ACE_NTOHL (0x636f6e74),
-  ACE_NTOHL (0x6578745f),
-  ACE_NTOHL (0x64617461),
+  ACE_NTOHL (0x636f6e74), 
+  ACE_NTOHL (0x6578745f), 
+  ACE_NTOHL (0x64617461), 
   ACE_NTOHL (0x0),  // name = context_data
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
@@ -1262,63 +1428,89 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServiceContext, &_tc_TAO_tc_IOP_ServiceContext)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceContext,
+    &_tc_TAO_tc_IOP_ServiceContext
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void IOP::ServiceContext::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServiceContext *tmp = ACE_static_cast (ServiceContext*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CS_)
 #define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // IOP::ServiceContext::_tao_seq_Octet
 // *************************************************************
 
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
-IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  :
+
+IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+
+IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Octet *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  :
+
+IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 IOP::ServiceContext::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
 {}
+
 void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer)
 {
   _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// 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)
 
@@ -1330,18 +1522,23 @@ IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_allocate_buffer (CORBA::UL
 {
   IOP::ServiceContext* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    IOP::ServiceContext *old = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (old);
-
-  }
+    {
+      IOP::ServiceContext *old =
+        ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -1349,143 +1546,164 @@ void
 IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  IOP::ServiceContext *tmp = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  IOP::ServiceContext *tmp =
+    ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_);
   _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) // Dtor.
+IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_SERVICECONTEXTLIST_CS_)
 #define _IOP_SERVICECONTEXTLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // IOP::ServiceContextList
 // *************************************************************
 
 IOP::ServiceContextList::ServiceContextList (void)
 {}
-IOP::ServiceContextList::ServiceContextList (CORBA::ULong max) // uses max size
-  :
+
+IOP::ServiceContextList::ServiceContextList (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_ServiceContextList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::ServiceContext>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-IOP::ServiceContextList::ServiceContextList (CORBA::ULong max, CORBA::ULong length, IOP::ServiceContext *buffer, CORBA::Boolean release)
-  :
+
+IOP::ServiceContextList::ServiceContextList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IOP::ServiceContext *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_ServiceContextList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::ServiceContext>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-IOP::ServiceContextList::ServiceContextList (const ServiceContextList &seq) // copy ctor
-  :
+
+IOP::ServiceContextList::ServiceContextList (const ServiceContextList &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_IOP_ServiceContextList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<IOP::ServiceContext>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 IOP::ServiceContextList::~ServiceContextList (void) // dtor
 {}
+
 void IOP::ServiceContextList::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServiceContextList *tmp = ACE_static_cast (ServiceContextList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_ServiceContextList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636543),
-  ACE_NTOHL (0x6f6e7465),
-  ACE_NTOHL (0x78744c69),
-  ACE_NTOHL (0x73743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636543), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78744c69), 
+  ACE_NTOHL (0x73743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContextList:1.0
-  19,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636543),
-  ACE_NTOHL (0x6f6e7465),
-  ACE_NTOHL (0x78744c69),
+    19,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636543), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78744c69), 
   ACE_NTOHL (0x73740000),  // name = ServiceContextList
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   208, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     192, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x53657276),
-      ACE_NTOHL (0x69636543),
-      ACE_NTOHL (0x6f6e7465),
-      ACE_NTOHL (0x78743a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x69636543), 
+      ACE_NTOHL (0x6f6e7465), 
+      ACE_NTOHL (0x78743a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
-      15,
-      ACE_NTOHL (0x53657276),
-      ACE_NTOHL (0x69636543),
-      ACE_NTOHL (0x6f6e7465),
+            15,
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x69636543), 
+      ACE_NTOHL (0x6f6e7465), 
       ACE_NTOHL (0x78740000),  // name = ServiceContext
       2, // member count
-      11,
-      ACE_NTOHL (0x636f6e74),
-      ACE_NTOHL (0x6578745f),
+            11,
+      ACE_NTOHL (0x636f6e74), 
+      ACE_NTOHL (0x6578745f), 
       ACE_NTOHL (0x69640000),  // name = context_id
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x53657276),
-        ACE_NTOHL (0x69636549),
-        ACE_NTOHL (0x643a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x53657276), 
+        ACE_NTOHL (0x69636549), 
+        ACE_NTOHL (0x643a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-        10,
-        ACE_NTOHL (0x53657276),
-        ACE_NTOHL (0x69636549),
+                10,
+        ACE_NTOHL (0x53657276), 
+        ACE_NTOHL (0x69636549), 
         ACE_NTOHL (0x64000000),  // name = ServiceId
-        CORBA::tk_ulong,
+                CORBA::tk_ulong,
 
 
       13,
-      ACE_NTOHL (0x636f6e74),
-      ACE_NTOHL (0x6578745f),
-      ACE_NTOHL (0x64617461),
+      ACE_NTOHL (0x636f6e74), 
+      ACE_NTOHL (0x6578745f), 
+      ACE_NTOHL (0x64617461), 
       ACE_NTOHL (0x0),  // name = context_data
-      CORBA::tk_sequence, // typecode kind
+            CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_octet,
@@ -1507,88 +1725,15 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServiceContextList, &_tc_TAO_tc_IOP_ServiceContextList)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TransactionService, 0U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, CodeSets, 1U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassCheck, 2U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassInfo, 3U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, LogicalThreadId, 4U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, BI_DIR_IIOP, 5U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SendingContextRunTime, 6U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 7U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, UnknownExceptionInfo, 9U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, RTCorbaPriority, 10U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, RTCorbaPriorityRange, 11U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_GROUP, 27U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_PRIMARY, 28U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_FT_HEARTBEAT_ENABLED, 29U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_GROUP_VERSION, 12U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_REQUEST, 13U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_UIPMC, 1413566220U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_GROUP, 1413566211U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_GROUP_IIOP, 1413566212U)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceContextList,
+    &_tc_TAO_tc_IOP_ServiceContextList
+  )
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int IOP::Codec::_tao_class_id = 0;
 
@@ -1635,13 +1780,23 @@ tao_IOP_Codec_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_IOP_Codec_marshal (
+    IOP::Codec_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // IOP::Codec_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-IOP::Codec_var::Codec_var (void) // default constructor
+IOP::Codec_var::Codec_var (void)
   : ptr_ (Codec::_nil ())
 {}
 
@@ -1651,12 +1806,12 @@ IOP::Codec_var::ptr (void) const
   return this->ptr_;
 }
 
-IOP::Codec_var::Codec_var (const ::IOP::Codec_var &p) // copy constructor
+IOP::Codec_var::Codec_var (const ::IOP::Codec_var &p)
   : TAO_Base_var (),
     ptr_ (Codec::_duplicate (p.ptr ()))
 {}
 
-IOP::Codec_var::~Codec_var (void) // destructor
+IOP::Codec_var::~Codec_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1685,7 +1840,7 @@ IOP::Codec_var::operator const ::IOP::Codec_ptr &() const // cast
   return this->ptr_;
 }
 
-IOP::Codec_var::operator ::IOP::Codec_ptr &() // cast
+IOP::Codec_var::operator ::IOP::Codec_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1760,10 +1915,11 @@ IOP::Codec_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // IOP::Codec_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 IOP::Codec_out::Codec_out (Codec_ptr &p)
@@ -1772,14 +1928,14 @@ IOP::Codec_out::Codec_out (Codec_ptr &p)
   this->ptr_ = ::IOP::Codec::_nil ();
 }
 
-IOP::Codec_out::Codec_out (Codec_var &p) // constructor from _var
+IOP::Codec_out::Codec_out (Codec_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::IOP::Codec::_nil ();
 }
 
-IOP::Codec_out::Codec_out (const ::IOP::Codec_out &p) // copy constructor
+IOP::Codec_out::Codec_out (const ::IOP::Codec_out &p)
   : ptr_ (ACE_const_cast (Codec_out &, p).ptr_)
 {}
 
@@ -1810,7 +1966,7 @@ IOP::Codec_out::operator ::IOP::Codec_ptr &() // cast
 }
 
 ::IOP::Codec_ptr &
-IOP::Codec_out::ptr (void) // ptr
+IOP::Codec_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1821,9 +1977,8 @@ IOP::Codec_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:198
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 IOP::Codec::Codec (void)
 {}
@@ -1831,13 +1986,15 @@ IOP::Codec::Codec (void)
 IOP::Codec::~Codec (void)
 {}
 
-void IOP::Codec::_tao_any_destructor (void *_tao_void_pointer)
+void 
+IOP::Codec::_tao_any_destructor (void *_tao_void_pointer)
 {
-  Codec *tmp = ACE_static_cast (Codec*, _tao_void_pointer);
+  Codec *tmp = ACE_static_cast (Codec *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IOP::Codec_ptr IOP::Codec::_narrow (
+IOP::Codec_ptr
+IOP::Codec::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1845,50 +2002,68 @@ IOP::Codec_ptr IOP::Codec::_narrow (
   return Codec::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IOP::Codec_ptr
+IOP::Codec_ptr 
 IOP::Codec::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return Codec::_nil ();
+    {
+      return Codec::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Codec_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Codec::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Codec::_tao_class_id
+                )
+            )
         );
 }
 
 IOP::Codec_ptr
 IOP::Codec::_duplicate (Codec_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *IOP::Codec::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::IOP, Codec)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::IOP, Codec)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1897,26 +2072,27 @@ const char* IOP::Codec::_interface_repository_id (void) const
   return "IDL:omg.org/IOP/Codec:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void)
-  : CORBA::UserException ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
-                          "InvalidTypeForEncoding")
+  : CORBA::UserException (
+        "IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
+        "InvalidTypeForEncoding"
+      )
 {
 }
 
-// Destructor - all members are of self managing types.
 IOP::Codec::InvalidTypeForEncoding::~InvalidTypeForEncoding (void)
 {
 }
 
-// Copy constructor.
 IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
   : CORBA::UserException (_tao_excp._rep_id (),
                           _tao_excp._name ())
 {
 }
 
-// Assignment operator.
 IOP::Codec::InvalidTypeForEncoding&
 IOP::Codec::InvalidTypeForEncoding::operator= (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
 {
@@ -1931,11 +2107,11 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor (void *_tao_void_po
 }
 
 IOP::Codec::InvalidTypeForEncoding *
-IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *exc)
+IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InvalidTypeForEncoding *, exc);
+      return ACE_dynamic_cast (InvalidTypeForEncoding *, _tao_excp);
     }
   else
     {
@@ -1962,7 +2138,7 @@ IOP::Codec::InvalidTypeForEncoding::_tao_duplicate (void) const
   return result;
 }
 
-void IOP::Codec::InvalidTypeForEncoding::_raise ()
+void IOP::Codec::InvalidTypeForEncoding::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -1983,32 +2159,41 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_type (void) const
+{
+  return ::IOP::Codec::_tc_InvalidTypeForEncoding;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_Codec_InvalidTypeForEncoding[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x632f496e),
-  ACE_NTOHL (0x76616c69),
-  ACE_NTOHL (0x64547970),
-  ACE_NTOHL (0x65466f72),
-  ACE_NTOHL (0x456e636f),
-  ACE_NTOHL (0x64696e67),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x632f496e), 
+  ACE_NTOHL (0x76616c69), 
+  ACE_NTOHL (0x64547970), 
+  ACE_NTOHL (0x65466f72), 
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0
-  23,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696454),
-  ACE_NTOHL (0x79706546),
-  ACE_NTOHL (0x6f72456e),
-  ACE_NTOHL (0x636f6469),
+    23,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696454), 
+  ACE_NTOHL (0x79706546), 
+  ACE_NTOHL (0x6f72456e), 
+  ACE_NTOHL (0x636f6469), 
   ACE_NTOHL (0x6e670000),  // name = InvalidTypeForEncoding
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding (
     CORBA::tk_except,
@@ -2021,33 +2206,29 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding (
 ::CORBA::TypeCode_ptr IOP::Codec::_tc_InvalidTypeForEncoding =
   &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding;
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_type (void) const
-{
-  return ::IOP::Codec::_tc_InvalidTypeForEncoding;
-}
-
-// Default constructor.
 IOP::Codec::FormatMismatch::FormatMismatch (void)
-  : CORBA::UserException ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
-                          "FormatMismatch")
+  : CORBA::UserException (
+        "IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
+        "FormatMismatch"
+      )
 {
 }
 
-// Destructor - all members are of self managing types.
 IOP::Codec::FormatMismatch::~FormatMismatch (void)
 {
 }
 
-// Copy constructor.
 IOP::Codec::FormatMismatch::FormatMismatch (const ::IOP::Codec::FormatMismatch &_tao_excp)
-  : CORBA::UserException (_tao_excp._rep_id (),
-                         _tao_excp._name ())
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
-// Assignment operator.
 IOP::Codec::FormatMismatch&
 IOP::Codec::FormatMismatch::operator= (const ::IOP::Codec::FormatMismatch &_tao_excp)
 {
@@ -2062,11 +2243,11 @@ void IOP::Codec::FormatMismatch::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IOP::Codec::FormatMismatch *
-IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *exc)
+IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (FormatMismatch *, exc);
+      return ACE_dynamic_cast (FormatMismatch *, _tao_excp);
     }
   else
     {
@@ -2093,7 +2274,7 @@ IOP::Codec::FormatMismatch::_tao_duplicate (void) const
   return result;
 }
 
-void IOP::Codec::FormatMismatch::_raise ()
+void IOP::Codec::FormatMismatch::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -2114,28 +2295,37 @@ void IOP::Codec::FormatMismatch::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const
+{
+  return ::IOP::Codec::_tc_FormatMismatch;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_Codec_FormatMismatch[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x632f466f),
-  ACE_NTOHL (0x726d6174),
-  ACE_NTOHL (0x4d69736d),
-  ACE_NTOHL (0x61746368),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x632f466f), 
+  ACE_NTOHL (0x726d6174), 
+  ACE_NTOHL (0x4d69736d), 
+  ACE_NTOHL (0x61746368), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/FormatMismatch:1.0
-  15,
-  ACE_NTOHL (0x466f726d),
-  ACE_NTOHL (0x61744d69),
-  ACE_NTOHL (0x736d6174),
+    15,
+  ACE_NTOHL (0x466f726d), 
+  ACE_NTOHL (0x61744d69), 
+  ACE_NTOHL (0x736d6174), 
   ACE_NTOHL (0x63680000),  // name = FormatMismatch
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch (
     CORBA::tk_except,
@@ -2148,33 +2338,29 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch (
 ::CORBA::TypeCode_ptr IOP::Codec::_tc_FormatMismatch =
   &_tc_TAO_tc_IOP_Codec_FormatMismatch;
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const
-{
-  return ::IOP::Codec::_tc_FormatMismatch;
-}
-
-// Default constructor.
 IOP::Codec::TypeMismatch::TypeMismatch (void)
-  : CORBA::UserException ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
-                          "TypeMismatch")
+  : CORBA::UserException (
+        "IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
+        "TypeMismatch"
+      )
 {
 }
 
-// Destructor - all members are of self managing types.
 IOP::Codec::TypeMismatch::~TypeMismatch (void)
 {
 }
 
-// Copy constructor.
 IOP::Codec::TypeMismatch::TypeMismatch (const ::IOP::Codec::TypeMismatch &_tao_excp)
-  : CORBA::UserException (_tao_excp._rep_id (),
-                          _tao_excp._name ())
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
-// Assignment operator.
 IOP::Codec::TypeMismatch&
 IOP::Codec::TypeMismatch::operator= (const ::IOP::Codec::TypeMismatch &_tao_excp)
 {
@@ -2189,11 +2375,11 @@ void IOP::Codec::TypeMismatch::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IOP::Codec::TypeMismatch *
-IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *exc)
+IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (TypeMismatch *, exc);
+      return ACE_dynamic_cast (TypeMismatch *, _tao_excp);
     }
   else
     {
@@ -2220,7 +2406,7 @@ IOP::Codec::TypeMismatch::_tao_duplicate (void) const
   return result;
 }
 
-void IOP::Codec::TypeMismatch::_raise ()
+void IOP::Codec::TypeMismatch::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -2241,27 +2427,36 @@ void IOP::Codec::TypeMismatch::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_type (void) const
+{
+  return ::IOP::Codec::_tc_TypeMismatch;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x632f5479),
-  ACE_NTOHL (0x70654d69),
-  ACE_NTOHL (0x736d6174),
-  ACE_NTOHL (0x63683a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x632f5479), 
+  ACE_NTOHL (0x70654d69), 
+  ACE_NTOHL (0x736d6174), 
+  ACE_NTOHL (0x63683a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/Codec/TypeMismatch:1.0
-  13,
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x4d69736d),
-  ACE_NTOHL (0x61746368),
+    13,
+  ACE_NTOHL (0x54797065), 
+  ACE_NTOHL (0x4d69736d), 
+  ACE_NTOHL (0x61746368), 
   ACE_NTOHL (0x0),  // name = TypeMismatch
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch (
     CORBA::tk_except,
@@ -2274,28 +2469,24 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch (
 ::CORBA::TypeCode_ptr IOP::Codec::_tc_TypeMismatch =
   &_tc_TAO_tc_IOP_Codec_TypeMismatch;
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_type (void) const
-{
-  return ::IOP::Codec::_tc_TypeMismatch;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_IOP_Codec[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   26,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x633a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x633a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/Codec:1.0
-  6,
-  ACE_NTOHL (0x436f6465),
+    6,
+  ACE_NTOHL (0x436f6465), 
   ACE_NTOHL (0x63000000),  // name = Codec
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_IOP_Codec (
     CORBA::tk_objref,
@@ -2307,28 +2498,35 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Codec, &_tc_TAO_tc_IOP_Codec)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Codec,
+    &_tc_TAO_tc_IOP_Codec
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_EncodingFormat[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x456e636f),
-  ACE_NTOHL (0x64696e67),
-  ACE_NTOHL (0x466f726d),
-  ACE_NTOHL (0x61743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x466f726d), 
+  ACE_NTOHL (0x61743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
-  15,
-  ACE_NTOHL (0x456e636f),
-  ACE_NTOHL (0x64696e67),
-  ACE_NTOHL (0x466f726d),
+    15,
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x466f726d), 
   ACE_NTOHL (0x61740000),  // name = EncodingFormat
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -2342,67 +2540,70 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_EncodingFormat, &_tc_TAO_tc_IOP_EncodingFormat)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_EncodingFormat,
+    &_tc_TAO_tc_IOP_EncodingFormat
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ENCODING_CDR_ENCAPS, 0)
-TAO_NAMESPACE_END
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_Encoding[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x456e636f),
-  ACE_NTOHL (0x64696e67),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
-  9,
-  ACE_NTOHL (0x456e636f),
-  ACE_NTOHL (0x64696e67),
+    9,
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
   ACE_NTOHL (0x0),  // name = Encoding
   3, // member count
-  7,
-  ACE_NTOHL (0x666f726d),
+    7,
+  ACE_NTOHL (0x666f726d), 
   ACE_NTOHL (0x61740000),  // name = format
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x456e636f),
-    ACE_NTOHL (0x64696e67),
-    ACE_NTOHL (0x466f726d),
-    ACE_NTOHL (0x61743a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x456e636f), 
+    ACE_NTOHL (0x64696e67), 
+    ACE_NTOHL (0x466f726d), 
+    ACE_NTOHL (0x61743a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
-    15,
-    ACE_NTOHL (0x456e636f),
-    ACE_NTOHL (0x64696e67),
-    ACE_NTOHL (0x466f726d),
+        15,
+    ACE_NTOHL (0x456e636f), 
+    ACE_NTOHL (0x64696e67), 
+    ACE_NTOHL (0x466f726d), 
     ACE_NTOHL (0x61740000),  // name = EncodingFormat
-    CORBA::tk_short,
+        CORBA::tk_short,
 
 
   14,
-  ACE_NTOHL (0x6d616a6f),
-  ACE_NTOHL (0x725f7665),
-  ACE_NTOHL (0x7273696f),
+  ACE_NTOHL (0x6d616a6f), 
+  ACE_NTOHL (0x725f7665), 
+  ACE_NTOHL (0x7273696f), 
   ACE_NTOHL (0x6e000000),  // name = major_version
-  CORBA::tk_octet,
+    CORBA::tk_octet,
 
   14,
-  ACE_NTOHL (0x6d696e6f),
-  ACE_NTOHL (0x725f7665),
-  ACE_NTOHL (0x7273696f),
+  ACE_NTOHL (0x6d696e6f), 
+  ACE_NTOHL (0x725f7665), 
+  ACE_NTOHL (0x7273696f), 
   ACE_NTOHL (0x6e000000),  // name = minor_version
-  CORBA::tk_octet,
+    CORBA::tk_octet,
 
 };
 
@@ -2416,18 +2617,24 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Encoding, &_tc_TAO_tc_IOP_Encoding)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Encoding,
+    &_tc_TAO_tc_IOP_Encoding
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void IOP::Encoding::_tao_any_destructor (void *_tao_void_pointer)
 {
   Encoding *tmp = ACE_static_cast (Encoding*, _tao_void_pointer);
   delete tmp;
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int IOP::CodecFactory::_tao_class_id = 0;
 
@@ -2474,13 +2681,23 @@ tao_IOP_CodecFactory_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_IOP_CodecFactory_marshal (
+    IOP::CodecFactory_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // IOP::CodecFactory_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-IOP::CodecFactory_var::CodecFactory_var (void) // default constructor
+IOP::CodecFactory_var::CodecFactory_var (void)
   : ptr_ (CodecFactory::_nil ())
 {}
 
@@ -2490,12 +2707,12 @@ IOP::CodecFactory_var::ptr (void) const
   return this->ptr_;
 }
 
-IOP::CodecFactory_var::CodecFactory_var (const ::IOP::CodecFactory_var &p) // copy constructor
+IOP::CodecFactory_var::CodecFactory_var (const ::IOP::CodecFactory_var &p)
   : TAO_Base_var (),
     ptr_ (CodecFactory::_duplicate (p.ptr ()))
 {}
 
-IOP::CodecFactory_var::~CodecFactory_var (void) // destructor
+IOP::CodecFactory_var::~CodecFactory_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2524,7 +2741,7 @@ IOP::CodecFactory_var::operator const ::IOP::CodecFactory_ptr &() const // cast
   return this->ptr_;
 }
 
-IOP::CodecFactory_var::operator ::IOP::CodecFactory_ptr &() // cast
+IOP::CodecFactory_var::operator ::IOP::CodecFactory_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2599,10 +2816,11 @@ IOP::CodecFactory_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // IOP::CodecFactory_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 IOP::CodecFactory_out::CodecFactory_out (CodecFactory_ptr &p)
@@ -2611,14 +2829,14 @@ IOP::CodecFactory_out::CodecFactory_out (CodecFactory_ptr &p)
   this->ptr_ = ::IOP::CodecFactory::_nil ();
 }
 
-IOP::CodecFactory_out::CodecFactory_out (CodecFactory_var &p) // constructor from _var
+IOP::CodecFactory_out::CodecFactory_out (CodecFactory_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::IOP::CodecFactory::_nil ();
 }
 
-IOP::CodecFactory_out::CodecFactory_out (const ::IOP::CodecFactory_out &p) // copy constructor
+IOP::CodecFactory_out::CodecFactory_out (const ::IOP::CodecFactory_out &p)
   : ptr_ (ACE_const_cast (CodecFactory_out &, p).ptr_)
 {}
 
@@ -2649,7 +2867,7 @@ IOP::CodecFactory_out::operator ::IOP::CodecFactory_ptr &() // cast
 }
 
 ::IOP::CodecFactory_ptr &
-IOP::CodecFactory_out::ptr (void) // ptr
+IOP::CodecFactory_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2660,9 +2878,8 @@ IOP::CodecFactory_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:198
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 IOP::CodecFactory::CodecFactory (void)
 {}
@@ -2670,13 +2887,15 @@ IOP::CodecFactory::CodecFactory (void)
 IOP::CodecFactory::~CodecFactory (void)
 {}
 
-void IOP::CodecFactory::_tao_any_destructor (void *_tao_void_pointer)
+void 
+IOP::CodecFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CodecFactory *tmp = ACE_static_cast (CodecFactory*, _tao_void_pointer);
+  CodecFactory *tmp = ACE_static_cast (CodecFactory *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-IOP::CodecFactory_ptr IOP::CodecFactory::_narrow (
+IOP::CodecFactory_ptr
+IOP::CodecFactory::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2684,50 +2903,68 @@ IOP::CodecFactory_ptr IOP::CodecFactory::_narrow (
   return CodecFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IOP::CodecFactory_ptr
+IOP::CodecFactory_ptr 
 IOP::CodecFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return CodecFactory::_nil ();
+    {
+      return CodecFactory::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           CodecFactory_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &CodecFactory::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &CodecFactory::_tao_class_id
+                )
+            )
         );
 }
 
 IOP::CodecFactory_ptr
 IOP::CodecFactory::_duplicate (CodecFactory_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *IOP::CodecFactory::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::IOP, CodecFactory)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::IOP, CodecFactory)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -2736,26 +2973,29 @@ const char* IOP::CodecFactory::_interface_repository_id (void) const
   return "IDL:omg.org/IOP/CodecFactory:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void)
-  : CORBA::UserException ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
-                          "UnknownEncoding")
+  : CORBA::UserException (
+        "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
+        "UnknownEncoding"
+      )
 {
 }
 
-// Destructor - all members are of self managing types.
 IOP::CodecFactory::UnknownEncoding::~UnknownEncoding (void)
 {
 }
 
-// Copy constructor.
 IOP::CodecFactory::UnknownEncoding::UnknownEncoding (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
-  : CORBA::UserException (_tao_excp._rep_id (),
-                          _tao_excp._name ())
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
-// Assignment operator.
 IOP::CodecFactory::UnknownEncoding&
 IOP::CodecFactory::UnknownEncoding::operator= (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
 {
@@ -2770,11 +3010,11 @@ void IOP::CodecFactory::UnknownEncoding::_tao_any_destructor (void *_tao_void_po
 }
 
 IOP::CodecFactory::UnknownEncoding *
-IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *exc)
+IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (UnknownEncoding *, exc);
+      return ACE_dynamic_cast (UnknownEncoding *, _tao_excp);
     }
   else
     {
@@ -2801,7 +3041,7 @@ IOP::CodecFactory::UnknownEncoding::_tao_duplicate (void) const
   return result;
 }
 
-void IOP::CodecFactory::UnknownEncoding::_raise ()
+void IOP::CodecFactory::UnknownEncoding::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -2822,30 +3062,39 @@ void IOP::CodecFactory::UnknownEncoding::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_type (void) const
+{
+  return ::IOP::CodecFactory::_tc_UnknownEncoding;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_IOP_CodecFactory_UnknownEncoding[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x63466163),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f556e6b),
-  ACE_NTOHL (0x6e6f776e),
-  ACE_NTOHL (0x456e636f),
-  ACE_NTOHL (0x64696e67),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x63466163), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f556e6b), 
+  ACE_NTOHL (0x6e6f776e), 
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0
-  16,
-  ACE_NTOHL (0x556e6b6e),
-  ACE_NTOHL (0x6f776e45),
-  ACE_NTOHL (0x6e636f64),
+    16,
+  ACE_NTOHL (0x556e6b6e), 
+  ACE_NTOHL (0x6f776e45), 
+  ACE_NTOHL (0x6e636f64), 
   ACE_NTOHL (0x696e6700),  // name = UnknownEncoding
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding (
     CORBA::tk_except,
@@ -2858,32 +3107,28 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding (
 ::CORBA::TypeCode_ptr IOP::CodecFactory::_tc_UnknownEncoding =
   &_tc_TAO_tc_IOP_CodecFactory_UnknownEncoding;
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_type (void) const
-{
-  return ::IOP::CodecFactory::_tc_UnknownEncoding;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_IOP_CodecFactory[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x63466163),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x63466163), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory:1.0
-  13,
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x63466163),
-  ACE_NTOHL (0x746f7279),
+    13,
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x63466163), 
+  ACE_NTOHL (0x746f7279), 
   ACE_NTOHL (0x0),  // name = CodecFactory
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory (
     CORBA::tk_objref,
@@ -2895,12 +3140,15 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_CodecFactory, &_tc_TAO_tc_IOP_CodecFactory)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_CodecFactory,
+    &_tc_TAO_tc_IOP_CodecFactory
+  )
 TAO_NAMESPACE_END
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:58
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -2908,16 +3156,12 @@ void operator<<= (
     const IOP::TaggedProfile &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_TaggedProfile,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::TaggedProfile>::insert_copy (
+      _tao_any,
+      IOP::TaggedProfile::_tao_any_destructor,
+      IOP::_tc_TaggedProfile,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -2926,19 +3170,12 @@ void operator<<= (
     IOP::TaggedProfile *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_TaggedProfile,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IOP::TaggedProfile::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::TaggedProfile>::insert (
+      _tao_any,
+      IOP::TaggedProfile::_tao_any_destructor,
+      IOP::_tc_TaggedProfile,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -2959,76 +3196,24 @@ CORBA::Boolean operator>>= (
     const IOP::TaggedProfile *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::_tc_TaggedProfile
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const IOP::TaggedProfile*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        IOP::TaggedProfile *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            IOP::TaggedProfile,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IOP::_tc_TaggedProfile,
-                1,
-                ACE_static_cast (void *, tmp),
-                IOP::TaggedProfile::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IOP::TaggedProfile>::extract (
+        _tao_any,
+        IOP::TaggedProfile::_tao_any_destructor,
+        IOP::_tc_TaggedProfile,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<IOP::TaggedProfile>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<IOP::TaggedProfile>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:58
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -3036,16 +3221,12 @@ void operator<<= (
     const IOP::IOR &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_IOR,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::IOR>::insert_copy (
+      _tao_any,
+      IOP::IOR::_tao_any_destructor,
+      IOP::_tc_IOR,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -3054,19 +3235,12 @@ void operator<<= (
     IOP::IOR *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_IOR,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IOP::IOR::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::IOR>::insert (
+      _tao_any,
+      IOP::IOR::_tao_any_destructor,
+      IOP::_tc_IOR,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -3087,76 +3261,24 @@ CORBA::Boolean operator>>= (
     const IOP::IOR *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::_tc_IOR
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const IOP::IOR*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        IOP::IOR *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            IOP::IOR,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IOP::_tc_IOR,
-                1,
-                ACE_static_cast (void *, tmp),
-                IOP::IOR::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IOP::IOR>::extract (
+        _tao_any,
+        IOP::IOR::_tao_any_destructor,
+        IOP::_tc_IOR,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<IOP::IOR>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<IOP::IOR>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:58
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -3164,16 +3286,12 @@ void operator<<= (
     const IOP::TaggedComponent &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_TaggedComponent,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::TaggedComponent>::insert_copy (
+      _tao_any,
+      IOP::TaggedComponent::_tao_any_destructor,
+      IOP::_tc_TaggedComponent,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -3182,19 +3300,12 @@ void operator<<= (
     IOP::TaggedComponent *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_TaggedComponent,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IOP::TaggedComponent::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::TaggedComponent>::insert (
+      _tao_any,
+      IOP::TaggedComponent::_tao_any_destructor,
+      IOP::_tc_TaggedComponent,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -3215,76 +3326,24 @@ CORBA::Boolean operator>>= (
     const IOP::TaggedComponent *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::_tc_TaggedComponent
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const IOP::TaggedComponent*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        IOP::TaggedComponent *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            IOP::TaggedComponent,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IOP::_tc_TaggedComponent,
-                1,
-                ACE_static_cast (void *, tmp),
-                IOP::TaggedComponent::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IOP::TaggedComponent>::extract (
+        _tao_any,
+        IOP::TaggedComponent::_tao_any_destructor,
+        IOP::_tc_TaggedComponent,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<IOP::TaggedComponent>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<IOP::TaggedComponent>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -3292,16 +3351,12 @@ void operator<<= (
     const IOP::MultipleComponentProfile &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_MultipleComponentProfile,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::insert_copy (
+      _tao_any,
+      IOP::MultipleComponentProfile::_tao_any_destructor,
+      IOP::_tc_MultipleComponentProfile,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -3310,19 +3365,12 @@ void operator<<= (
     IOP::MultipleComponentProfile *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_MultipleComponentProfile,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IOP::MultipleComponentProfile::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::insert (
+      _tao_any,
+      IOP::MultipleComponentProfile::_tao_any_destructor,
+      IOP::_tc_MultipleComponentProfile,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -3331,8 +3379,8 @@ CORBA::Boolean operator>>= (
     IOP::MultipleComponentProfile *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IOP::MultipleComponentProfile*&,
+  return _tao_any >>= ACE_const_cast (
+      const IOP::MultipleComponentProfile *&,
       _tao_elem
     );
 }
@@ -3343,76 +3391,17 @@ CORBA::Boolean operator>>= (
     const IOP::MultipleComponentProfile *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::_tc_MultipleComponentProfile
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IOP::MultipleComponentProfile*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        IOP::MultipleComponentProfile *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IOP::MultipleComponentProfile,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IOP::_tc_MultipleComponentProfile,
-                1,
-                ACE_static_cast (void *, tmp),
-                IOP::MultipleComponentProfile::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::extract (
+        _tao_any,
+        IOP::MultipleComponentProfile::_tao_any_destructor,
+        IOP::_tc_MultipleComponentProfile,
+        _tao_elem
+      );
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -3420,16 +3409,12 @@ void operator<<= (
     const IOP::TaggedComponentList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_TaggedComponentList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::insert_copy (
+      _tao_any,
+      IOP::TaggedComponentList::_tao_any_destructor,
+      IOP::_tc_TaggedComponentList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -3438,19 +3423,12 @@ void operator<<= (
     IOP::TaggedComponentList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_TaggedComponentList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IOP::TaggedComponentList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::insert (
+      _tao_any,
+      IOP::TaggedComponentList::_tao_any_destructor,
+      IOP::_tc_TaggedComponentList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -3459,8 +3437,8 @@ CORBA::Boolean operator>>= (
     IOP::TaggedComponentList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IOP::TaggedComponentList*&,
+  return _tao_any >>= ACE_const_cast (
+      const IOP::TaggedComponentList *&,
       _tao_elem
     );
 }
@@ -3471,76 +3449,17 @@ CORBA::Boolean operator>>= (
     const IOP::TaggedComponentList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::_tc_TaggedComponentList
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IOP::TaggedComponentList*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        IOP::TaggedComponentList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IOP::TaggedComponentList,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IOP::_tc_TaggedComponentList,
-                1,
-                ACE_static_cast (void *, tmp),
-                IOP::TaggedComponentList::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::extract (
+        _tao_any,
+        IOP::TaggedComponentList::_tao_any_destructor,
+        IOP::_tc_TaggedComponentList,
+        _tao_elem
+      );
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -3548,16 +3467,12 @@ void operator<<= (
     const IOP::TaggedComponentSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_TaggedComponentSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::insert_copy (
+      _tao_any,
+      IOP::TaggedComponentSeq::_tao_any_destructor,
+      IOP::_tc_TaggedComponentSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -3566,19 +3481,12 @@ void operator<<= (
     IOP::TaggedComponentSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_TaggedComponentSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IOP::TaggedComponentSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::insert (
+      _tao_any,
+      IOP::TaggedComponentSeq::_tao_any_destructor,
+      IOP::_tc_TaggedComponentSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -3587,8 +3495,8 @@ CORBA::Boolean operator>>= (
     IOP::TaggedComponentSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IOP::TaggedComponentSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const IOP::TaggedComponentSeq *&,
       _tao_elem
     );
 }
@@ -3599,76 +3507,17 @@ CORBA::Boolean operator>>= (
     const IOP::TaggedComponentSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::_tc_TaggedComponentSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IOP::TaggedComponentSeq*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        IOP::TaggedComponentSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IOP::TaggedComponentSeq,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IOP::_tc_TaggedComponentSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                IOP::TaggedComponentSeq::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::extract (
+        _tao_any,
+        IOP::TaggedComponentSeq::_tao_any_destructor,
+        IOP::_tc_TaggedComponentSeq,
+        _tao_elem
+      );
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:58
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -3676,16 +3525,12 @@ void operator<<= (
     const IOP::ServiceContext &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_ServiceContext,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::ServiceContext>::insert_copy (
+      _tao_any,
+      IOP::ServiceContext::_tao_any_destructor,
+      IOP::_tc_ServiceContext,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -3694,19 +3539,12 @@ void operator<<= (
     IOP::ServiceContext *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_ServiceContext,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IOP::ServiceContext::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::ServiceContext>::insert (
+      _tao_any,
+      IOP::ServiceContext::_tao_any_destructor,
+      IOP::_tc_ServiceContext,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -3727,76 +3565,24 @@ CORBA::Boolean operator>>= (
     const IOP::ServiceContext *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::_tc_ServiceContext
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const IOP::ServiceContext*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        IOP::ServiceContext *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            IOP::ServiceContext,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IOP::_tc_ServiceContext,
-                1,
-                ACE_static_cast (void *, tmp),
-                IOP::ServiceContext::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IOP::ServiceContext>::extract (
+        _tao_any,
+        IOP::ServiceContext::_tao_any_destructor,
+        IOP::_tc_ServiceContext,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<IOP::ServiceContext>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<IOP::ServiceContext>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -3804,16 +3590,12 @@ void operator<<= (
     const IOP::ServiceContextList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_ServiceContextList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::insert_copy (
+      _tao_any,
+      IOP::ServiceContextList::_tao_any_destructor,
+      IOP::_tc_ServiceContextList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -3822,19 +3604,12 @@ void operator<<= (
     IOP::ServiceContextList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_ServiceContextList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IOP::ServiceContextList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::insert (
+      _tao_any,
+      IOP::ServiceContextList::_tao_any_destructor,
+      IOP::_tc_ServiceContextList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -3843,8 +3618,8 @@ CORBA::Boolean operator>>= (
     IOP::ServiceContextList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IOP::ServiceContextList*&,
+  return _tao_any >>= ACE_const_cast (
+      const IOP::ServiceContextList *&,
       _tao_elem
     );
 }
@@ -3855,457 +3630,109 @@ CORBA::Boolean operator>>= (
     const IOP::ServiceContextList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::_tc_ServiceContextList
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const IOP::ServiceContextList*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        IOP::ServiceContextList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            IOP::ServiceContextList,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IOP::_tc_ServiceContextList,
-                1,
-                ACE_static_cast (void *, tmp),
-                IOP::ServiceContextList::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::extract (
+        _tao_any,
+        IOP::ServiceContextList::_tao_any_destructor,
+        IOP::_tc_ServiceContextList,
+        _tao_elem
+      );
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:60
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     IOP::Codec_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      IOP::_tc_Codec,
-      1,
-      IOP::Codec::_duplicate (_tao_elem),
-      IOP::Codec::_tao_any_destructor
-    );
-
-  _tao_any.contains_local (1);
+  IOP::Codec_ptr _tao_objptr =
+    IOP::Codec::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     IOP::Codec_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<IOP::Codec>::insert (
+      _tao_any,
+      IOP::Codec::_tao_any_destructor,
       IOP::_tc_Codec,
-      1,
-      *_tao_elem,
-      IOP::Codec::_tao_any_destructor
+      *_tao_elem
     );
-
-  _tao_any.contains_local (1);
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     IOP::Codec_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = IOP::Codec::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::_tc_Codec
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    _tao_elem =
-      ACE_reinterpret_cast (
-          IOP::Codec_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
+  return
+    TAO::Any_Impl_T<IOP::Codec>::extract (
+        _tao_any,
+        IOP::Codec::_tao_any_destructor,
+        IOP::_tc_Codec,
+        _tao_elem
+      );
+}
 
-  _tao_elem = IOP::Codec::_nil ();
-  return 0;
+CORBA::Boolean
+TAO::Any_Impl_T<IOP::Codec>::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<IOP::Codec,IOP::Codec_var>;
+  template class TAO::Any_Impl_T<IOP::Codec>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Manager<IOP::Codec,IOP::Codec_var>
+# pragma instantiate TAO_Object_Manager<IOP::Codec, IOP::Codec_var>
+# pragma instantiate TAO::Any_Impl_T<IOP::Codec>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:60
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const IOP::Codec::InvalidTypeForEncoding &_tao_elem
-  )
-{
-  IOP::Codec::InvalidTypeForEncoding *_tao_elem_copy = 0;
-  ACE_NEW (
-      _tao_elem_copy,
-      IOP::Codec::InvalidTypeForEncoding (_tao_elem)
-    );
-
-  _tao_any._tao_replace (
-      IOP::Codec::_tc_InvalidTypeForEncoding,
-      1,
-      _tao_elem_copy,
-      IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor
-    );
-
-  _tao_any.contains_local (1);
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Codec::InvalidTypeForEncoding *_tao_elem
-  )
-{
-  _tao_any._tao_replace (
-      IOP::Codec::_tc_InvalidTypeForEncoding,
-      1,
-      _tao_elem,
-      IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor
-    );
-
-  _tao_any.contains_local (1);
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,IOP::Codec::InvalidTypeForEncoding *&_tao_elem
+    const IOP::Encoding &_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IOP::Codec::InvalidTypeForEncoding*&,
+  TAO::Any_Dual_Impl_T<IOP::Encoding>::insert_copy (
+      _tao_any,
+      IOP::Encoding::_tao_any_destructor,
+      IOP::_tc_Encoding,
       _tao_elem
     );
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::Codec::InvalidTypeForEncoding *&_tao_elem
-  )
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::Codec::_tc_InvalidTypeForEncoding
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    _tao_elem = (IOP::Codec::InvalidTypeForEncoding *)_tao_any.value ();
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:60
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::Codec::FormatMismatch &_tao_elem
-  )
-{
-  IOP::Codec::FormatMismatch *_tao_elem_copy = 0;
-  ACE_NEW (
-      _tao_elem_copy,
-      IOP::Codec::FormatMismatch (_tao_elem)
-    );
-
-  _tao_any._tao_replace (
-      IOP::Codec::_tc_FormatMismatch,
-      1,
-      _tao_elem_copy,
-      IOP::Codec::FormatMismatch::_tao_any_destructor
-    );
-
-  _tao_any.contains_local (1);
-}
-
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    IOP::Codec::FormatMismatch *_tao_elem
-  )
-{
-  _tao_any._tao_replace (
-      IOP::Codec::_tc_FormatMismatch,
-      1,
-      _tao_elem,
-      IOP::Codec::FormatMismatch::_tao_any_destructor
-    );
-
-  _tao_any.contains_local (1);
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,IOP::Codec::FormatMismatch *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast(
-      const IOP::Codec::FormatMismatch*&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::Codec::FormatMismatch *&_tao_elem
-  )
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::Codec::_tc_FormatMismatch
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    _tao_elem = (IOP::Codec::FormatMismatch *)_tao_any.value ();
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:60
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::Codec::TypeMismatch &_tao_elem
-  )
-{
-  IOP::Codec::TypeMismatch *_tao_elem_copy = 0;
-  ACE_NEW (
-      _tao_elem_copy,
-      IOP::Codec::TypeMismatch (_tao_elem)
-    );
-
-  _tao_any._tao_replace (
-      IOP::Codec::_tc_TypeMismatch,
-      1,
-      _tao_elem_copy,
-      IOP::Codec::TypeMismatch::_tao_any_destructor
-    );
-
-  _tao_any.contains_local (1);
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Codec::TypeMismatch *_tao_elem
-  )
-{
-  _tao_any._tao_replace (
-      IOP::Codec::_tc_TypeMismatch,
-      1,
-      _tao_elem,
-      IOP::Codec::TypeMismatch::_tao_any_destructor
-    );
-
-  _tao_any.contains_local (1);
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,IOP::Codec::TypeMismatch *&_tao_elem
+    IOP::Encoding *_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const IOP::Codec::TypeMismatch*&,
+  TAO::Any_Dual_Impl_T<IOP::Encoding>::insert (
+      _tao_any,
+      IOP::Encoding::_tao_any_destructor,
+      IOP::_tc_Encoding,
       _tao_elem
     );
 }
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::Codec::TypeMismatch *&_tao_elem
-  )
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::Codec::_tc_TypeMismatch
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    _tao_elem = (IOP::Codec::TypeMismatch *)_tao_any.value ();
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:58
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::Encoding &_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_Encoding,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Encoding *_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          IOP::_tc_Encoding,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          IOP::Encoding::_tao_any_destructor
-        );
-    }
-}
-
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
@@ -4324,240 +3751,87 @@ CORBA::Boolean operator>>= (
     const IOP::Encoding *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::_tc_Encoding
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const IOP::Encoding*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        IOP::Encoding *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            IOP::Encoding,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                IOP::_tc_Encoding,
-                1,
-                ACE_static_cast (void *, tmp),
-                IOP::Encoding::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<IOP::Encoding>::extract (
+        _tao_any,
+        IOP::Encoding::_tao_any_destructor,
+        IOP::_tc_Encoding,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<IOP::Encoding>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<IOP::Encoding>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:60
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     IOP::CodecFactory_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      IOP::_tc_CodecFactory,
-      1,
-      IOP::CodecFactory::_duplicate (_tao_elem),
-      IOP::CodecFactory::_tao_any_destructor
-    );
-
-  _tao_any.contains_local (1);
+  IOP::CodecFactory_ptr _tao_objptr =
+    IOP::CodecFactory::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     IOP::CodecFactory_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<IOP::CodecFactory>::insert (
+      _tao_any,
+      IOP::CodecFactory::_tao_any_destructor,
       IOP::_tc_CodecFactory,
-      1,
-      *_tao_elem,
-      IOP::CodecFactory::_tao_any_destructor
+      *_tao_elem
     );
-
-  _tao_any.contains_local (1);
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     IOP::CodecFactory_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = IOP::CodecFactory::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::_tc_CodecFactory
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    _tao_elem =
-      ACE_reinterpret_cast (
-          IOP::CodecFactory_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
+  return
+    TAO::Any_Impl_T<IOP::CodecFactory>::extract (
+        _tao_any,
+        IOP::CodecFactory::_tao_any_destructor,
+        IOP::_tc_CodecFactory,
+        _tao_elem
+      );
+}
 
-  _tao_elem = IOP::CodecFactory::_nil ();
-  return 0;
+CORBA::Boolean
+TAO::Any_Impl_T<IOP::CodecFactory>::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<IOP::CodecFactory,IOP::CodecFactory_var>;
+  template class TAO::Any_Impl_T<IOP::CodecFactory>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Manager<IOP::CodecFactory,IOP::CodecFactory_var>
+# pragma instantiate TAO_Object_Manager<IOP::CodecFactory, IOP::CodecFactory_var>
+# pragma instantiate TAO::Any_Impl_T<IOP::CodecFactory>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:60
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::CodecFactory::UnknownEncoding &_tao_elem
-  )
-{
-  IOP::CodecFactory::UnknownEncoding *_tao_elem_copy = 0;
-  ACE_NEW (
-      _tao_elem_copy,
-      IOP::CodecFactory::UnknownEncoding (_tao_elem)
-    );
-
-  _tao_any._tao_replace (
-      IOP::CodecFactory::_tc_UnknownEncoding,
-      1,
-      _tao_elem_copy,
-      IOP::CodecFactory::UnknownEncoding::_tao_any_destructor
-    );
-
-  _tao_any.contains_local (1);
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::CodecFactory::UnknownEncoding *_tao_elem
-  )
-{
-  _tao_any._tao_replace (
-      IOP::CodecFactory::_tc_UnknownEncoding,
-      1,
-      _tao_elem,
-      IOP::CodecFactory::UnknownEncoding::_tao_any_destructor
-    );
-
-  _tao_any.contains_local (1);
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,IOP::CodecFactory::UnknownEncoding *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast(
-      const IOP::CodecFactory::UnknownEncoding*&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::CodecFactory::UnknownEncoding *&_tao_elem
-  )
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          IOP::CodecFactory::_tc_UnknownEncoding
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    _tao_elem = (IOP::CodecFactory::UnknownEncoding *)_tao_any.value ();
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 #if !defined _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_
 #define _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_
@@ -4567,26 +3841,29 @@ CORBA::Boolean operator<< (
     const IOP::TaggedProfile::_tao_seq_Octet &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedProfile::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
+      // Encode all elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedProfile::_tao_seq_Octet *)&_tao_sequence);
+        if (oseq->mb ())
+          return strm.write_octet_array_mb (oseq->mb ());
+        else
+          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+      }
+      
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -4595,48 +3872,59 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),
-    ACE_Message_Block::DONT_DELETE))
     {
-      TAO_ORB_Core* orb_core = strm.orb_core ();
-      if (orb_core != 0 &&
-      strm.orb_core ()->resource_factory ()->
-      input_cdr_allocator_type_locked () == 1)
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      if (ACE_BIT_DISABLED (strm.start ()->flags (),
+      ACE_Message_Block::DONT_DELETE))
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-          ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-        oseq->replace (_tao_seq_len, strm.start ());
-        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-        strm.skip_bytes (_tao_seq_len);
-        return 1;
+        TAO_ORB_Core* orb_core = strm.orb_core ();
+        if (orb_core != 0 &&
+        strm.orb_core ()->resource_factory ()->
+        input_cdr_allocator_type_locked () == 1)
+        {
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+          oseq->replace (_tao_seq_len, strm.start ());
+          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+          strm.skip_bytes (_tao_seq_len);
+          return 1;
+        }
       }
-    }
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 #endif /* _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 #if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_CPP_
 #define _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_CPP_
@@ -4646,17 +3934,22 @@ CORBA::Boolean operator<< (
     const IOP::IOR::_tao_seq_TaggedProfile &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -4665,31 +3958,44 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 #endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_CPP_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 #if !defined _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_CPP_
 #define _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_CPP_
@@ -4699,26 +4005,29 @@ CORBA::Boolean operator<< (
     const IOP::TaggedComponent::_tao_seq_Octet &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedComponent::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
+      // Encode all elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedComponent::_tao_seq_Octet *)&_tao_sequence);
+        if (oseq->mb ())
+          return strm.write_octet_array_mb (oseq->mb ());
+        else
+          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+      }
+      
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -4727,64 +4036,81 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),
-    ACE_Message_Block::DONT_DELETE))
     {
-      TAO_ORB_Core* orb_core = strm.orb_core ();
-      if (orb_core != 0 &&
-      strm.orb_core ()->resource_factory ()->
-      input_cdr_allocator_type_locked () == 1)
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      if (ACE_BIT_DISABLED (strm.start ()->flags (),
+      ACE_Message_Block::DONT_DELETE))
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-          ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-        oseq->replace (_tao_seq_len, strm.start ());
-        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-        strm.skip_bytes (_tao_seq_len);
-        return 1;
+        TAO_ORB_Core* orb_core = strm.orb_core ();
+        if (orb_core != 0 &&
+        strm.orb_core ()->resource_factory ()->
+        input_cdr_allocator_type_locked () == 1)
+        {
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+          oseq->replace (_tao_seq_len, strm.start ());
+          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+          strm.skip_bytes (_tao_seq_len);
+          return 1;
+        }
       }
-    }
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_CPP_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const IOP::MultipleComponentProfile &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -4793,45 +4119,64 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const IOP::TaggedComponentList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -4840,45 +4185,64 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const IOP::TaggedComponentSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -4887,29 +4251,42 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 #if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_
 #define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_
@@ -4919,26 +4296,29 @@ CORBA::Boolean operator<< (
     const IOP::ServiceContext::_tao_seq_Octet &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
+      // Encode all elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_Octet *)&_tao_sequence);
+        if (oseq->mb ())
+          return strm.write_octet_array_mb (oseq->mb ());
+        else
+          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+      }
+      
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -4947,64 +4327,81 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),
-    ACE_Message_Block::DONT_DELETE))
     {
-      TAO_ORB_Core* orb_core = strm.orb_core ();
-      if (orb_core != 0 &&
-      strm.orb_core ()->resource_factory ()->
-      input_cdr_allocator_type_locked () == 1)
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      if (ACE_BIT_DISABLED (strm.start ()->flags (),
+      ACE_Message_Block::DONT_DELETE))
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-          ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-        oseq->replace (_tao_seq_len, strm.start ());
-        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-        strm.skip_bytes (_tao_seq_len);
-        return 1;
+        TAO_ORB_Core* orb_core = strm.orb_core ();
+        if (orb_core != 0 &&
+        strm.orb_core ()->resource_factory ()->
+        input_cdr_allocator_type_locked () == 1)
+        {
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+          oseq->replace (_tao_seq_len, strm.start ());
+          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+          strm.skip_bytes (_tao_seq_len);
+          return 1;
+        }
       }
-    }
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 #endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const IOP::ServiceContextList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -5013,25 +4410,67 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<IOP::Codec>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<IOP::CodecFactory>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index 883fda141e8..21815aa277f 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_IOPC_H_
-#define _TAO_IDL_IOPC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_IOPC_H_
+#define _TAO_IDL_ORIG_IOPC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -32,7 +35,7 @@
 #include "tao/TAO_Export.h"
 #include "Exception.h"
 #include "Object.h"
-#include "Any.h"
+#include "Any_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -57,59 +60,85 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  IOP
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::ULong ProfileId;
   typedef CORBA::ULong_out ProfileId_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_ProfileId;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_INTERNET_IOP;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_MULTIPLE_COMPONENTS;
+  const CORBA::ULong TAG_INTERNET_IOP = 0U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong TAG_MULTIPLE_COMPONENTS = 1U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
   
-  struct TaggedProfile;
   class TaggedProfile_var;
   
   struct TAO_Export TaggedProfile
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TaggedProfile_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
     
-    ACE_NESTED_CLASS (IOP, ProfileId) tag;
+    static void _tao_any_destructor (void *);
+    IOP::ProfileId tag;
     
+
 #if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CH_)
 #define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CH_
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
     class _tao_seq_Octet;
     
     // *************************************************************
-    // _tao_seq_Octet
+    // IOP::TaggedProfile::_tao_seq_Octet
     // *************************************************************
     
     class TAO_Export _tao_seq_Octet : 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<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
+      _tao_seq_Octet (void);
+      _tao_seq_Octet (CORBA::ULong max);
       _tao_seq_Octet (
           CORBA::ULong max, 
           CORBA::ULong length, 
           CORBA::Octet *buffer, 
           CORBA::Boolean release = 0
         );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
+      _tao_seq_Octet (const _tao_seq_Octet &);
       ~_tao_seq_Octet (void);
+      
       static void _tao_any_destructor (void*);
       
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       _tao_seq_Octet (
           CORBA::ULong length,
@@ -117,20 +146,20 @@ TAO_NAMESPACE  IOP
         )
         : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-      
     };
-    
+
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
     
-#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_Octet _profile_data_seq;
-#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
-
     _tao_seq_Octet profile_data;
-    
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export TaggedProfile_var
   {
   public:
@@ -147,6 +176,7 @@ TAO_NAMESPACE  IOP
     operator const TaggedProfile &() const;
     operator TaggedProfile &();
     operator TaggedProfile &() const;
+    
     // Variable-size types only.
     operator TaggedProfile *&();
     
@@ -161,6 +191,9 @@ TAO_NAMESPACE  IOP
     TaggedProfile *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export TaggedProfile_out
   {
   public:
@@ -179,32 +212,36 @@ TAO_NAMESPACE  IOP
     void operator= (const TaggedProfile_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_TaggedProfile;
   
-  struct IOR;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class IOR_var;
   
   struct TAO_Export IOR
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IOR_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
     
+    static void _tao_any_destructor (void *);
     TAO_String_Manager type_id;
     
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     
+    // 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_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_
     
-    class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
+    class TAO_Export _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
       : public TAO_Unbounded_Base_Sequence
     {
     public:
-      // = Initialization and termination methods.
       _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void);
       _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum); 
       _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (
@@ -241,54 +278,64 @@ TAO_NAMESPACE  IOP
           CORBA::Boolean release
         );
     };
-    
+
 #endif /* end #if !defined */
-    
-    
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-    
+
 #if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_)
 #define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
     class _tao_seq_TaggedProfile;
     
     // *************************************************************
-    // _tao_seq_TaggedProfile
+    // IOP::IOR::_tao_seq_TaggedProfile
     // *************************************************************
     
     class TAO_Export _tao_seq_TaggedProfile : 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_IOP_IOR__tao_seq_TaggedProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<ACE_NESTED_CLASS (IOP, TaggedProfile)>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
-      _tao_seq_TaggedProfile (void); // default ctor
-      _tao_seq_TaggedProfile (CORBA::ULong max); // uses max size
+      _tao_seq_TaggedProfile (void);
+      _tao_seq_TaggedProfile (CORBA::ULong max);
       _tao_seq_TaggedProfile (
           CORBA::ULong max, 
           CORBA::ULong length, 
           ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer, 
           CORBA::Boolean release = 0
         );
-      _tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &); // copy ctor
+      _tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &);
       ~_tao_seq_TaggedProfile (void);
+      
       static void _tao_any_destructor (void*);
       
+      
     };
-    
+
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
     
-#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_TaggedProfile _profiles_seq;
-#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
-
     _tao_seq_TaggedProfile profiles;
-    
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export IOR_var
   {
   public:
@@ -305,6 +352,7 @@ TAO_NAMESPACE  IOP
     operator const IOR &() const;
     operator IOR &();
     operator IOR &() const;
+    
     // Variable-size types only.
     operator IOR *&();
     
@@ -319,6 +367,9 @@ TAO_NAMESPACE  IOP
     IOR *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export IOR_out
   {
   public:
@@ -337,55 +388,74 @@ TAO_NAMESPACE  IOP
     void operator= (const IOR_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_IOR;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::ULong ComponentId;
   typedef CORBA::ULong_out ComponentId_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_ComponentId;
   
-  struct TaggedComponent;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class TaggedComponent_var;
   
   struct TAO_Export TaggedComponent
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TaggedComponent_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
     
-    ACE_NESTED_CLASS (IOP, ComponentId) tag;
+    static void _tao_any_destructor (void *);
+    IOP::ComponentId tag;
     
+
 #if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CH_)
 #define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CH_
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
     class _tao_seq_Octet;
     
     // *************************************************************
-    // _tao_seq_Octet
+    // IOP::TaggedComponent::_tao_seq_Octet
     // *************************************************************
     
     class TAO_Export _tao_seq_Octet : 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<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
+      _tao_seq_Octet (void);
+      _tao_seq_Octet (CORBA::ULong max);
       _tao_seq_Octet (
           CORBA::ULong max, 
           CORBA::ULong length, 
           CORBA::Octet *buffer, 
           CORBA::Boolean release = 0
         );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
+      _tao_seq_Octet (const _tao_seq_Octet &);
       ~_tao_seq_Octet (void);
+      
       static void _tao_any_destructor (void*);
       
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       _tao_seq_Octet (
           CORBA::ULong length,
@@ -393,20 +463,20 @@ TAO_NAMESPACE  IOP
         )
         : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-      
     };
-    
+
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
     
-#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_Octet _component_data_seq;
-#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
-
     _tao_seq_Octet component_data;
-    
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export TaggedComponent_var
   {
   public:
@@ -423,6 +493,7 @@ TAO_NAMESPACE  IOP
     operator const TaggedComponent &() const;
     operator TaggedComponent &();
     operator TaggedComponent &() const;
+    
     // Variable-size types only.
     operator TaggedComponent *&();
     
@@ -437,6 +508,9 @@ TAO_NAMESPACE  IOP
     TaggedComponent *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export TaggedComponent_out
   {
   public:
@@ -455,19 +529,23 @@ TAO_NAMESPACE  IOP
     void operator= (const TaggedComponent_var &);
   };
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponent;
+  // 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_TaggedComponent;
   
+  // 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_IOP_MULTIPLECOMPONENTPROFILE_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
+  class TAO_Export _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void);
     _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (
@@ -504,55 +582,61 @@ TAO_NAMESPACE  IOP
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CH_)
 #define _IOP_MULTIPLECOMPONENTPROFILE_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class MultipleComponentProfile;
   class MultipleComponentProfile_var;
   
   // *************************************************************
-  // MultipleComponentProfile
+  // IOP::MultipleComponentProfile
   // *************************************************************
   
   class TAO_Export MultipleComponentProfile : 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_IOP_MultipleComponentProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<TaggedComponent>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    MultipleComponentProfile (void); // default ctor
-    MultipleComponentProfile (CORBA::ULong max); // uses max size
+    MultipleComponentProfile (void);
+    MultipleComponentProfile (CORBA::ULong max);
     MultipleComponentProfile (
         CORBA::ULong max, 
         CORBA::ULong length, 
         TaggedComponent *buffer, 
         CORBA::Boolean release = 0
       );
-    MultipleComponentProfile (const MultipleComponentProfile &); // copy ctor
+    MultipleComponentProfile (const MultipleComponentProfile &);
     ~MultipleComponentProfile (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef MultipleComponentProfile_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE___VAR_CH_)
 #define _IOP_MULTIPLECOMPONENTPROFILE___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class IOP::MultipleComponentProfile_var
   // *************************************************************
@@ -573,7 +657,9 @@ TAO_NAMESPACE  IOP
     operator const MultipleComponentProfile &() const;
     operator MultipleComponentProfile &();
     operator MultipleComponentProfile &() const;
-    operator MultipleComponentProfile *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator MultipleComponentProfile *&();
     
     TaggedComponent & operator[] (CORBA::ULong index);
     const TaggedComponent & operator[] (CORBA::ULong index) const;
@@ -588,14 +674,15 @@ TAO_NAMESPACE  IOP
   private:
     MultipleComponentProfile *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE___OUT_CH_)
 #define _IOP_MULTIPLECOMPONENTPROFILE___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export MultipleComponentProfile_out
   {
   public:
@@ -614,23 +701,26 @@ TAO_NAMESPACE  IOP
     // Assignment from T_var not allowed.
     void operator= (const MultipleComponentProfile_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile;
+  // 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_MultipleComponentProfile;
   
+  // 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_IOP_TAGGEDCOMPONENTLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_TaggedComponentList
+  class TAO_Export _TAO_Unbounded_Sequence_IOP_TaggedComponentList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_IOP_TaggedComponentList (void);
     _TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_IOP_TaggedComponentList (
@@ -667,55 +757,61 @@ TAO_NAMESPACE  IOP
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CH_)
 #define _IOP_TAGGEDCOMPONENTLIST_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class TaggedComponentList;
   class TaggedComponentList_var;
   
   // *************************************************************
-  // TaggedComponentList
+  // IOP::TaggedComponentList
   // *************************************************************
   
   class TAO_Export TaggedComponentList : 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_IOP_TaggedComponentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<TaggedComponent>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    TaggedComponentList (void); // default ctor
-    TaggedComponentList (CORBA::ULong max); // uses max size
+    TaggedComponentList (void);
+    TaggedComponentList (CORBA::ULong max);
     TaggedComponentList (
         CORBA::ULong max, 
         CORBA::ULong length, 
         TaggedComponent *buffer, 
         CORBA::Boolean release = 0
       );
-    TaggedComponentList (const TaggedComponentList &); // copy ctor
+    TaggedComponentList (const TaggedComponentList &);
     ~TaggedComponentList (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TaggedComponentList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IOP_TAGGEDCOMPONENTLIST___VAR_CH_)
 #define _IOP_TAGGEDCOMPONENTLIST___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class IOP::TaggedComponentList_var
   // *************************************************************
@@ -736,7 +832,9 @@ TAO_NAMESPACE  IOP
     operator const TaggedComponentList &() const;
     operator TaggedComponentList &();
     operator TaggedComponentList &() const;
-    operator TaggedComponentList *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator TaggedComponentList *&();
     
     TaggedComponent & operator[] (CORBA::ULong index);
     const TaggedComponent & operator[] (CORBA::ULong index) const;
@@ -751,14 +849,15 @@ TAO_NAMESPACE  IOP
   private:
     TaggedComponentList *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IOP_TAGGEDCOMPONENTLIST___OUT_CH_)
 #define _IOP_TAGGEDCOMPONENTLIST___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export TaggedComponentList_out
   {
   public:
@@ -777,23 +876,26 @@ TAO_NAMESPACE  IOP
     // Assignment from T_var not allowed.
     void operator= (const TaggedComponentList_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentList;
+  // 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_TaggedComponentList;
   
+  // 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_IOP_TAGGEDCOMPONENTSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
+  class TAO_Export _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void);
     _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (
@@ -830,55 +932,61 @@ TAO_NAMESPACE  IOP
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CH_)
 #define _IOP_TAGGEDCOMPONENTSEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class TaggedComponentSeq;
   class TaggedComponentSeq_var;
   
   // *************************************************************
-  // TaggedComponentSeq
+  // IOP::TaggedComponentSeq
   // *************************************************************
   
   class TAO_Export TaggedComponentSeq : 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_IOP_TaggedComponentSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<TaggedComponent>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    TaggedComponentSeq (void); // default ctor
-    TaggedComponentSeq (CORBA::ULong max); // uses max size
+    TaggedComponentSeq (void);
+    TaggedComponentSeq (CORBA::ULong max);
     TaggedComponentSeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         TaggedComponent *buffer, 
         CORBA::Boolean release = 0
       );
-    TaggedComponentSeq (const TaggedComponentSeq &); // copy ctor
+    TaggedComponentSeq (const TaggedComponentSeq &);
     ~TaggedComponentSeq (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TaggedComponentSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ___VAR_CH_)
 #define _IOP_TAGGEDCOMPONENTSEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class IOP::TaggedComponentSeq_var
   // *************************************************************
@@ -899,7 +1007,9 @@ TAO_NAMESPACE  IOP
     operator const TaggedComponentSeq &() const;
     operator TaggedComponentSeq &();
     operator TaggedComponentSeq &() const;
-    operator TaggedComponentSeq *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator TaggedComponentSeq *&();
     
     TaggedComponent & operator[] (CORBA::ULong index);
     const TaggedComponent & operator[] (CORBA::ULong index) const;
@@ -914,14 +1024,15 @@ TAO_NAMESPACE  IOP
   private:
     TaggedComponentSeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ___OUT_CH_)
 #define _IOP_TAGGEDCOMPONENTSEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export TaggedComponentSeq_out
   {
   public:
@@ -940,79 +1051,127 @@ TAO_NAMESPACE  IOP
     // Assignment from T_var not allowed.
     void operator= (const TaggedComponentSeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // 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_TaggedComponentSeq;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ORB_TYPE;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong TAG_ORB_TYPE = 0U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong TAG_CODE_SETS = 1U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong TAG_POLICIES = 2U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong TAG_ALTERNATE_IIOP_ADDRESS = 3U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CODE_SETS;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_POLICIES;
+  const CORBA::ULong TAG_COMPLETE_OBJECT_KEY = 5U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ALTERNATE_IIOP_ADDRESS;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_COMPLETE_OBJECT_KEY;
+  const CORBA::ULong TAG_ENDPOINT_ID_POSITION = 6U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ENDPOINT_ID_POSITION;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_LOCATION_POLICY;
+  const CORBA::ULong TAG_LOCATION_POLICY = 12U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_STRING_BINDING;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_BINDING_NAME;
+  const CORBA::ULong TAG_DCE_STRING_BINDING = 100U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_NO_PIPES;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong TAG_DCE_BINDING_NAME = 101U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong TAG_DCE_NO_PIPES = 102U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
   
   typedef CORBA::ULong ServiceId;
   typedef CORBA::ULong_out ServiceId_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_ServiceId;
   
-  struct ServiceContext;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class ServiceContext_var;
   
   struct TAO_Export ServiceContext
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServiceContext_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
     
-    ACE_NESTED_CLASS (IOP, ServiceId) context_id;
+    static void _tao_any_destructor (void *);
+    IOP::ServiceId context_id;
     
+
 #if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CH_)
 #define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CH_
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
     class _tao_seq_Octet;
     
     // *************************************************************
-    // _tao_seq_Octet
+    // IOP::ServiceContext::_tao_seq_Octet
     // *************************************************************
     
     class TAO_Export _tao_seq_Octet : 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<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
+      _tao_seq_Octet (void);
+      _tao_seq_Octet (CORBA::ULong max);
       _tao_seq_Octet (
           CORBA::ULong max, 
           CORBA::ULong length, 
           CORBA::Octet *buffer, 
           CORBA::Boolean release = 0
         );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
+      _tao_seq_Octet (const _tao_seq_Octet &);
       ~_tao_seq_Octet (void);
+      
       static void _tao_any_destructor (void*);
       
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       _tao_seq_Octet (
           CORBA::ULong length,
@@ -1020,20 +1179,20 @@ TAO_NAMESPACE  IOP
         )
         : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-      
     };
-    
+
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
     
-#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_Octet _context_data_seq;
-#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
-
     _tao_seq_Octet context_data;
-    
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export ServiceContext_var
   {
   public:
@@ -1050,6 +1209,7 @@ TAO_NAMESPACE  IOP
     operator const ServiceContext &() const;
     operator ServiceContext &();
     operator ServiceContext &() const;
+    
     // Variable-size types only.
     operator ServiceContext *&();
     
@@ -1064,6 +1224,9 @@ TAO_NAMESPACE  IOP
     ServiceContext *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export ServiceContext_out
   {
   public:
@@ -1082,19 +1245,23 @@ TAO_NAMESPACE  IOP
     void operator= (const ServiceContext_var &);
   };
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContext;
+  // 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_ServiceContext;
   
+  // 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_IOP_SERVICECONTEXTLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_IOP_ServiceContextList
+  class TAO_Export _TAO_Unbounded_Sequence_IOP_ServiceContextList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_IOP_ServiceContextList (void);
     _TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_IOP_ServiceContextList (
@@ -1131,55 +1298,61 @@ TAO_NAMESPACE  IOP
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_IOP_SERVICECONTEXTLIST_CH_)
 #define _IOP_SERVICECONTEXTLIST_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ServiceContextList;
   class ServiceContextList_var;
   
   // *************************************************************
-  // ServiceContextList
+  // IOP::ServiceContextList
   // *************************************************************
   
   class TAO_Export ServiceContextList : 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_IOP_ServiceContextList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ServiceContext>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    ServiceContextList (void); // default ctor
-    ServiceContextList (CORBA::ULong max); // uses max size
+    ServiceContextList (void);
+    ServiceContextList (CORBA::ULong max);
     ServiceContextList (
         CORBA::ULong max, 
         CORBA::ULong length, 
         ServiceContext *buffer, 
         CORBA::Boolean release = 0
       );
-    ServiceContextList (const ServiceContextList &); // copy ctor
+    ServiceContextList (const ServiceContextList &);
     ~ServiceContextList (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServiceContextList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IOP_SERVICECONTEXTLIST___VAR_CH_)
 #define _IOP_SERVICECONTEXTLIST___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class IOP::ServiceContextList_var
   // *************************************************************
@@ -1200,7 +1373,9 @@ TAO_NAMESPACE  IOP
     operator const ServiceContextList &() const;
     operator ServiceContextList &();
     operator ServiceContextList &() const;
-    operator ServiceContextList *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator ServiceContextList *&();
     
     ServiceContext & operator[] (CORBA::ULong index);
     const ServiceContext & operator[] (CORBA::ULong index) const;
@@ -1215,14 +1390,15 @@ TAO_NAMESPACE  IOP
   private:
     ServiceContextList *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IOP_SERVICECONTEXTLIST___OUT_CH_)
 #define _IOP_SERVICECONTEXTLIST___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export ServiceContextList_out
   {
   public:
@@ -1241,63 +1417,126 @@ TAO_NAMESPACE  IOP
     // Assignment from T_var not allowed.
     void operator= (const ServiceContextList_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // 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_ServiceContextList;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TransactionService;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong TransactionService = 0U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong CodeSets = 1U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong ChainBypassCheck = 2U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong ChainBypassInfo = 3U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong LogicalThreadId = 4U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong BI_DIR_IIOP = 5U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong SendingContextRunTime = 6U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong CodeSets;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ChainBypassCheck;
+  const CORBA::ULong INVOCATION_POLICIES = 7U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ChainBypassInfo;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LogicalThreadId;
+  const CORBA::ULong UnknownExceptionInfo = 9U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong BI_DIR_IIOP;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SendingContextRunTime;
+  const CORBA::ULong RTCorbaPriority = 10U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong UnknownExceptionInfo;
+  const CORBA::ULong RTCorbaPriorityRange = 11U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RTCorbaPriority;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RTCorbaPriorityRange;
+  const CORBA::ULong TAG_FT_GROUP = 27U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_FT_GROUP;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_FT_PRIMARY;
+  const CORBA::ULong TAG_FT_PRIMARY = 28U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_FT_HEARTBEAT_ENABLED;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong FT_GROUP_VERSION;
+  const CORBA::ULong TAG_FT_HEARTBEAT_ENABLED = 29U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong FT_REQUEST;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_UIPMC;
+  const CORBA::ULong FT_GROUP_VERSION = 12U;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_GROUP;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong FT_REQUEST = 13U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_GROUP_IIOP;
+  const CORBA::ULong TAG_UIPMC = 1413566220U;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong TAG_GROUP = 1413566211U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
+  const CORBA::ULong TAG_GROUP_IIOP = 1413566212U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_IOP_CODEC___PTR_CH_)
 #define _IOP_CODEC___PTR_CH_
   
   class Codec;
   typedef Codec *Codec_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IOP_CODEC___VAR_CH_)
 #define _IOP_CODEC___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export Codec_var : public TAO_Base_var
   {
   public:
@@ -1337,13 +1576,14 @@ TAO_NAMESPACE  IOP
     Codec_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IOP_CODEC___OUT_CH_)
 #define _IOP_CODEC___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export Codec_out
   {
   public:
@@ -1360,17 +1600,12 @@ TAO_NAMESPACE  IOP
   private:
     Codec_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  // *************************************************************
-  // IOP::Codec
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-  
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_IOP_CODEC_CH_)
 #define _IOP_CODEC_CH_
   
@@ -1378,11 +1613,8 @@ TAO_NAMESPACE  IOP
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Codec_ptr _ptr_type;
     typedef Codec_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -1403,9 +1635,11 @@ TAO_NAMESPACE  IOP
         return (Codec_ptr)0;
       }
     
-    static void _tao_any_destructor (void*);
-    
+    static void _tao_any_destructor (void *);
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_)
 #define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_
     
@@ -1418,9 +1652,9 @@ TAO_NAMESPACE  IOP
       ~InvalidTypeForEncoding (void);
 
       InvalidTypeForEncoding &operator= (const InvalidTypeForEncoding &);
-
-      static void _tao_any_destructor (void*);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static InvalidTypeForEncoding *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1438,16 +1672,22 @@ TAO_NAMESPACE  IOP
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
       
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
-static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
+    static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding;
+
 #endif /* end #if !defined */
     
-    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_IOP_CODEC_FORMATMISMATCH_CH_)
 #define _IOP_CODEC_FORMATMISMATCH_CH_
     
@@ -1460,9 +1700,9 @@ static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding;
       ~FormatMismatch (void);
 
       FormatMismatch &operator= (const FormatMismatch &);
-
-      static void _tao_any_destructor (void*);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static FormatMismatch *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1480,16 +1720,22 @@ static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding;
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
       
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
-static ::CORBA::TypeCode_ptr _tc_FormatMismatch;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
+    static ::CORBA::TypeCode_ptr _tc_FormatMismatch;
+
 #endif /* end #if !defined */
     
-    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_IOP_CODEC_TYPEMISMATCH_CH_)
 #define _IOP_CODEC_TYPEMISMATCH_CH_
     
@@ -1502,9 +1748,9 @@ static ::CORBA::TypeCode_ptr _tc_FormatMismatch;
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
-
-      static void _tao_any_destructor (void*);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static TypeMismatch *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1522,15 +1768,22 @@ static ::CORBA::TypeCode_ptr _tc_FormatMismatch;
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
       
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
-static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
+    static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
+
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::OctetSeq * encode (
         const CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1540,6 +1793,9 @@ static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
         , IOP::Codec::InvalidTypeForEncoding
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * decode (
         const CORBA::OctetSeq & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1549,6 +1805,9 @@ static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
         , IOP::Codec::FormatMismatch
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::OctetSeq * encode_value (
         const CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1558,6 +1817,9 @@ static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
         , IOP::Codec::InvalidTypeForEncoding
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * decode_value (
         const CORBA::OctetSeq & data,
         CORBA::TypeCode_ptr tc
@@ -1569,49 +1831,64 @@ static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
         , IOP::Codec::TypeMismatch
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     Codec (void);
-    
     virtual ~Codec (void);
-  
+    
   private:
     Codec (const Codec &);
     void operator= (const Codec &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // 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_Codec;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short EncodingFormat;
   typedef CORBA::Short_out EncodingFormat_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_EncodingFormat;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ENCODING_CDR_ENCAPS;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short ENCODING_CDR_ENCAPS = 0;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
   
-  struct Encoding;
   class Encoding_var;
   
   struct TAO_Export Encoding
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Encoding_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
     
-    ACE_NESTED_CLASS (IOP, EncodingFormat) format;
+    static void _tao_any_destructor (void *);
+    IOP::EncodingFormat format;
     CORBA::Octet major_version;
     CORBA::Octet minor_version;
-    
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export Encoding_var
   {
   public:
@@ -1624,8 +1901,10 @@ static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
     
     Encoding_var &operator= (Encoding *);
     Encoding_var &operator= (const Encoding_var &);
+    
     // Fixed-size types only.
     Encoding_var &operator= (const Encoding &);
+    
     Encoding *operator-> (void);
     const Encoding *operator-> (void) const;
     
@@ -1644,23 +1923,33 @@ static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
     Encoding *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
+  
   typedef Encoding &Encoding_out;
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding;
+  // 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_Encoding;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_IOP_CODECFACTORY___PTR_CH_)
 #define _IOP_CODECFACTORY___PTR_CH_
   
   class CodecFactory;
   typedef CodecFactory *CodecFactory_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IOP_CODECFACTORY___VAR_CH_)
 #define _IOP_CODECFACTORY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export CodecFactory_var : public TAO_Base_var
   {
   public:
@@ -1700,13 +1989,14 @@ static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
     CodecFactory_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IOP_CODECFACTORY___OUT_CH_)
 #define _IOP_CODECFACTORY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export CodecFactory_out
   {
   public:
@@ -1723,17 +2013,12 @@ static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
   private:
     CodecFactory_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  // *************************************************************
-  // IOP::CodecFactory
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-  
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_IOP_CODECFACTORY_CH_)
 #define _IOP_CODECFACTORY_CH_
   
@@ -1741,11 +2026,8 @@ static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef CodecFactory_ptr _ptr_type;
     typedef CodecFactory_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -1766,9 +2048,11 @@ static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
         return (CodecFactory_ptr)0;
       }
     
-    static void _tao_any_destructor (void*);
-    
+    static void _tao_any_destructor (void *);
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_)
 #define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_
     
@@ -1781,9 +2065,9 @@ static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
       ~UnknownEncoding (void);
 
       UnknownEncoding &operator= (const UnknownEncoding &);
-
-      static void _tao_any_destructor (void*);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static UnknownEncoding *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1801,15 +2085,22 @@ static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
       
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
-static ::CORBA::TypeCode_ptr _tc_UnknownEncoding;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
+    static ::CORBA::TypeCode_ptr _tc_UnknownEncoding;
+
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::Codec_ptr create_codec (
         const IOP::Encoding & enc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1819,95 +2110,172 @@ static ::CORBA::TypeCode_ptr _tc_UnknownEncoding;
         , IOP::CodecFactory::UnknownEncoding
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     CodecFactory (void);
-    
     virtual ~CodecFactory (void);
+    
+    friend class _TAO_CodecFactory_Remote_Proxy_Impl;
+    friend class _TAO_CodecFactory_ThruPOA_Proxy_Impl;
+    friend class _TAO_CodecFactory_Direct_Proxy_Impl;
   
   private:
     CodecFactory (const CodecFactory &);
     void operator= (const CodecFactory &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodecFactory;
-  
+  // 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_CodecFactory;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module IOP
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfile &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfile*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfile *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedProfile *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::IOR &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::IOR*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::IOR *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::IOR *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponent &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponent*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponent *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponent *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::MultipleComponentProfile &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::MultipleComponentProfile*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::MultipleComponentProfile *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::MultipleComponentProfile *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentSeq*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentSeq *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContext &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContext*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContext *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContext *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContextList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&);
-// Any operators for interface IOP::Codec
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::InvalidTypeForEncoding*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::InvalidTypeForEncoding *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::FormatMismatch &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::FormatMismatch*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::FormatMismatch *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::FormatMismatch *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::TypeMismatch &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::TypeMismatch*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::TypeMismatch *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::TypeMismatch *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::Encoding &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::Encoding*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Encoding *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Encoding *&);
-// Any operators for interface IOP::CodecFactory
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const IOP::CodecFactory::UnknownEncoding &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory::UnknownEncoding*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory::UnknownEncoding *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::CodecFactory::UnknownEncoding *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedProfile &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedProfile &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_H_
 #define _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_H_
 
@@ -1922,9 +2290,15 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::IOR &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::IOR &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_H_
 #define _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_H_
 
@@ -1939,9 +2313,15 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedComponent &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedComponent &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_H_
 #define _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_H_
 
@@ -1956,6 +2336,8 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_IOP_MultipleComponentProfile_H_
 #define _TAO_CDR_OP_IOP_MultipleComponentProfile_H_
@@ -1971,6 +2353,8 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_IOP_TaggedComponentList_H_
 #define _TAO_CDR_OP_IOP_TaggedComponentList_H_
@@ -1986,6 +2370,8 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentList_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_IOP_TaggedComponentSeq_H_
 #define _TAO_CDR_OP_IOP_TaggedComponentSeq_H_
@@ -2001,9 +2387,15 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::ServiceContext &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::ServiceContext &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_H_
 #define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_H_
 
@@ -2018,6 +2410,8 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_IOP_ServiceContextList_H_
 #define _TAO_CDR_OP_IOP_ServiceContextList_H_
@@ -2033,11 +2427,19 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_ServiceContextList_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "IOPC.i"
@@ -2053,3 +2455,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i
index d026f5cdcba..1e49f78c2f5 100644
--- a/TAO/tao/IOPC.i
+++ b/TAO/tao/IOPC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class IOP::TaggedProfile_var
 // *************************************************************
 
 ACE_INLINE
-IOP::TaggedProfile_var::TaggedProfile_var (void) // default constructor
+IOP::TaggedProfile_var::TaggedProfile_var (void)
   : ptr_ (0)
 {}
 
@@ -34,42 +38,52 @@ IOP::TaggedProfile_var::TaggedProfile_var (TaggedProfile *p)
 {}
 
 ACE_INLINE
-IOP::TaggedProfile_var::TaggedProfile_var (const ::IOP::TaggedProfile_var &p) // copy constructor
+IOP::TaggedProfile_var::TaggedProfile_var (const ::IOP::TaggedProfile_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::TaggedProfile (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IOP::TaggedProfile (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IOP::TaggedProfile_var::~TaggedProfile_var (void) // destructor
+IOP::TaggedProfile_var::~TaggedProfile_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IOP::TaggedProfile_var &
-IOP::TaggedProfile_var::operator= (TaggedProfile *p)
+ACE_INLINE
+IOP::TaggedProfile_var &
+IOP::TaggedProfile_var::operator= (TaggedProfile *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::IOP::TaggedProfile_var &
-IOP::TaggedProfile_var::operator= (const ::IOP::TaggedProfile_var &p)
+ACE_INLINE
+::IOP::TaggedProfile_var &
+IOP::TaggedProfile_var::operator= (const ::IOP::TaggedProfile_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
         {
-          TaggedProfile *deep_copy =
-            new TaggedProfile (*p.ptr_);
+          TaggedProfile *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              TaggedProfile (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -114,7 +128,7 @@ IOP::TaggedProfile_var::operator ::IOP::TaggedProfile &() const // cast
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IOP::TaggedProfile_var::operator ::IOP::TaggedProfile *&() // cast 
 {
@@ -133,7 +147,7 @@ IOP::TaggedProfile_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::IOP::TaggedProfile *&
 IOP::TaggedProfile_var::out (void)
 {
@@ -156,6 +170,9 @@ IOP::TaggedProfile_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 IOP::TaggedProfile_out
 // *************************************************************
@@ -168,7 +185,7 @@ IOP::TaggedProfile_out::TaggedProfile_out (::IOP::TaggedProfile *&p)
 }
 
 ACE_INLINE
-IOP::TaggedProfile_out::TaggedProfile_out (TaggedProfile_var &p) // constructor from _var
+IOP::TaggedProfile_out::TaggedProfile_out (TaggedProfile_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -176,21 +193,23 @@ IOP::TaggedProfile_out::TaggedProfile_out (TaggedProfile_var &p) // constructor
 }
 
 ACE_INLINE
-IOP::TaggedProfile_out::TaggedProfile_out (const ::IOP::TaggedProfile_out &p) // copy constructor
+IOP::TaggedProfile_out::TaggedProfile_out (const ::IOP::TaggedProfile_out &p)
   : ptr_ (ACE_const_cast (TaggedProfile_out&, p).ptr_)
 {}
 
-ACE_INLINE IOP::TaggedProfile_out &
+ACE_INLINE
+IOP::TaggedProfile_out &
 IOP::TaggedProfile_out::operator= (const ::IOP::TaggedProfile_out &p)
 {
   this->ptr_ = ACE_const_cast (TaggedProfile_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE IOP::TaggedProfile_out &
-IOP::TaggedProfile_out::operator= (TaggedProfile *p)
+ACE_INLINE
+IOP::TaggedProfile_out &
+IOP::TaggedProfile_out::operator= (TaggedProfile *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -212,12 +231,15 @@ IOP::TaggedProfile_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 IOP::IOR_var
 // *************************************************************
 
 ACE_INLINE
-IOP::IOR_var::IOR_var (void) // default constructor
+IOP::IOR_var::IOR_var (void)
   : ptr_ (0)
 {}
 
@@ -227,42 +249,52 @@ IOP::IOR_var::IOR_var (IOR *p)
 {}
 
 ACE_INLINE
-IOP::IOR_var::IOR_var (const ::IOP::IOR_var &p) // copy constructor
+IOP::IOR_var::IOR_var (const ::IOP::IOR_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::IOR (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IOP::IOR (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IOP::IOR_var::~IOR_var (void) // destructor
+IOP::IOR_var::~IOR_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IOP::IOR_var &
-IOP::IOR_var::operator= (IOR *p)
+ACE_INLINE
+IOP::IOR_var &
+IOP::IOR_var::operator= (IOR *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::IOP::IOR_var &
-IOP::IOR_var::operator= (const ::IOP::IOR_var &p)
+ACE_INLINE
+::IOP::IOR_var &
+IOP::IOR_var::operator= (const ::IOP::IOR_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
         {
-          IOR *deep_copy =
-            new IOR (*p.ptr_);
+          IOR *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              IOR (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -307,7 +339,7 @@ IOP::IOR_var::operator ::IOP::IOR &() const // cast
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IOP::IOR_var::operator ::IOP::IOR *&() // cast 
 {
@@ -326,7 +358,7 @@ IOP::IOR_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::IOP::IOR *&
 IOP::IOR_var::out (void)
 {
@@ -349,6 +381,9 @@ IOP::IOR_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 IOP::IOR_out
 // *************************************************************
@@ -361,7 +396,7 @@ IOP::IOR_out::IOR_out (::IOP::IOR *&p)
 }
 
 ACE_INLINE
-IOP::IOR_out::IOR_out (IOR_var &p) // constructor from _var
+IOP::IOR_out::IOR_out (IOR_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -369,21 +404,23 @@ IOP::IOR_out::IOR_out (IOR_var &p) // constructor from _var
 }
 
 ACE_INLINE
-IOP::IOR_out::IOR_out (const ::IOP::IOR_out &p) // copy constructor
+IOP::IOR_out::IOR_out (const ::IOP::IOR_out &p)
   : ptr_ (ACE_const_cast (IOR_out&, p).ptr_)
 {}
 
-ACE_INLINE IOP::IOR_out &
+ACE_INLINE
+IOP::IOR_out &
 IOP::IOR_out::operator= (const ::IOP::IOR_out &p)
 {
   this->ptr_ = ACE_const_cast (IOR_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE IOP::IOR_out &
-IOP::IOR_out::operator= (IOR *p)
+ACE_INLINE
+IOP::IOR_out &
+IOP::IOR_out::operator= (IOR *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -405,188 +442,228 @@ IOP::IOR_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_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CI_
 
-// = Static operations.
-ACE_INLINE IOP::TaggedProfile *
+ACE_INLINE
+IOP::TaggedProfile *
 IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   IOP::TaggedProfile *retval = 0;
   ACE_NEW_RETURN (retval, IOP::TaggedProfile[size], 0);
   return retval;
 }
 
-ACE_INLINE void IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (IOP::TaggedProfile *buffer)
-// Free the sequence.
+ACE_INLINE
+void IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (IOP::TaggedProfile *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) // Default constructor.
+IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void)
 {
 }
 
 ACE_INLINE
-IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum) // Constructor using a maximum length value.
+IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum,
-  CORBA::ULong length,
-  IOP::TaggedProfile *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    IOP::TaggedProfile *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs)
-// Copy constructor.
+IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (
+    const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    IOP::TaggedProfile *tmp1 = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (this->maximum_);
-    IOP::TaggedProfile * const tmp2 = ACE_reinterpret_cast (IOP::TaggedProfile * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      IOP::TaggedProfile *tmp1 =
+        _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (this->maximum_);
+      IOP::TaggedProfile * const tmp2 =
+        ACE_reinterpret_cast (IOP::TaggedProfile * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &
-IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator= (const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs)
-// Assignment operator.
+ACE_INLINE
+IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &
+IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator= (
+    const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      IOP::TaggedProfile *tmp = ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_);
-      _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          IOP::TaggedProfile *tmp =
+            ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  IOP::TaggedProfile *tmp1 = ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_);
-  IOP::TaggedProfile * const tmp2 = ACE_reinterpret_cast (IOP::TaggedProfile * ACE_CAST_CONST, rhs.buffer_);
+  IOP::TaggedProfile *tmp1 =
+    ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_);
+  IOP::TaggedProfile * const tmp2 =
+    ACE_reinterpret_cast (IOP::TaggedProfile * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE IOP::TaggedProfile &
+ACE_INLINE
+IOP::TaggedProfile &
 IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  IOP::TaggedProfile* tmp = ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_);
+  IOP::TaggedProfile* tmp =
+    ACE_reinterpret_cast (IOP::TaggedProfile*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const IOP::TaggedProfile &
+ACE_INLINE
+const IOP::TaggedProfile &
 IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  IOP::TaggedProfile * const tmp = ACE_reinterpret_cast (IOP::TaggedProfile* ACE_CAST_CONST, this->buffer_);
+  IOP::TaggedProfile * const tmp =
+    ACE_reinterpret_cast (IOP::TaggedProfile* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE IOP::TaggedProfile *
+ACE_INLINE
+IOP::TaggedProfile *
 IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::get_buffer (CORBA::Boolean orphan)
 {
   IOP::TaggedProfile *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (IOP::TaggedProfile*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (IOP::TaggedProfile*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const IOP::TaggedProfile *
+ACE_INLINE
+const IOP::TaggedProfile *
 IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const IOP::TaggedProfile * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const IOP::TaggedProfile * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::replace (CORBA::ULong max,
-CORBA::ULong length,
-IOP::TaggedProfile *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IOP::TaggedProfile *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    IOP::TaggedProfile *tmp = ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_);
-    _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp);
-  }
+    {
+      IOP::TaggedProfile *tmp =
+        ACE_reinterpret_cast (IOP::TaggedProfile*, this->buffer_);
+      _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::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 IOP::TaggedComponent_var
 // *************************************************************
 
 ACE_INLINE
-IOP::TaggedComponent_var::TaggedComponent_var (void) // default constructor
+IOP::TaggedComponent_var::TaggedComponent_var (void)
   : ptr_ (0)
 {}
 
@@ -596,42 +673,52 @@ IOP::TaggedComponent_var::TaggedComponent_var (TaggedComponent *p)
 {}
 
 ACE_INLINE
-IOP::TaggedComponent_var::TaggedComponent_var (const ::IOP::TaggedComponent_var &p) // copy constructor
+IOP::TaggedComponent_var::TaggedComponent_var (const ::IOP::TaggedComponent_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::TaggedComponent (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IOP::TaggedComponent (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IOP::TaggedComponent_var::~TaggedComponent_var (void) // destructor
+IOP::TaggedComponent_var::~TaggedComponent_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IOP::TaggedComponent_var &
-IOP::TaggedComponent_var::operator= (TaggedComponent *p)
+ACE_INLINE
+IOP::TaggedComponent_var &
+IOP::TaggedComponent_var::operator= (TaggedComponent *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::IOP::TaggedComponent_var &
-IOP::TaggedComponent_var::operator= (const ::IOP::TaggedComponent_var &p)
+ACE_INLINE
+::IOP::TaggedComponent_var &
+IOP::TaggedComponent_var::operator= (const ::IOP::TaggedComponent_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
         {
-          TaggedComponent *deep_copy =
-            new TaggedComponent (*p.ptr_);
+          TaggedComponent *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              TaggedComponent (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -676,7 +763,7 @@ IOP::TaggedComponent_var::operator ::IOP::TaggedComponent &() const // cast
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IOP::TaggedComponent_var::operator ::IOP::TaggedComponent *&() // cast 
 {
@@ -695,7 +782,7 @@ IOP::TaggedComponent_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::IOP::TaggedComponent *&
 IOP::TaggedComponent_var::out (void)
 {
@@ -718,6 +805,9 @@ IOP::TaggedComponent_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 IOP::TaggedComponent_out
 // *************************************************************
@@ -730,7 +820,7 @@ IOP::TaggedComponent_out::TaggedComponent_out (::IOP::TaggedComponent *&p)
 }
 
 ACE_INLINE
-IOP::TaggedComponent_out::TaggedComponent_out (TaggedComponent_var &p) // constructor from _var
+IOP::TaggedComponent_out::TaggedComponent_out (TaggedComponent_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -738,21 +828,23 @@ IOP::TaggedComponent_out::TaggedComponent_out (TaggedComponent_var &p) // constr
 }
 
 ACE_INLINE
-IOP::TaggedComponent_out::TaggedComponent_out (const ::IOP::TaggedComponent_out &p) // copy constructor
+IOP::TaggedComponent_out::TaggedComponent_out (const ::IOP::TaggedComponent_out &p)
   : ptr_ (ACE_const_cast (TaggedComponent_out&, p).ptr_)
 {}
 
-ACE_INLINE IOP::TaggedComponent_out &
+ACE_INLINE
+IOP::TaggedComponent_out &
 IOP::TaggedComponent_out::operator= (const ::IOP::TaggedComponent_out &p)
 {
   this->ptr_ = ACE_const_cast (TaggedComponent_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE IOP::TaggedComponent_out &
-IOP::TaggedComponent_out::operator= (TaggedComponent *p)
+ACE_INLINE
+IOP::TaggedComponent_out &
+IOP::TaggedComponent_out::operator= (TaggedComponent *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -774,192 +866,231 @@ IOP::TaggedComponent_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_IOP_MULTIPLECOMPONENTPROFILE_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CI_
 
-// = Static operations.
-ACE_INLINE IOP::TaggedComponent *
+ACE_INLINE
+IOP::TaggedComponent *
 IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   IOP::TaggedComponent *retval = 0;
   ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0);
   return retval;
 }
 
-ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (IOP::TaggedComponent *buffer)
-// Free the sequence.
+ACE_INLINE
+void IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (IOP::TaggedComponent *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) // Default constructor.
+IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void)
 {
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum) // Constructor using a maximum length value.
+IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum,
-  CORBA::ULong length,
-  IOP::TaggedComponent *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    IOP::TaggedComponent *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs)
-// Copy constructor.
+IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (
+    const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (this->maximum_);
-    IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      IOP::TaggedComponent *tmp1 =
+        _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (this->maximum_);
+      IOP::TaggedComponent * const tmp2 =
+        ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &
-IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator= (const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs)
-// Assignment operator.
+ACE_INLINE
+IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &
+IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator= (
+    const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
-      _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          IOP::TaggedComponent *tmp =
+            ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  IOP::TaggedComponent *tmp1 = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
-  IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
+  IOP::TaggedComponent *tmp1 =
+    ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
+  IOP::TaggedComponent * const tmp2 =
+    ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE IOP::TaggedComponent &
+ACE_INLINE
+IOP::TaggedComponent &
 IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
+  IOP::TaggedComponent* tmp =
+    ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const IOP::TaggedComponent &
+ACE_INLINE
+const IOP::TaggedComponent &
 IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  IOP::TaggedComponent * const tmp = ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_);
+  IOP::TaggedComponent * const tmp =
+    ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE IOP::TaggedComponent *
+ACE_INLINE
+IOP::TaggedComponent *
 IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::get_buffer (CORBA::Boolean orphan)
 {
   IOP::TaggedComponent *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const IOP::TaggedComponent *
+ACE_INLINE
+const IOP::TaggedComponent *
 IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::replace (CORBA::ULong max,
-CORBA::ULong length,
-IOP::TaggedComponent *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IOP::TaggedComponent *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    IOP::TaggedComponent *tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
-    _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp);
-  }
+    {
+      IOP::TaggedComponent *tmp =
+        ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
+      _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CI_)
 #define _IOP_MULTIPLECOMPONENTPROFILE_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class IOP::MultipleComponentProfile_var
 // *************************************************************
 
 ACE_INLINE
-IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (void) // default constructor
+IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (void)
   : ptr_ (0)
 {}
 
@@ -969,21 +1100,26 @@ IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (MultipleCompone
 {}
 
 ACE_INLINE
-IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (const ::IOP::MultipleComponentProfile_var &p) // copy constructor
+IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (const ::IOP::MultipleComponentProfile_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::MultipleComponentProfile (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IOP::MultipleComponentProfile (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IOP::MultipleComponentProfile_var::~MultipleComponentProfile_var (void) // destructor
+IOP::MultipleComponentProfile_var::~MultipleComponentProfile_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IOP::MultipleComponentProfile_var &
+ACE_INLINE
+IOP::MultipleComponentProfile_var &
 IOP::MultipleComponentProfile_var::operator= (MultipleComponentProfile *p)
 {
   delete this->ptr_;
@@ -991,7 +1127,8 @@ IOP::MultipleComponentProfile_var::operator= (MultipleComponentProfile *p)
   return *this;
 }
 
-ACE_INLINE ::IOP::MultipleComponentProfile_var &
+ACE_INLINE
+::IOP::MultipleComponentProfile_var &
 IOP::MultipleComponentProfile_var::operator= (const ::IOP::MultipleComponentProfile_var &p)
 {
   if (this != &p)
@@ -1003,8 +1140,12 @@ IOP::MultipleComponentProfile_var::operator= (const ::IOP::MultipleComponentProf
         }
       else
         {
-          MultipleComponentProfile *deep_copy =
-            new MultipleComponentProfile (*p.ptr_);
+          MultipleComponentProfile *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              MultipleComponentProfile (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1019,69 +1160,75 @@ IOP::MultipleComponentProfile_var::operator= (const ::IOP::MultipleComponentProf
   return *this;
 }
 
-ACE_INLINE const ::IOP::MultipleComponentProfile *
+ACE_INLINE
+const ::IOP::MultipleComponentProfile *
 IOP::MultipleComponentProfile_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::MultipleComponentProfile *
+ACE_INLINE
+::IOP::MultipleComponentProfile *
 IOP::MultipleComponentProfile_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::MultipleComponentProfile_var::operator const ::IOP::MultipleComponentProfile &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::MultipleComponentProfile_var::operator ::IOP::MultipleComponentProfile &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::MultipleComponentProfile_var::operator ::IOP::MultipleComponentProfile &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IOP::MultipleComponentProfile_var::operator ::IOP::MultipleComponentProfile *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE IOP::TaggedComponent &
+ACE_INLINE
+IOP::TaggedComponent &
 IOP::MultipleComponentProfile_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const IOP::TaggedComponent &
+ACE_INLINE
+const IOP::TaggedComponent &
 IOP::MultipleComponentProfile_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const IOP::TaggedComponent &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::IOP::MultipleComponentProfile &
+ACE_INLINE
+const ::IOP::MultipleComponentProfile &
 IOP::MultipleComponentProfile_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::IOP::MultipleComponentProfile &
+ACE_INLINE
+::IOP::MultipleComponentProfile &
 IOP::MultipleComponentProfile_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::IOP::MultipleComponentProfile *&
+ACE_INLINE
+::IOP::MultipleComponentProfile *&
 IOP::MultipleComponentProfile_var::out (void)
 {
   delete this->ptr_;
@@ -1089,7 +1236,8 @@ IOP::MultipleComponentProfile_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::MultipleComponentProfile *
+ACE_INLINE
+::IOP::MultipleComponentProfile *
 IOP::MultipleComponentProfile_var::_retn (void)
 {
   ::IOP::MultipleComponentProfile *tmp = this->ptr_;
@@ -1097,12 +1245,16 @@ IOP::MultipleComponentProfile_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::IOP::MultipleComponentProfile *
+ACE_INLINE
+::IOP::MultipleComponentProfile *
 IOP::MultipleComponentProfile_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 IOP::MultipleComponentProfile_out
 // *************************************************************
@@ -1115,7 +1267,7 @@ IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (MultipleCompone
 }
 
 ACE_INLINE
-IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (MultipleComponentProfile_var &p) // constructor from _var
+IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (MultipleComponentProfile_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1123,237 +1275,280 @@ IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (MultipleCompone
 }
 
 ACE_INLINE
-IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (const ::IOP::MultipleComponentProfile_out &p) // copy constructor
+IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (const ::IOP::MultipleComponentProfile_out &p)
   : ptr_ (ACE_const_cast (MultipleComponentProfile_out&, p).ptr_)
 {}
 
-ACE_INLINE ::IOP::MultipleComponentProfile_out &
+ACE_INLINE
+::IOP::MultipleComponentProfile_out &
 IOP::MultipleComponentProfile_out::operator= (const ::IOP::MultipleComponentProfile_out &p)
 {
   this->ptr_ = ACE_const_cast (MultipleComponentProfile_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::IOP::MultipleComponentProfile_out &
+ACE_INLINE
+::IOP::MultipleComponentProfile_out &
 IOP::MultipleComponentProfile_out::operator= (MultipleComponentProfile *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::MultipleComponentProfile_out::operator ::IOP::MultipleComponentProfile *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::MultipleComponentProfile *&
+ACE_INLINE
+::IOP::MultipleComponentProfile *&
 IOP::MultipleComponentProfile_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::MultipleComponentProfile *
+ACE_INLINE
+::IOP::MultipleComponentProfile *
 IOP::MultipleComponentProfile_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE IOP::TaggedComponent &
+ACE_INLINE
+IOP::TaggedComponent &
 IOP::MultipleComponentProfile_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_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CI_
 
-// = Static operations.
-ACE_INLINE IOP::TaggedComponent *
+ACE_INLINE
+IOP::TaggedComponent *
 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   IOP::TaggedComponent *retval = 0;
   ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0);
   return retval;
 }
 
-ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (IOP::TaggedComponent *buffer)
-// Free the sequence.
+ACE_INLINE
+void IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (IOP::TaggedComponent *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) // Default constructor.
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void)
 {
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum) // Constructor using a maximum length value.
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum,
-  CORBA::ULong length,
-  IOP::TaggedComponent *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    IOP::TaggedComponent *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs)
-// Copy constructor.
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (
+    const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (this->maximum_);
-    IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      IOP::TaggedComponent *tmp1 =
+        _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (this->maximum_);
+      IOP::TaggedComponent * const tmp2 =
+        ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList &
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator= (const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs)
-// Assignment operator.
+ACE_INLINE
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList &
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator= (
+    const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
-      _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          IOP::TaggedComponent *tmp =
+            ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  IOP::TaggedComponent *tmp1 = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
-  IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
+  IOP::TaggedComponent *tmp1 =
+    ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
+  IOP::TaggedComponent * const tmp2 =
+    ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE IOP::TaggedComponent &
+ACE_INLINE
+IOP::TaggedComponent &
 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
+  IOP::TaggedComponent* tmp =
+    ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const IOP::TaggedComponent &
+ACE_INLINE
+const IOP::TaggedComponent &
 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  IOP::TaggedComponent * const tmp = ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_);
+  IOP::TaggedComponent * const tmp =
+    ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE IOP::TaggedComponent *
+ACE_INLINE
+IOP::TaggedComponent *
 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::get_buffer (CORBA::Boolean orphan)
 {
   IOP::TaggedComponent *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const IOP::TaggedComponent *
+ACE_INLINE
+const IOP::TaggedComponent *
 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::replace (CORBA::ULong max,
-CORBA::ULong length,
-IOP::TaggedComponent *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IOP::TaggedComponent *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    IOP::TaggedComponent *tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
-    _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp);
-  }
+    {
+      IOP::TaggedComponent *tmp =
+        ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
+      _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CI_)
 #define _IOP_TAGGEDCOMPONENTLIST_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class IOP::TaggedComponentList_var
 // *************************************************************
 
 ACE_INLINE
-IOP::TaggedComponentList_var::TaggedComponentList_var (void) // default constructor
+IOP::TaggedComponentList_var::TaggedComponentList_var (void)
   : ptr_ (0)
 {}
 
@@ -1363,21 +1558,26 @@ IOP::TaggedComponentList_var::TaggedComponentList_var (TaggedComponentList *p)
 {}
 
 ACE_INLINE
-IOP::TaggedComponentList_var::TaggedComponentList_var (const ::IOP::TaggedComponentList_var &p) // copy constructor
+IOP::TaggedComponentList_var::TaggedComponentList_var (const ::IOP::TaggedComponentList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::TaggedComponentList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IOP::TaggedComponentList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IOP::TaggedComponentList_var::~TaggedComponentList_var (void) // destructor
+IOP::TaggedComponentList_var::~TaggedComponentList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IOP::TaggedComponentList_var &
+ACE_INLINE
+IOP::TaggedComponentList_var &
 IOP::TaggedComponentList_var::operator= (TaggedComponentList *p)
 {
   delete this->ptr_;
@@ -1385,7 +1585,8 @@ IOP::TaggedComponentList_var::operator= (TaggedComponentList *p)
   return *this;
 }
 
-ACE_INLINE ::IOP::TaggedComponentList_var &
+ACE_INLINE
+::IOP::TaggedComponentList_var &
 IOP::TaggedComponentList_var::operator= (const ::IOP::TaggedComponentList_var &p)
 {
   if (this != &p)
@@ -1397,8 +1598,12 @@ IOP::TaggedComponentList_var::operator= (const ::IOP::TaggedComponentList_var &p
         }
       else
         {
-          TaggedComponentList *deep_copy =
-            new TaggedComponentList (*p.ptr_);
+          TaggedComponentList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              TaggedComponentList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1413,69 +1618,75 @@ IOP::TaggedComponentList_var::operator= (const ::IOP::TaggedComponentList_var &p
   return *this;
 }
 
-ACE_INLINE const ::IOP::TaggedComponentList *
+ACE_INLINE
+const ::IOP::TaggedComponentList *
 IOP::TaggedComponentList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::TaggedComponentList *
+ACE_INLINE
+::IOP::TaggedComponentList *
 IOP::TaggedComponentList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::TaggedComponentList_var::operator const ::IOP::TaggedComponentList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::TaggedComponentList_var::operator ::IOP::TaggedComponentList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::TaggedComponentList_var::operator ::IOP::TaggedComponentList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IOP::TaggedComponentList_var::operator ::IOP::TaggedComponentList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE IOP::TaggedComponent &
+ACE_INLINE
+IOP::TaggedComponent &
 IOP::TaggedComponentList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const IOP::TaggedComponent &
+ACE_INLINE
+const IOP::TaggedComponent &
 IOP::TaggedComponentList_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const IOP::TaggedComponent &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::IOP::TaggedComponentList &
+ACE_INLINE
+const ::IOP::TaggedComponentList &
 IOP::TaggedComponentList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::IOP::TaggedComponentList &
+ACE_INLINE
+::IOP::TaggedComponentList &
 IOP::TaggedComponentList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::IOP::TaggedComponentList *&
+ACE_INLINE
+::IOP::TaggedComponentList *&
 IOP::TaggedComponentList_var::out (void)
 {
   delete this->ptr_;
@@ -1483,7 +1694,8 @@ IOP::TaggedComponentList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::TaggedComponentList *
+ACE_INLINE
+::IOP::TaggedComponentList *
 IOP::TaggedComponentList_var::_retn (void)
 {
   ::IOP::TaggedComponentList *tmp = this->ptr_;
@@ -1491,12 +1703,16 @@ IOP::TaggedComponentList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::IOP::TaggedComponentList *
+ACE_INLINE
+::IOP::TaggedComponentList *
 IOP::TaggedComponentList_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 IOP::TaggedComponentList_out
 // *************************************************************
@@ -1509,7 +1725,7 @@ IOP::TaggedComponentList_out::TaggedComponentList_out (TaggedComponentList *&p)
 }
 
 ACE_INLINE
-IOP::TaggedComponentList_out::TaggedComponentList_out (TaggedComponentList_var &p) // constructor from _var
+IOP::TaggedComponentList_out::TaggedComponentList_out (TaggedComponentList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1517,237 +1733,280 @@ IOP::TaggedComponentList_out::TaggedComponentList_out (TaggedComponentList_var &
 }
 
 ACE_INLINE
-IOP::TaggedComponentList_out::TaggedComponentList_out (const ::IOP::TaggedComponentList_out &p) // copy constructor
+IOP::TaggedComponentList_out::TaggedComponentList_out (const ::IOP::TaggedComponentList_out &p)
   : ptr_ (ACE_const_cast (TaggedComponentList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::IOP::TaggedComponentList_out &
+ACE_INLINE
+::IOP::TaggedComponentList_out &
 IOP::TaggedComponentList_out::operator= (const ::IOP::TaggedComponentList_out &p)
 {
   this->ptr_ = ACE_const_cast (TaggedComponentList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::IOP::TaggedComponentList_out &
+ACE_INLINE
+::IOP::TaggedComponentList_out &
 IOP::TaggedComponentList_out::operator= (TaggedComponentList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::TaggedComponentList_out::operator ::IOP::TaggedComponentList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::TaggedComponentList *&
+ACE_INLINE
+::IOP::TaggedComponentList *&
 IOP::TaggedComponentList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::TaggedComponentList *
+ACE_INLINE
+::IOP::TaggedComponentList *
 IOP::TaggedComponentList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE IOP::TaggedComponent &
+ACE_INLINE
+IOP::TaggedComponent &
 IOP::TaggedComponentList_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_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CI_
 
-// = Static operations.
-ACE_INLINE IOP::TaggedComponent *
+ACE_INLINE
+IOP::TaggedComponent *
 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   IOP::TaggedComponent *retval = 0;
   ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0);
   return retval;
 }
 
-ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (IOP::TaggedComponent *buffer)
-// Free the sequence.
+ACE_INLINE
+void IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (IOP::TaggedComponent *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void) // Default constructor.
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void)
 {
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  IOP::TaggedComponent *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    IOP::TaggedComponent *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs)
-// Copy constructor.
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (
+    const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (this->maximum_);
-    IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      IOP::TaggedComponent *tmp1 =
+        _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (this->maximum_);
+      IOP::TaggedComponent * const tmp2 =
+        ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator= (const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs)
-// Assignment operator.
+ACE_INLINE
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator= (
+    const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
-      _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          IOP::TaggedComponent *tmp =
+            ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  IOP::TaggedComponent *tmp1 = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
-  IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
+  IOP::TaggedComponent *tmp1 =
+    ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
+  IOP::TaggedComponent * const tmp2 =
+    ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE IOP::TaggedComponent &
+ACE_INLINE
+IOP::TaggedComponent &
 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
+  IOP::TaggedComponent* tmp =
+    ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const IOP::TaggedComponent &
+ACE_INLINE
+const IOP::TaggedComponent &
 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  IOP::TaggedComponent * const tmp = ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_);
+  IOP::TaggedComponent * const tmp =
+    ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE IOP::TaggedComponent *
+ACE_INLINE
+IOP::TaggedComponent *
 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::get_buffer (CORBA::Boolean orphan)
 {
   IOP::TaggedComponent *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const IOP::TaggedComponent *
+ACE_INLINE
+const IOP::TaggedComponent *
 IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::replace (CORBA::ULong max,
-CORBA::ULong length,
-IOP::TaggedComponent *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IOP::TaggedComponent *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    IOP::TaggedComponent *tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
-    _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp);
-  }
+    {
+      IOP::TaggedComponent *tmp =
+        ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
+      _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CI_)
 #define _IOP_TAGGEDCOMPONENTSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class IOP::TaggedComponentSeq_var
 // *************************************************************
 
 ACE_INLINE
-IOP::TaggedComponentSeq_var::TaggedComponentSeq_var (void) // default constructor
+IOP::TaggedComponentSeq_var::TaggedComponentSeq_var (void)
   : ptr_ (0)
 {}
 
@@ -1757,21 +2016,26 @@ IOP::TaggedComponentSeq_var::TaggedComponentSeq_var (TaggedComponentSeq *p)
 {}
 
 ACE_INLINE
-IOP::TaggedComponentSeq_var::TaggedComponentSeq_var (const ::IOP::TaggedComponentSeq_var &p) // copy constructor
+IOP::TaggedComponentSeq_var::TaggedComponentSeq_var (const ::IOP::TaggedComponentSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::TaggedComponentSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IOP::TaggedComponentSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IOP::TaggedComponentSeq_var::~TaggedComponentSeq_var (void) // destructor
+IOP::TaggedComponentSeq_var::~TaggedComponentSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IOP::TaggedComponentSeq_var &
+ACE_INLINE
+IOP::TaggedComponentSeq_var &
 IOP::TaggedComponentSeq_var::operator= (TaggedComponentSeq *p)
 {
   delete this->ptr_;
@@ -1779,7 +2043,8 @@ IOP::TaggedComponentSeq_var::operator= (TaggedComponentSeq *p)
   return *this;
 }
 
-ACE_INLINE ::IOP::TaggedComponentSeq_var &
+ACE_INLINE
+::IOP::TaggedComponentSeq_var &
 IOP::TaggedComponentSeq_var::operator= (const ::IOP::TaggedComponentSeq_var &p)
 {
   if (this != &p)
@@ -1791,8 +2056,12 @@ IOP::TaggedComponentSeq_var::operator= (const ::IOP::TaggedComponentSeq_var &p)
         }
       else
         {
-          TaggedComponentSeq *deep_copy =
-            new TaggedComponentSeq (*p.ptr_);
+          TaggedComponentSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              TaggedComponentSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1807,69 +2076,75 @@ IOP::TaggedComponentSeq_var::operator= (const ::IOP::TaggedComponentSeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::IOP::TaggedComponentSeq *
+ACE_INLINE
+const ::IOP::TaggedComponentSeq *
 IOP::TaggedComponentSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::TaggedComponentSeq *
+ACE_INLINE
+::IOP::TaggedComponentSeq *
 IOP::TaggedComponentSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::TaggedComponentSeq_var::operator const ::IOP::TaggedComponentSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::TaggedComponentSeq_var::operator ::IOP::TaggedComponentSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::TaggedComponentSeq_var::operator ::IOP::TaggedComponentSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IOP::TaggedComponentSeq_var::operator ::IOP::TaggedComponentSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE IOP::TaggedComponent &
+ACE_INLINE
+IOP::TaggedComponent &
 IOP::TaggedComponentSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const IOP::TaggedComponent &
+ACE_INLINE
+const IOP::TaggedComponent &
 IOP::TaggedComponentSeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const IOP::TaggedComponent &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::IOP::TaggedComponentSeq &
+ACE_INLINE
+const ::IOP::TaggedComponentSeq &
 IOP::TaggedComponentSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::IOP::TaggedComponentSeq &
+ACE_INLINE
+::IOP::TaggedComponentSeq &
 IOP::TaggedComponentSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::IOP::TaggedComponentSeq *&
+ACE_INLINE
+::IOP::TaggedComponentSeq *&
 IOP::TaggedComponentSeq_var::out (void)
 {
   delete this->ptr_;
@@ -1877,7 +2152,8 @@ IOP::TaggedComponentSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::TaggedComponentSeq *
+ACE_INLINE
+::IOP::TaggedComponentSeq *
 IOP::TaggedComponentSeq_var::_retn (void)
 {
   ::IOP::TaggedComponentSeq *tmp = this->ptr_;
@@ -1885,12 +2161,16 @@ IOP::TaggedComponentSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::IOP::TaggedComponentSeq *
+ACE_INLINE
+::IOP::TaggedComponentSeq *
 IOP::TaggedComponentSeq_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 IOP::TaggedComponentSeq_out
 // *************************************************************
@@ -1903,7 +2183,7 @@ IOP::TaggedComponentSeq_out::TaggedComponentSeq_out (TaggedComponentSeq *&p)
 }
 
 ACE_INLINE
-IOP::TaggedComponentSeq_out::TaggedComponentSeq_out (TaggedComponentSeq_var &p) // constructor from _var
+IOP::TaggedComponentSeq_out::TaggedComponentSeq_out (TaggedComponentSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1911,57 +2191,64 @@ IOP::TaggedComponentSeq_out::TaggedComponentSeq_out (TaggedComponentSeq_var &p)
 }
 
 ACE_INLINE
-IOP::TaggedComponentSeq_out::TaggedComponentSeq_out (const ::IOP::TaggedComponentSeq_out &p) // copy constructor
+IOP::TaggedComponentSeq_out::TaggedComponentSeq_out (const ::IOP::TaggedComponentSeq_out &p)
   : ptr_ (ACE_const_cast (TaggedComponentSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::IOP::TaggedComponentSeq_out &
+ACE_INLINE
+::IOP::TaggedComponentSeq_out &
 IOP::TaggedComponentSeq_out::operator= (const ::IOP::TaggedComponentSeq_out &p)
 {
   this->ptr_ = ACE_const_cast (TaggedComponentSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::IOP::TaggedComponentSeq_out &
+ACE_INLINE
+::IOP::TaggedComponentSeq_out &
 IOP::TaggedComponentSeq_out::operator= (TaggedComponentSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::TaggedComponentSeq_out::operator ::IOP::TaggedComponentSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::TaggedComponentSeq *&
+ACE_INLINE
+::IOP::TaggedComponentSeq *&
 IOP::TaggedComponentSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::TaggedComponentSeq *
+ACE_INLINE
+::IOP::TaggedComponentSeq *
 IOP::TaggedComponentSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE IOP::TaggedComponent &
+ACE_INLINE
+IOP::TaggedComponent &
 IOP::TaggedComponentSeq_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 IOP::ServiceContext_var
 // *************************************************************
 
 ACE_INLINE
-IOP::ServiceContext_var::ServiceContext_var (void) // default constructor
+IOP::ServiceContext_var::ServiceContext_var (void)
   : ptr_ (0)
 {}
 
@@ -1971,42 +2258,52 @@ IOP::ServiceContext_var::ServiceContext_var (ServiceContext *p)
 {}
 
 ACE_INLINE
-IOP::ServiceContext_var::ServiceContext_var (const ::IOP::ServiceContext_var &p) // copy constructor
+IOP::ServiceContext_var::ServiceContext_var (const ::IOP::ServiceContext_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::ServiceContext (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IOP::ServiceContext (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IOP::ServiceContext_var::~ServiceContext_var (void) // destructor
+IOP::ServiceContext_var::~ServiceContext_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IOP::ServiceContext_var &
-IOP::ServiceContext_var::operator= (ServiceContext *p)
+ACE_INLINE
+IOP::ServiceContext_var &
+IOP::ServiceContext_var::operator= (ServiceContext *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::IOP::ServiceContext_var &
-IOP::ServiceContext_var::operator= (const ::IOP::ServiceContext_var &p)
+ACE_INLINE
+::IOP::ServiceContext_var &
+IOP::ServiceContext_var::operator= (const ::IOP::ServiceContext_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
         {
-          ServiceContext *deep_copy =
-            new ServiceContext (*p.ptr_);
+          ServiceContext *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ServiceContext (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -2051,7 +2348,7 @@ IOP::ServiceContext_var::operator ::IOP::ServiceContext &() const // cast
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IOP::ServiceContext_var::operator ::IOP::ServiceContext *&() // cast 
 {
@@ -2070,7 +2367,7 @@ IOP::ServiceContext_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::IOP::ServiceContext *&
 IOP::ServiceContext_var::out (void)
 {
@@ -2093,6 +2390,9 @@ IOP::ServiceContext_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 IOP::ServiceContext_out
 // *************************************************************
@@ -2105,7 +2405,7 @@ IOP::ServiceContext_out::ServiceContext_out (::IOP::ServiceContext *&p)
 }
 
 ACE_INLINE
-IOP::ServiceContext_out::ServiceContext_out (ServiceContext_var &p) // constructor from _var
+IOP::ServiceContext_out::ServiceContext_out (ServiceContext_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -2113,21 +2413,23 @@ IOP::ServiceContext_out::ServiceContext_out (ServiceContext_var &p) // construct
 }
 
 ACE_INLINE
-IOP::ServiceContext_out::ServiceContext_out (const ::IOP::ServiceContext_out &p) // copy constructor
+IOP::ServiceContext_out::ServiceContext_out (const ::IOP::ServiceContext_out &p)
   : ptr_ (ACE_const_cast (ServiceContext_out&, p).ptr_)
 {}
 
-ACE_INLINE IOP::ServiceContext_out &
+ACE_INLINE
+IOP::ServiceContext_out &
 IOP::ServiceContext_out::operator= (const ::IOP::ServiceContext_out &p)
 {
   this->ptr_ = ACE_const_cast (ServiceContext_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE IOP::ServiceContext_out &
-IOP::ServiceContext_out::operator= (ServiceContext *p)
+ACE_INLINE
+IOP::ServiceContext_out &
+IOP::ServiceContext_out::operator= (ServiceContext *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -2149,192 +2451,231 @@ IOP::ServiceContext_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_IOP_SERVICECONTEXTLIST_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CI_
 
-// = Static operations.
-ACE_INLINE IOP::ServiceContext *
+ACE_INLINE
+IOP::ServiceContext *
 IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   IOP::ServiceContext *retval = 0;
   ACE_NEW_RETURN (retval, IOP::ServiceContext[size], 0);
   return retval;
 }
 
-ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (IOP::ServiceContext *buffer)
-// Free the sequence.
+ACE_INLINE
+void IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (IOP::ServiceContext *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) // Default constructor.
+IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (void)
 {
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum) // Constructor using a maximum length value.
+IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum,
-  CORBA::ULong length,
-  IOP::ServiceContext *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    IOP::ServiceContext *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs)
-// Copy constructor.
+IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (
+    const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    IOP::ServiceContext *tmp1 = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (this->maximum_);
-    IOP::ServiceContext * const tmp2 = ACE_reinterpret_cast (IOP::ServiceContext * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      IOP::ServiceContext *tmp1 =
+        _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (this->maximum_);
+      IOP::ServiceContext * const tmp2 =
+        ACE_reinterpret_cast (IOP::ServiceContext * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList &
-IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator= (const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs)
-// Assignment operator.
+ACE_INLINE
+IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList &
+IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator= (
+    const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      IOP::ServiceContext *tmp = ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_);
-      _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          IOP::ServiceContext *tmp =
+            ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  IOP::ServiceContext *tmp1 = ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_);
-  IOP::ServiceContext * const tmp2 = ACE_reinterpret_cast (IOP::ServiceContext * ACE_CAST_CONST, rhs.buffer_);
+  IOP::ServiceContext *tmp1 =
+    ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_);
+  IOP::ServiceContext * const tmp2 =
+    ACE_reinterpret_cast (IOP::ServiceContext * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE IOP::ServiceContext &
+ACE_INLINE
+IOP::ServiceContext &
 IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  IOP::ServiceContext* tmp = ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_);
+  IOP::ServiceContext* tmp =
+    ACE_reinterpret_cast (IOP::ServiceContext*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const IOP::ServiceContext &
+ACE_INLINE
+const IOP::ServiceContext &
 IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  IOP::ServiceContext * const tmp = ACE_reinterpret_cast (IOP::ServiceContext* ACE_CAST_CONST, this->buffer_);
+  IOP::ServiceContext * const tmp =
+    ACE_reinterpret_cast (IOP::ServiceContext* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE IOP::ServiceContext *
+ACE_INLINE
+IOP::ServiceContext *
 IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::get_buffer (CORBA::Boolean orphan)
 {
   IOP::ServiceContext *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (IOP::ServiceContext*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (IOP::ServiceContext*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const IOP::ServiceContext *
+ACE_INLINE
+const IOP::ServiceContext *
 IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const IOP::ServiceContext * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const IOP::ServiceContext * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::replace (CORBA::ULong max,
-CORBA::ULong length,
-IOP::ServiceContext *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    IOP::ServiceContext *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    IOP::ServiceContext *tmp = ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_);
-    _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp);
-  }
+    {
+      IOP::ServiceContext *tmp =
+        ACE_reinterpret_cast (IOP::ServiceContext*, this->buffer_);
+      _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_SERVICECONTEXTLIST_CI_)
 #define _IOP_SERVICECONTEXTLIST_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class IOP::ServiceContextList_var
 // *************************************************************
 
 ACE_INLINE
-IOP::ServiceContextList_var::ServiceContextList_var (void) // default constructor
+IOP::ServiceContextList_var::ServiceContextList_var (void)
   : ptr_ (0)
 {}
 
@@ -2344,21 +2685,26 @@ IOP::ServiceContextList_var::ServiceContextList_var (ServiceContextList *p)
 {}
 
 ACE_INLINE
-IOP::ServiceContextList_var::ServiceContextList_var (const ::IOP::ServiceContextList_var &p) // copy constructor
+IOP::ServiceContextList_var::ServiceContextList_var (const ::IOP::ServiceContextList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::ServiceContextList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IOP::ServiceContextList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-IOP::ServiceContextList_var::~ServiceContextList_var (void) // destructor
+IOP::ServiceContextList_var::~ServiceContextList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IOP::ServiceContextList_var &
+ACE_INLINE
+IOP::ServiceContextList_var &
 IOP::ServiceContextList_var::operator= (ServiceContextList *p)
 {
   delete this->ptr_;
@@ -2366,7 +2712,8 @@ IOP::ServiceContextList_var::operator= (ServiceContextList *p)
   return *this;
 }
 
-ACE_INLINE ::IOP::ServiceContextList_var &
+ACE_INLINE
+::IOP::ServiceContextList_var &
 IOP::ServiceContextList_var::operator= (const ::IOP::ServiceContextList_var &p)
 {
   if (this != &p)
@@ -2378,8 +2725,12 @@ IOP::ServiceContextList_var::operator= (const ::IOP::ServiceContextList_var &p)
         }
       else
         {
-          ServiceContextList *deep_copy =
-            new ServiceContextList (*p.ptr_);
+          ServiceContextList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ServiceContextList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -2394,69 +2745,75 @@ IOP::ServiceContextList_var::operator= (const ::IOP::ServiceContextList_var &p)
   return *this;
 }
 
-ACE_INLINE const ::IOP::ServiceContextList *
+ACE_INLINE
+const ::IOP::ServiceContextList *
 IOP::ServiceContextList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::ServiceContextList *
+ACE_INLINE
+::IOP::ServiceContextList *
 IOP::ServiceContextList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::ServiceContextList_var::operator const ::IOP::ServiceContextList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::ServiceContextList_var::operator ::IOP::ServiceContextList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::ServiceContextList_var::operator ::IOP::ServiceContextList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 IOP::ServiceContextList_var::operator ::IOP::ServiceContextList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE IOP::ServiceContext &
+ACE_INLINE
+IOP::ServiceContext &
 IOP::ServiceContextList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const IOP::ServiceContext &
+ACE_INLINE
+const IOP::ServiceContext &
 IOP::ServiceContextList_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const IOP::ServiceContext &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::IOP::ServiceContextList &
+ACE_INLINE
+const ::IOP::ServiceContextList &
 IOP::ServiceContextList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::IOP::ServiceContextList &
+ACE_INLINE
+::IOP::ServiceContextList &
 IOP::ServiceContextList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::IOP::ServiceContextList *&
+ACE_INLINE
+::IOP::ServiceContextList *&
 IOP::ServiceContextList_var::out (void)
 {
   delete this->ptr_;
@@ -2464,7 +2821,8 @@ IOP::ServiceContextList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::ServiceContextList *
+ACE_INLINE
+::IOP::ServiceContextList *
 IOP::ServiceContextList_var::_retn (void)
 {
   ::IOP::ServiceContextList *tmp = this->ptr_;
@@ -2472,12 +2830,16 @@ IOP::ServiceContextList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::IOP::ServiceContextList *
+ACE_INLINE
+::IOP::ServiceContextList *
 IOP::ServiceContextList_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 IOP::ServiceContextList_out
 // *************************************************************
@@ -2490,7 +2852,7 @@ IOP::ServiceContextList_out::ServiceContextList_out (ServiceContextList *&p)
 }
 
 ACE_INLINE
-IOP::ServiceContextList_out::ServiceContextList_out (ServiceContextList_var &p) // constructor from _var
+IOP::ServiceContextList_out::ServiceContextList_out (ServiceContextList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -2498,76 +2860,79 @@ IOP::ServiceContextList_out::ServiceContextList_out (ServiceContextList_var &p)
 }
 
 ACE_INLINE
-IOP::ServiceContextList_out::ServiceContextList_out (const ::IOP::ServiceContextList_out &p) // copy constructor
+IOP::ServiceContextList_out::ServiceContextList_out (const ::IOP::ServiceContextList_out &p)
   : ptr_ (ACE_const_cast (ServiceContextList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::IOP::ServiceContextList_out &
+ACE_INLINE
+::IOP::ServiceContextList_out &
 IOP::ServiceContextList_out::operator= (const ::IOP::ServiceContextList_out &p)
 {
   this->ptr_ = ACE_const_cast (ServiceContextList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::IOP::ServiceContextList_out &
+ACE_INLINE
+::IOP::ServiceContextList_out &
 IOP::ServiceContextList_out::operator= (ServiceContextList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IOP::ServiceContextList_out::operator ::IOP::ServiceContextList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::ServiceContextList *&
+ACE_INLINE
+::IOP::ServiceContextList *&
 IOP::ServiceContextList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::IOP::ServiceContextList *
+ACE_INLINE
+::IOP::ServiceContextList *
 IOP::ServiceContextList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE IOP::ServiceContext &
+ACE_INLINE
+IOP::ServiceContext &
 IOP::ServiceContextList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception IOP::Codec::InvalidTypeForEncoding
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception IOP::Codec::FormatMismatch
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception IOP::Codec::TypeMismatch
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_IOP_CODEC___CI_)
 #define _IOP_CODEC___CI_
 
+ACE_INLINE
+CORBA::Boolean
+IOP::Codec::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class IOP::Encoding_var
 // *************************************************************
 
 ACE_INLINE
-IOP::Encoding_var::Encoding_var (void) // default constructor
+IOP::Encoding_var::Encoding_var (void)
   : ptr_ (0)
 {}
 
@@ -2577,15 +2942,19 @@ IOP::Encoding_var::Encoding_var (Encoding *p)
 {}
 
 ACE_INLINE
-IOP::Encoding_var::Encoding_var (const ::IOP::Encoding_var &p) // copy constructor
+IOP::Encoding_var::Encoding_var (const ::IOP::Encoding_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::Encoding (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::IOP::Encoding (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size types only
+// Fixed-size types only.
 ACE_INLINE
 IOP::Encoding_var::Encoding_var (const ::IOP::Encoding &p)
 {
@@ -2593,33 +2962,39 @@ IOP::Encoding_var::Encoding_var (const ::IOP::Encoding &p)
 }
 
 ACE_INLINE
-IOP::Encoding_var::~Encoding_var (void) // destructor
+IOP::Encoding_var::~Encoding_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE IOP::Encoding_var &
-IOP::Encoding_var::operator= (Encoding *p)
+ACE_INLINE
+IOP::Encoding_var &
+IOP::Encoding_var::operator= (Encoding *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::IOP::Encoding_var &
-IOP::Encoding_var::operator= (const ::IOP::Encoding_var &p)
+ACE_INLINE
+::IOP::Encoding_var &
+IOP::Encoding_var::operator= (const ::IOP::Encoding_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
         {
-          Encoding *deep_copy =
-            new Encoding (*p.ptr_);
+          Encoding *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              Encoding (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -2641,8 +3016,13 @@ IOP::Encoding_var::operator= (const ::IOP::Encoding &p)
   if (this->ptr_ != &p)
   {
     delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::Encoding (p), *this);
+    ACE_NEW_RETURN (
+        this->ptr_,
+        ::IOP::Encoding (p),
+        *this
+      );
   }
+  
   return *this;
 }
 
@@ -2707,17 +3087,23 @@ IOP::Encoding_var::ptr (void) const
   return this->ptr_;
 }
 
-// *************************************************************
-// Inline operations for exception IOP::CodecFactory::UnknownEncoding
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_IOP_CODECFACTORY___CI_)
 #define _IOP_CODECFACTORY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+IOP::CodecFactory::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_I_
 #define _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_I_
@@ -2726,6 +3112,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const IOP::TaggedProfile::_tao_seq_Octet &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     IOP::TaggedProfile::_tao_seq_Octet &
@@ -2733,30 +3120,49 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::TaggedProfile &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IOP::TaggedProfile &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.tag) &&
     (strm << _tao_aggregate.profile_data)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::TaggedProfile &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IOP::TaggedProfile &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.tag) &&
     (strm >> _tao_aggregate.profile_data)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_I_
 #define _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_I_
@@ -2765,6 +3171,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const IOP::IOR::_tao_seq_TaggedProfile &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     IOP::IOR::_tao_seq_TaggedProfile &
@@ -2772,30 +3179,49 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::IOR &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IOP::IOR &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.type_id.in ()) &&
     (strm << _tao_aggregate.profiles)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::IOR &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IOP::IOR &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.type_id.out ()) &&
     (strm >> _tao_aggregate.profiles)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_I_
 #define _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_I_
@@ -2804,6 +3230,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const IOP::TaggedComponent::_tao_seq_Octet &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     IOP::TaggedComponent::_tao_seq_Octet &
@@ -2811,30 +3238,49 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::TaggedComponent &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IOP::TaggedComponent &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.tag) &&
     (strm << _tao_aggregate.component_data)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::TaggedComponent &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IOP::TaggedComponent &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.tag) &&
     (strm >> _tao_aggregate.component_data)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_IOP_MultipleComponentProfile_I_
 #define _TAO_CDR_OP_IOP_MultipleComponentProfile_I_
@@ -2843,6 +3289,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const IOP::MultipleComponentProfile &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     IOP::MultipleComponentProfile &
@@ -2850,6 +3297,8 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_IOP_TaggedComponentList_I_
 #define _TAO_CDR_OP_IOP_TaggedComponentList_I_
@@ -2858,6 +3307,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const IOP::TaggedComponentList &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     IOP::TaggedComponentList &
@@ -2865,6 +3315,8 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentList_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_IOP_TaggedComponentSeq_I_
 #define _TAO_CDR_OP_IOP_TaggedComponentSeq_I_
@@ -2873,6 +3325,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const IOP::TaggedComponentSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     IOP::TaggedComponentSeq &
@@ -2880,6 +3333,8 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_I_
 #define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_I_
@@ -2888,6 +3343,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const IOP::ServiceContext::_tao_seq_Octet &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     IOP::ServiceContext::_tao_seq_Octet &
@@ -2895,30 +3351,49 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::ServiceContext &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IOP::ServiceContext &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.context_id) &&
     (strm << _tao_aggregate.context_data)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::ServiceContext &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IOP::ServiceContext &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.context_id) &&
     (strm >> _tao_aggregate.context_data)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_IOP_ServiceContextList_I_
 #define _TAO_CDR_OP_IOP_ServiceContextList_I_
@@ -2927,6 +3402,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const IOP::ServiceContextList &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     IOP::ServiceContextList &
@@ -2934,29 +3410,46 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_ServiceContextList_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::Encoding &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IOP::Encoding &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.format) &&
     (strm << CORBA::Any::from_octet (_tao_aggregate.major_version)) &&
     (strm << CORBA::Any::from_octet (_tao_aggregate.minor_version))
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::Encoding &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IOP::Encoding &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.format) &&
     (strm >> CORBA::Any::to_octet (_tao_aggregate.major_version)) &&
     (strm >> CORBA::Any::to_octet (_tao_aggregate.minor_version))
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
diff --git a/TAO/tao/IOPS.cpp b/TAO/tao/IOPS.cpp
index 4e9eaeb6833..767c6acceae 100644
--- a/TAO/tao/IOPS.cpp
+++ b/TAO/tao/IOPS.cpp
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-group.html
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -19,9 +19,38 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:670
+
+#ifndef _TAO_IDL_IOPS_CPP_
+#define _TAO_IDL_IOPS_CPP_
+
+
 #include "IOPS.h"
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Operation_Table.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/ORB_Core.h"
+#include "tao/Stub.h"
+#include "tao/IFR_Client_Adapter.h"
+#include "tao/PortableInterceptor.h"
+#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/RequestInfo_Util.h"
+#include "tao/PICurrent.h"
+#include "tao/PortableServer/ServerRequestInfo.h"
+#include "tao/PortableServer/ServerInterceptorAdapter.h"
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
+#include "ace/Dynamic_Service.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
 #include "IOPS.i"
 #endif /* !defined INLINE */
 
+
+#endif /* ifndef */
diff --git a/TAO/tao/IOPS.h b/TAO/tao/IOPS.h
index a7318d979c8..ac5490b9b0f 100644
--- a/TAO/tao/IOPS.h
+++ b/TAO/tao/IOPS.h
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-group.html
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -19,17 +19,25 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:443
+
 #ifndef _TAO_IDL_IOPS_H_
 #define _TAO_IDL_IOPS_H_
 
-#include "ace/pre.h"
-#include "IOPC.h"
 
+#include "IOPC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/Collocated_Object.h"
+#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
+#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -37,10 +45,25 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
+
 TAO_NAMESPACE  POA_IOP
 {
+  
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
+
 }
-TAO_NAMESPACE_CLOSE
+TAO_NAMESPACE_CLOSE // module IOP
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
 
 #include "IOPS_T.h"
 
@@ -52,5 +75,8 @@ TAO_NAMESPACE_CLOSE
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#include "ace/post.h"
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #endif /* ifndef */
diff --git a/TAO/tao/IOPS.i b/TAO/tao/IOPS.i
index 9d1a42dd508..e86a7e25a26 100644
--- a/TAO/tao/IOPS.i
+++ b/TAO/tao/IOPS.i
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-group.html
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -19,3 +19,4 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
diff --git a/TAO/tao/IOPS_T.cpp b/TAO/tao/IOPS_T.cpp
index e67a27b837d..893f7801e9e 100644
--- a/TAO/tao/IOPS_T.cpp
+++ b/TAO/tao/IOPS_T.cpp
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-group.html
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:777
+
 #ifndef _TAO_IDL_IOPS_T_CPP_
 #define _TAO_IDL_IOPS_T_CPP_
 
diff --git a/TAO/tao/IOPS_T.h b/TAO/tao/IOPS_T.h
index 99d140830b8..b5ab3b15f34 100644
--- a/TAO/tao/IOPS_T.h
+++ b/TAO/tao/IOPS_T.h
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-group.html
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -19,10 +19,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:604
+
 #ifndef _TAO_IDL_IOPS_T_H_
 #define _TAO_IDL_IOPS_T_H_
 
-#include "ace/pre.h"
+
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -31,16 +35,27 @@
 #endif /* _MSC_VER */
 
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+
+#if defined (ACE_HAS_USING_KEYWORD)
+TAO_NAMESPACE  POA_IOP
+{
+}
+TAO_NAMESPACE_CLOSE // module IOP
+#endif /* ACE_HAS_USING_KEYWORD */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
+
 #if defined (__ACE_INLINE__)
 #include "IOPS_T.i"
 #endif /* defined INLINE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "IOPS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #pragma implementation ("IOPS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
@@ -49,5 +64,4 @@
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/IOPS_T.i b/TAO/tao/IOPS_T.i
index 9d1a42dd508..e86a7e25a26 100644
--- a/TAO/tao/IOPS_T.i
+++ b/TAO/tao/IOPS_T.i
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-group.html
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -19,3 +19,4 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
diff --git a/TAO/tao/IORManipulation/IOR.pidl b/TAO/tao/IORManipulation/IOR.pidl
index f9084893267..4a85c3af119 100644
--- a/TAO/tao/IORManipulation/IOR.pidl
+++ b/TAO/tao/IORManipulation/IOR.pidl
@@ -10,12 +10,12 @@
  * To regenerate the code use:
  *
  * tao_idl \
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3 \
+ *        -o orig -Gp -Gd -Ge 1 \
  *          -Wb,export_macro=TAO_IORManip_Export \
  *          -Wb,export_include="ior_manip_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
- *   IOR.idl
+ *   IOR.pidl
  *
  */
 
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index c2f7ab84f80..c0425d312ce 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IORManip_Loader.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "IORManipulation.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,7 +44,9 @@
 #include "IORC.i"
 #endif /* !defined INLINE */
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 TAO_IOP::EmptyProfileList::EmptyProfileList (void)
   : CORBA::UserException (
         "IDL:TAO_IOP/EmptyProfileList:1.0",
@@ -48,12 +55,10 @@ TAO_IOP::EmptyProfileList::EmptyProfileList (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 TAO_IOP::EmptyProfileList::~EmptyProfileList (void)
 {
 }
 
-// Copy constructor.
 TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -62,7 +67,6 @@ TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &
 {
 }
 
-// Assignment operator.
 TAO_IOP::EmptyProfileList&
 TAO_IOP::EmptyProfileList::operator= (const ::TAO_IOP::EmptyProfileList &_tao_excp)
 {
@@ -77,11 +81,11 @@ void TAO_IOP::EmptyProfileList::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 TAO_IOP::EmptyProfileList *
-TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *exc)
+TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (EmptyProfileList *, exc);
+      return ACE_dynamic_cast (EmptyProfileList *, _tao_excp);
     }
   else
     {
@@ -102,13 +106,13 @@ TAO_IOP::EmptyProfileList::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      TAO_IOP::EmptyProfileList (*this),
+      ::TAO_IOP::EmptyProfileList (*this),
       0
     );
   return result;
 }
 
-void TAO_IOP::EmptyProfileList::_raise ()
+void TAO_IOP::EmptyProfileList::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -122,7 +126,7 @@ void TAO_IOP::EmptyProfileList::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -135,31 +139,40 @@ void TAO_IOP::EmptyProfileList::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const
+{
+  return ::TAO_IOP::_tc_EmptyProfileList;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_IOP_EmptyProfileList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x456d7074),
-  ACE_NTOHL (0x7950726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x456d7074), 
+  ACE_NTOHL (0x7950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/EmptyProfileList:1.0
-  17,
-  ACE_NTOHL (0x456d7074),
-  ACE_NTOHL (0x7950726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x4c697374),
+    17,
+  ACE_NTOHL (0x456d7074), 
+  ACE_NTOHL (0x7950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
   ACE_NTOHL (0x0),  // name = EmptyProfileList
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_EmptyProfileList (
     CORBA::tk_except,
@@ -171,17 +184,16 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_EmptyProfileList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_EmptyProfileList, &_tc_TAO_tc_TAO_IOP_EmptyProfileList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_EmptyProfileList,
+    &_tc_TAO_tc_TAO_IOP_EmptyProfileList
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const
-{
-  return ::TAO_IOP::_tc_EmptyProfileList;
-}
-
-// Default constructor.
 TAO_IOP::NotFound::NotFound (void)
   : CORBA::UserException (
         "IDL:TAO_IOP/NotFound:1.0",
@@ -190,12 +202,10 @@ TAO_IOP::NotFound::NotFound (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 TAO_IOP::NotFound::~NotFound (void)
 {
 }
 
-// Copy constructor.
 TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -204,7 +214,6 @@ TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp)
 {
 }
 
-// Assignment operator.
 TAO_IOP::NotFound&
 TAO_IOP::NotFound::operator= (const ::TAO_IOP::NotFound &_tao_excp)
 {
@@ -219,11 +228,11 @@ void TAO_IOP::NotFound::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 TAO_IOP::NotFound *
-TAO_IOP::NotFound::_downcast (CORBA::Exception *exc)
+TAO_IOP::NotFound::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (NotFound *, exc);
+      return ACE_dynamic_cast (NotFound *, _tao_excp);
     }
   else
     {
@@ -244,13 +253,13 @@ TAO_IOP::NotFound::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      TAO_IOP::NotFound (*this),
+      ::TAO_IOP::NotFound (*this),
       0
     );
   return result;
 }
 
-void TAO_IOP::NotFound::_raise ()
+void TAO_IOP::NotFound::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -264,7 +273,7 @@ void TAO_IOP::NotFound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -277,27 +286,36 @@ void TAO_IOP::NotFound::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::NotFound::_type (void) const
+{
+  return ::TAO_IOP::_tc_NotFound;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_IOP_NotFound[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   25,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x4e6f7446),
-  ACE_NTOHL (0x6f756e64),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/NotFound:1.0
-  9,
-  ACE_NTOHL (0x4e6f7446),
-  ACE_NTOHL (0x6f756e64),
+    9,
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
   ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_NotFound (
     CORBA::tk_except,
@@ -309,17 +327,16 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_NotFound (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NotFound, &_tc_TAO_tc_TAO_IOP_NotFound)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_NotFound,
+    &_tc_TAO_tc_TAO_IOP_NotFound
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::NotFound::_type (void) const
-{
-  return ::TAO_IOP::_tc_NotFound;
-}
-
-// Default constructor.
 TAO_IOP::Duplicate::Duplicate (void)
   : CORBA::UserException (
         "IDL:TAO_IOP/Duplicate:1.0",
@@ -328,12 +345,10 @@ TAO_IOP::Duplicate::Duplicate (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 TAO_IOP::Duplicate::~Duplicate (void)
 {
 }
 
-// Copy constructor.
 TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -342,7 +357,6 @@ TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp)
 {
 }
 
-// Assignment operator.
 TAO_IOP::Duplicate&
 TAO_IOP::Duplicate::operator= (const ::TAO_IOP::Duplicate &_tao_excp)
 {
@@ -357,11 +371,11 @@ void TAO_IOP::Duplicate::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 TAO_IOP::Duplicate *
-TAO_IOP::Duplicate::_downcast (CORBA::Exception *exc)
+TAO_IOP::Duplicate::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (Duplicate *, exc);
+      return ACE_dynamic_cast (Duplicate *, _tao_excp);
     }
   else
     {
@@ -382,13 +396,13 @@ TAO_IOP::Duplicate::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      TAO_IOP::Duplicate (*this),
+      ::TAO_IOP::Duplicate (*this),
       0
     );
   return result;
 }
 
-void TAO_IOP::Duplicate::_raise ()
+void TAO_IOP::Duplicate::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -402,7 +416,7 @@ void TAO_IOP::Duplicate::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -415,27 +429,36 @@ void TAO_IOP::Duplicate::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::Duplicate::_type (void) const
+{
+  return ::TAO_IOP::_tc_Duplicate;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_IOP_Duplicate[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   26,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x4475706c),
-  ACE_NTOHL (0x69636174),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/Duplicate:1.0
-  10,
-  ACE_NTOHL (0x4475706c),
-  ACE_NTOHL (0x69636174),
+    10,
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
   ACE_NTOHL (0x65000000),  // name = Duplicate
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Duplicate (
     CORBA::tk_except,
@@ -447,17 +470,16 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Duplicate (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Duplicate, &_tc_TAO_tc_TAO_IOP_Duplicate)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Duplicate,
+    &_tc_TAO_tc_TAO_IOP_Duplicate
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::Duplicate::_type (void) const
-{
-  return ::TAO_IOP::_tc_Duplicate;
-}
-
-// Default constructor.
 TAO_IOP::Invalid_IOR::Invalid_IOR (void)
   : CORBA::UserException (
         "IDL:TAO_IOP/Invalid_IOR:1.0",
@@ -466,12 +488,10 @@ TAO_IOP::Invalid_IOR::Invalid_IOR (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 TAO_IOP::Invalid_IOR::~Invalid_IOR (void)
 {
 }
 
-// Copy constructor.
 TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -480,7 +500,6 @@ TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp)
 {
 }
 
-// Assignment operator.
 TAO_IOP::Invalid_IOR&
 TAO_IOP::Invalid_IOR::operator= (const ::TAO_IOP::Invalid_IOR &_tao_excp)
 {
@@ -495,11 +514,11 @@ void TAO_IOP::Invalid_IOR::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 TAO_IOP::Invalid_IOR *
-TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *exc)
+TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (Invalid_IOR *, exc);
+      return ACE_dynamic_cast (Invalid_IOR *, _tao_excp);
     }
   else
     {
@@ -520,13 +539,13 @@ TAO_IOP::Invalid_IOR::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      TAO_IOP::Invalid_IOR (*this),
+      ::TAO_IOP::Invalid_IOR (*this),
       0
     );
   return result;
 }
 
-void TAO_IOP::Invalid_IOR::_raise ()
+void TAO_IOP::Invalid_IOR::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -540,7 +559,7 @@ void TAO_IOP::Invalid_IOR::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -553,27 +572,36 @@ void TAO_IOP::Invalid_IOR::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_type (void) const
+{
+  return ::TAO_IOP::_tc_Invalid_IOR;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_IOP_Invalid_IOR[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   28,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c69645f),
-  ACE_NTOHL (0x494f523a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69645f), 
+  ACE_NTOHL (0x494f523a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_IOP/Invalid_IOR:1.0
-  12,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c69645f),
+    12,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69645f), 
   ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Invalid_IOR (
     CORBA::tk_except,
@@ -585,17 +613,16 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Invalid_IOR (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Invalid_IOR, &_tc_TAO_tc_TAO_IOP_Invalid_IOR)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Invalid_IOR,
+    &_tc_TAO_tc_TAO_IOP_Invalid_IOR
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_type (void) const
-{
-  return ::TAO_IOP::_tc_Invalid_IOR;
-}
-
-// Default constructor.
 TAO_IOP::MultiProfileList::MultiProfileList (void)
   : CORBA::UserException (
         "IDL:TAO_IOP/MultiProfileList:1.0",
@@ -604,12 +631,10 @@ TAO_IOP::MultiProfileList::MultiProfileList (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 TAO_IOP::MultiProfileList::~MultiProfileList (void)
 {
 }
 
-// Copy constructor.
 TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -618,7 +643,6 @@ TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &
 {
 }
 
-// Assignment operator.
 TAO_IOP::MultiProfileList&
 TAO_IOP::MultiProfileList::operator= (const ::TAO_IOP::MultiProfileList &_tao_excp)
 {
@@ -633,11 +657,11 @@ void TAO_IOP::MultiProfileList::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 TAO_IOP::MultiProfileList *
-TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *exc)
+TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (MultiProfileList *, exc);
+      return ACE_dynamic_cast (MultiProfileList *, _tao_excp);
     }
   else
     {
@@ -658,13 +682,13 @@ TAO_IOP::MultiProfileList::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      TAO_IOP::MultiProfileList (*this),
+      ::TAO_IOP::MultiProfileList (*this),
       0
     );
   return result;
 }
 
-void TAO_IOP::MultiProfileList::_raise ()
+void TAO_IOP::MultiProfileList::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -678,7 +702,7 @@ void TAO_IOP::MultiProfileList::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -691,31 +715,40 @@ void TAO_IOP::MultiProfileList::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_type (void) const
+{
+  return ::TAO_IOP::_tc_MultiProfileList;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_IOP_MultiProfileList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x4d756c74),
-  ACE_NTOHL (0x6950726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x6950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/MultiProfileList:1.0
-  17,
-  ACE_NTOHL (0x4d756c74),
-  ACE_NTOHL (0x6950726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x4c697374),
+    17,
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x6950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
   ACE_NTOHL (0x0),  // name = MultiProfileList
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_MultiProfileList (
     CORBA::tk_except,
@@ -727,15 +760,15 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_MultiProfileList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_MultiProfileList, &_tc_TAO_tc_TAO_IOP_MultiProfileList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_MultiProfileList,
+    &_tc_TAO_tc_TAO_IOP_MultiProfileList
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_type (void) const
-{
-  return ::TAO_IOP::_tc_MultiProfileList;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int TAO_IOP::TAO_IOR_Property::_tao_class_id = 0;
 
@@ -782,13 +815,23 @@ tao_TAO_IOP_TAO_IOR_Property_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_TAO_IOP_TAO_IOR_Property_marshal (
+    TAO_IOP::TAO_IOR_Property_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // TAO_IOP::TAO_IOR_Property_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (void) // default constructor
+TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (void)
   : ptr_ (TAO_IOR_Property::_nil ())
 {}
 
@@ -798,12 +841,12 @@ TAO_IOP::TAO_IOR_Property_var::ptr (void) const
   return this->ptr_;
 }
 
-TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (const ::TAO_IOP::TAO_IOR_Property_var &p) // copy constructor
+TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (const ::TAO_IOP::TAO_IOR_Property_var &p)
   : TAO_Base_var (),
     ptr_ (TAO_IOR_Property::_duplicate (p.ptr ()))
 {}
 
-TAO_IOP::TAO_IOR_Property_var::~TAO_IOR_Property_var (void) // destructor
+TAO_IOP::TAO_IOR_Property_var::~TAO_IOR_Property_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -832,7 +875,7 @@ TAO_IOP::TAO_IOR_Property_var::operator const ::TAO_IOP::TAO_IOR_Property_ptr &(
   return this->ptr_;
 }
 
-TAO_IOP::TAO_IOR_Property_var::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast
+TAO_IOP::TAO_IOR_Property_var::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -907,10 +950,11 @@ TAO_IOP::TAO_IOR_Property_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // TAO_IOP::TAO_IOR_Property_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_ptr &p)
@@ -919,14 +963,14 @@ TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_ptr &p)
   this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
 }
 
-TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_var &p) // constructor from _var
+TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
 }
 
-TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (const ::TAO_IOP::TAO_IOR_Property_out &p) // copy constructor
+TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (const ::TAO_IOP::TAO_IOR_Property_out &p)
   : ptr_ (ACE_const_cast (TAO_IOR_Property_out &, p).ptr_)
 {}
 
@@ -957,7 +1001,7 @@ TAO_IOP::TAO_IOR_Property_out::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // c
 }
 
 ::TAO_IOP::TAO_IOR_Property_ptr &
-TAO_IOP::TAO_IOR_Property_out::ptr (void) // ptr
+TAO_IOP::TAO_IOR_Property_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -968,9 +1012,8 @@ TAO_IOP::TAO_IOR_Property_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
 {}
@@ -978,7 +1021,15 @@ TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
 TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
 {}
 
-TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_narrow (
+void 
+TAO_IOP::TAO_IOR_Property::_tao_any_destructor (void *_tao_void_pointer)
+{
+  TAO_IOR_Property *tmp = ACE_static_cast (TAO_IOR_Property *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+TAO_IOP::TAO_IOR_Property_ptr
+TAO_IOP::TAO_IOR_Property::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -986,50 +1037,68 @@ TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_narrow (
   return TAO_IOR_Property::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-TAO_IOP::TAO_IOR_Property_ptr
+TAO_IOP::TAO_IOR_Property_ptr 
 TAO_IOP::TAO_IOR_Property::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return TAO_IOR_Property::_nil ();
+    {
+      return TAO_IOR_Property::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           TAO_IOR_Property_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &TAO_IOR_Property::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &TAO_IOR_Property::_tao_class_id
+                )
+            )
         );
 }
 
 TAO_IOP::TAO_IOR_Property_ptr
 TAO_IOP::TAO_IOR_Property::_duplicate (TAO_IOR_Property_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *TAO_IOP::TAO_IOR_Property::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Property)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Property)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1038,6 +1107,50 @@ const char* TAO_IOP::TAO_IOR_Property::_interface_repository_id (void) const
   return "IDL:TAO_IOP/TAO_IOR_Property:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Property[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f525f), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727479), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Property:1.0
+    17,
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f525f), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727479), 
+  ACE_NTOHL (0x0),  // name = TAO_IOR_Property
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Property (
+    CORBA::tk_objref,
+    sizeof (_oc_TAO_IOP_TAO_IOR_Property),
+    (char *) &_oc_TAO_IOP_TAO_IOR_Property,
+    0,
+    sizeof (TAO_IOP::TAO_IOR_Property)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (TAO_IOP)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TAO_IOR_Property,
+    &_tc_TAO_tc_TAO_IOP_TAO_IOR_Property
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int TAO_IOP::TAO_IOR_Manipulation::_tao_class_id = 0;
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
@@ -1083,13 +1196,23 @@ tao_TAO_IOP_TAO_IOR_Manipulation_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_TAO_IOP_TAO_IOR_Manipulation_marshal (
+    TAO_IOP::TAO_IOR_Manipulation_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // TAO_IOP::TAO_IOR_Manipulation_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (void) // default constructor
+TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (void)
   : ptr_ (TAO_IOR_Manipulation::_nil ())
 {}
 
@@ -1099,12 +1222,12 @@ TAO_IOP::TAO_IOR_Manipulation_var::ptr (void) const
   return this->ptr_;
 }
 
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (const ::TAO_IOP::TAO_IOR_Manipulation_var &p) // copy constructor
+TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (const ::TAO_IOP::TAO_IOR_Manipulation_var &p)
   : TAO_Base_var (),
     ptr_ (TAO_IOR_Manipulation::_duplicate (p.ptr ()))
 {}
 
-TAO_IOP::TAO_IOR_Manipulation_var::~TAO_IOR_Manipulation_var (void) // destructor
+TAO_IOP::TAO_IOR_Manipulation_var::~TAO_IOR_Manipulation_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1133,7 +1256,7 @@ TAO_IOP::TAO_IOR_Manipulation_var::operator const ::TAO_IOP::TAO_IOR_Manipulatio
   return this->ptr_;
 }
 
-TAO_IOP::TAO_IOR_Manipulation_var::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast
+TAO_IOP::TAO_IOR_Manipulation_var::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1208,10 +1331,11 @@ TAO_IOP::TAO_IOR_Manipulation_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // TAO_IOP::TAO_IOR_Manipulation_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &p)
@@ -1220,14 +1344,14 @@ TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulatio
   this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
 }
 
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &p) // constructor from _var
+TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
 }
 
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (const ::TAO_IOP::TAO_IOR_Manipulation_out &p) // copy constructor
+TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (const ::TAO_IOP::TAO_IOR_Manipulation_out &p)
   : ptr_ (ACE_const_cast (TAO_IOR_Manipulation_out &, p).ptr_)
 {}
 
@@ -1258,7 +1382,7 @@ TAO_IOP::TAO_IOR_Manipulation_out::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr
 }
 
 ::TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_out::ptr (void) // ptr
+TAO_IOP::TAO_IOR_Manipulation_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1269,9 +1393,8 @@ TAO_IOP::TAO_IOR_Manipulation_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 {}
@@ -1279,7 +1402,15 @@ TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
 {}
 
-TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow (
+void 
+TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor (void *_tao_void_pointer)
+{
+  TAO_IOR_Manipulation *tmp = ACE_static_cast (TAO_IOR_Manipulation *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+TAO_IOP::TAO_IOR_Manipulation_ptr
+TAO_IOP::TAO_IOR_Manipulation::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1287,50 +1418,68 @@ TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow (
   return TAO_IOR_Manipulation::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-TAO_IOP::TAO_IOR_Manipulation_ptr
+TAO_IOP::TAO_IOR_Manipulation_ptr 
 TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return TAO_IOR_Manipulation::_nil ();
+    {
+      return TAO_IOR_Manipulation::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           TAO_IOR_Manipulation_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &TAO_IOR_Manipulation::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &TAO_IOR_Manipulation::_tao_class_id
+                )
+            )
         );
 }
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
 TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *TAO_IOP::TAO_IOR_Manipulation::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Manipulation)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Manipulation)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1339,6 +1488,8 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
   return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
 }
 
+// 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)
 
@@ -1351,27 +1502,29 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
 {
   CORBA::Object **tmp = 0;
   tmp = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    CORBA::Object **old = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        if (!this->release_)
-          {
-            tmp[i] = CORBA::Object::_duplicate (old[i]);
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-      }
-
-    if (this->release_)
-      {
-        delete[] old;
-      }
-  }
+    {
+      CORBA::Object **old = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = CORBA::Object::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -1379,15 +1532,18 @@ void
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       CORBA::release (tmp[i]);
       tmp[i] = CORBA::Object::_nil ();
     }
-
+  
   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -1401,7 +1557,7 @@ void
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-
+  
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       CORBA::release (tmp[i]);
@@ -1409,7 +1565,7 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
     }
 }
 
-void
+void 
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast (
     void* target,
     CORBA::Object *src
@@ -1430,516 +1586,634 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // TAO_IOP::TAO_IOR_Manipulation::IORList
 // *************************************************************
 
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void)
 {}
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max) // uses max size
-  :
+
+TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max, CORBA::ULong length, CORBA::Object_ptr *buffer, CORBA::Boolean release)
-  :
+
+TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Object_ptr *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (const IORList &seq) // copy ctor
-  :
+
+TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (const IORList &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void) // dtor
 {}
+
 void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (void *_tao_void_pointer)
 {
   IORList *tmp = ACE_static_cast (IORList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::EmptyProfileList &_tao_elem) // copying
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_IORList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f525f), 
+  ACE_NTOHL (0x4d616e69), 
+  ACE_NTOHL (0x70756c61), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x2f494f52), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/IORList:1.0
+    8,
+  ACE_NTOHL (0x494f524c), 
+  ACE_NTOHL (0x69737400),  // name = IORList
+    CORBA::tk_sequence, // typecode kind
+  60, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+        0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList (
+    CORBA::tk_alias,
+    sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_IORList),
+    (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_IORList,
+    0,
+    sizeof (TAO_IOP::TAO_IOR_Manipulation::IORList)
+  );
+
+::CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_IORList =
+  &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f525f), 
+  ACE_NTOHL (0x4d616e69), 
+  ACE_NTOHL (0x70756c61), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation:1.0
+    21,
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f525f), 
+  ACE_NTOHL (0x4d616e69), 
+  ACE_NTOHL (0x70756c61), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x0),  // name = TAO_IOR_Manipulation
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation (
+    CORBA::tk_objref,
+    sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation),
+    (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation,
+    0,
+    sizeof (TAO_IOP::TAO_IOR_Manipulation)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (TAO_IOP)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TAO_IOR_Manipulation,
+    &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::EmptyProfileList &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::insert_copy (
+      _tao_any,
+      TAO_IOP::EmptyProfileList::_tao_any_destructor,
       TAO_IOP::_tc_EmptyProfileList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::EmptyProfileList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::EmptyProfileList *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::insert (
+      _tao_any,
+      TAO_IOP::EmptyProfileList::_tao_any_destructor,
       TAO_IOP::_tc_EmptyProfileList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::EmptyProfileList::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::EmptyProfileList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::EmptyProfileList *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::EmptyProfileList*&,
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::EmptyProfileList *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::EmptyProfileList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::EmptyProfileList *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_EmptyProfileList ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::extract (
+        _tao_any,
+        TAO_IOP::EmptyProfileList::_tao_any_destructor,
+        TAO_IOP::_tc_EmptyProfileList,
+        _tao_elem
+      );
+}
 
-    if (!result)
-      return 0; // not equivalent
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::EmptyProfileList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::EmptyProfileList *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::EmptyProfileList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:TAO_IOP/EmptyProfileList:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::_tc_EmptyProfileList,
-            1,
-            tmp,
-            TAO_IOP::EmptyProfileList::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::NotFound &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::NotFound &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::insert_copy (
+      _tao_any,
+      TAO_IOP::NotFound::_tao_any_destructor,
       TAO_IOP::_tc_NotFound,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::NotFound *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::NotFound *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::insert (
+      _tao_any,
+      TAO_IOP::NotFound::_tao_any_destructor,
       TAO_IOP::_tc_NotFound,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::NotFound::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::NotFound *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::NotFound *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::NotFound*&,
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::NotFound *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::NotFound *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::NotFound *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_NotFound ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::extract (
+        _tao_any,
+        TAO_IOP::NotFound::_tao_any_destructor,
+        TAO_IOP::_tc_NotFound,
+        _tao_elem
+      );
+}
 
-    if (!result)
-      return 0; // not equivalent
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::NotFound *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::NotFound *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::NotFound, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:TAO_IOP/NotFound:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::_tc_NotFound,
-            1,
-            tmp,
-            TAO_IOP::NotFound::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::Duplicate &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::Duplicate &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::insert_copy (
+      _tao_any,
+      TAO_IOP::Duplicate::_tao_any_destructor,
       TAO_IOP::_tc_Duplicate,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::Duplicate *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::Duplicate *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::insert (
+      _tao_any,
+      TAO_IOP::Duplicate::_tao_any_destructor,
       TAO_IOP::_tc_Duplicate,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::Duplicate::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::Duplicate *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::Duplicate *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::Duplicate*&,
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::Duplicate *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Duplicate *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::Duplicate *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Duplicate ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::extract (
+        _tao_any,
+        TAO_IOP::Duplicate::_tao_any_destructor,
+        TAO_IOP::_tc_Duplicate,
+        _tao_elem
+      );
+}
 
-    if (!result)
-      return 0; // not equivalent
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::Duplicate *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::Duplicate *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::Duplicate, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:TAO_IOP/Duplicate:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::_tc_Duplicate,
-            1,
-            tmp,
-            TAO_IOP::Duplicate::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::Invalid_IOR &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::Invalid_IOR &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::insert_copy (
+      _tao_any,
+      TAO_IOP::Invalid_IOR::_tao_any_destructor,
       TAO_IOP::_tc_Invalid_IOR,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::Invalid_IOR *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::Invalid_IOR *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::insert (
+      _tao_any,
+      TAO_IOP::Invalid_IOR::_tao_any_destructor,
       TAO_IOP::_tc_Invalid_IOR,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::Invalid_IOR::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::Invalid_IOR *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::Invalid_IOR *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::Invalid_IOR*&,
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::Invalid_IOR *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Invalid_IOR *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::Invalid_IOR *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Invalid_IOR ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::extract (
+        _tao_any,
+        TAO_IOP::Invalid_IOR::_tao_any_destructor,
+        TAO_IOP::_tc_Invalid_IOR,
+        _tao_elem
+      );
+}
 
-    if (!result)
-      return 0; // not equivalent
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::Invalid_IOR *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::Invalid_IOR *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::Invalid_IOR, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:TAO_IOP/Invalid_IOR:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::_tc_Invalid_IOR,
-            1,
-            tmp,
-            TAO_IOP::Invalid_IOR::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
-void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::MultiProfileList &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO_IOP::MultiProfileList &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::insert_copy (
+      _tao_any,
+      TAO_IOP::MultiProfileList::_tao_any_destructor,
       TAO_IOP::_tc_MultiProfileList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TAO_IOP::MultiProfileList *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::MultiProfileList *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::insert (
+      _tao_any,
+      TAO_IOP::MultiProfileList::_tao_any_destructor,
       TAO_IOP::_tc_MultiProfileList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TAO_IOP::MultiProfileList::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::MultiProfileList *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::MultiProfileList *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const TAO_IOP::MultiProfileList*&,
+  return _tao_any >>= ACE_const_cast (
+      const TAO_IOP::MultiProfileList *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::MultiProfileList *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO_IOP::MultiProfileList *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::extract (
+        _tao_any,
+        TAO_IOP::MultiProfileList::_tao_any_destructor,
+        TAO_IOP::_tc_MultiProfileList,
+        _tao_elem
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_MultiProfileList ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (!result)
-      return 0; // not equivalent
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TAO_IOP::MultiProfileList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      TAO_IOP::MultiProfileList *tmp;
-      ACE_NEW_RETURN (tmp, TAO_IOP::MultiProfileList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:TAO_IOP/MultiProfileList:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TAO_IOP::_tc_MultiProfileList,
-            1,
-            tmp,
-            TAO_IOP::MultiProfileList::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Property_ptr _tao_elem
+  )
+{
+  TAO_IOP::TAO_IOR_Property_ptr _tao_objptr =
+    TAO_IOP::TAO_IOR_Property::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Property_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::insert (
+      _tao_any,
+      TAO_IOP::TAO_IOR_Property::_tao_any_destructor,
+      TAO_IOP::_tc_TAO_IOR_Property,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Property_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::extract (
+        _tao_any,
+        TAO_IOP::TAO_IOR_Property::_tao_any_destructor,
+        TAO_IOP::_tc_TAO_IOR_Property,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::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<TAO_IOP::TAO_IOR_Property,TAO_IOP::TAO_IOR_Property_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Property,TAO_IOP::TAO_IOR_Property_var>
+  template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Property,TAO_IOP::TAO_IOR_Property_var>;
+  template class TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Property, TAO_IOP::TAO_IOR_Property_var>
+# pragma instantiate TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    TAO_IOP::TAO_IOR_Manipulation_ptr _tao_elem
+  )
+{
+  TAO_IOP::TAO_IOR_Manipulation_ptr _tao_objptr =
+    TAO_IOP::TAO_IOR_Manipulation::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Manipulation_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::insert (
+      _tao_any,
+      TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor,
+      TAO_IOP::_tc_TAO_IOR_Manipulation,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_IOP::TAO_IOR_Manipulation_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::extract (
+        _tao_any,
+        TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor,
+        TAO_IOP::_tc_TAO_IOR_Manipulation,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::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<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>
+  template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>;
+  template class TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation, TAO_IOP::TAO_IOR_Manipulation_var>
+# pragma instantiate TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index b5b968cd499..043caad1511 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_IORC_H_
 #define _TAO_IDL_ORIG_IORC_H_
 
@@ -61,24 +64,30 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  TAO_IOP
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_EMPTYPROFILELIST_CH_)
 #define _TAO_IOP_EMPTYPROFILELIST_CH_
-
+  
   class TAO_IORManip_Export EmptyProfileList : public CORBA::UserException
   {
   public:
-
+    
     EmptyProfileList (void);
     EmptyProfileList (const EmptyProfileList &);
     ~EmptyProfileList (void);
 
     EmptyProfileList &operator= (const EmptyProfileList &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static EmptyProfileList *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -90,37 +99,43 @@ TAO_NAMESPACE  TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EmptyProfileList;
-
+  
+  // 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_EmptyProfileList;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_NOTFOUND_CH_)
 #define _TAO_IOP_NOTFOUND_CH_
-
+  
   class TAO_IORManip_Export NotFound : public CORBA::UserException
   {
   public:
-
+    
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -132,37 +147,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EmptyProfileList;
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
-
+  
+  // 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_NotFound;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_DUPLICATE_CH_)
 #define _TAO_IOP_DUPLICATE_CH_
-
+  
   class TAO_IORManip_Export Duplicate : public CORBA::UserException
   {
   public:
-
+    
     Duplicate (void);
     Duplicate (const Duplicate &);
     ~Duplicate (void);
 
     Duplicate &operator= (const Duplicate &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static Duplicate *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -174,37 +195,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Duplicate;
-
+  
+  // 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_Duplicate;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_INVALID_IOR_CH_)
 #define _TAO_IOP_INVALID_IOR_CH_
-
+  
   class TAO_IORManip_Export Invalid_IOR : public CORBA::UserException
   {
   public:
-
+    
     Invalid_IOR (void);
     Invalid_IOR (const Invalid_IOR &);
     ~Invalid_IOR (void);
 
     Invalid_IOR &operator= (const Invalid_IOR &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static Invalid_IOR *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -216,37 +243,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Duplicate;
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Invalid_IOR;
-
+  
+  // 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_Invalid_IOR;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_MULTIPROFILELIST_CH_)
 #define _TAO_IOP_MULTIPROFILELIST_CH_
-
+  
   class TAO_IORManip_Export MultiProfileList : public CORBA::UserException
   {
   public:
-
+    
     MultiProfileList (void);
     MultiProfileList (const MultiProfileList &);
     ~MultiProfileList (void);
 
     MultiProfileList &operator= (const MultiProfileList &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static MultiProfileList *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -258,55 +291,63 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Invalid_IOR;
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
-
+  
+  // 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_MultiProfileList;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___PTR_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY___PTR_CH_
-
+  
   class TAO_IOR_Property;
   typedef TAO_IOR_Property *TAO_IOR_Property_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___VAR_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_IORManip_Export TAO_IOR_Property_var : public TAO_Base_var
   {
   public:
     TAO_IOR_Property_var (void); // default constructor
-    TAO_IOR_Property_var (TAO_IOR_Property_ptr p) : ptr_ (p) {}
+    TAO_IOR_Property_var (TAO_IOR_Property_ptr p) : ptr_ (p) {} 
     TAO_IOR_Property_var (const TAO_IOR_Property_var &); // copy constructor
     ~TAO_IOR_Property_var (void); // destructor
-
+    
     TAO_IOR_Property_var &operator= (TAO_IOR_Property_ptr);
     TAO_IOR_Property_var &operator= (const TAO_IOR_Property_var &);
     TAO_IOR_Property_ptr operator-> (void) const;
-
+    
     operator const TAO_IOR_Property_ptr &() const;
     operator TAO_IOR_Property_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     TAO_IOR_Property_ptr in (void) const;
     TAO_IOR_Property_ptr &inout (void);
     TAO_IOR_Property_ptr &out (void);
     TAO_IOR_Property_ptr _retn (void);
     TAO_IOR_Property_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static TAO_IOR_Property_ptr tao_duplicate (TAO_IOR_Property_ptr);
@@ -317,7 +358,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     TAO_IOR_Property_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -325,13 +366,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
     TAO_IOR_Property_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___OUT_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IORManip_Export TAO_IOR_Property_out
   {
   public:
@@ -344,47 +386,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
     operator TAO_IOR_Property_ptr &();
     TAO_IOR_Property_ptr &ptr (void);
     TAO_IOR_Property_ptr operator-> (void);
-
+  
   private:
     TAO_IOR_Property_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY_CH_
-
+  
   class TAO_IORManip_Export TAO_IOR_Property
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TAO_IOR_Property_ptr _ptr_type;
     typedef TAO_IOR_Property_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj);
-
+    
     static TAO_IOR_Property_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Property_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Property_ptr _nil (void)
       {
         return (TAO_IOR_Property_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean set_property (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -393,7 +438,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         CORBA::SystemException
         , TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean set_primary (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -404,7 +452,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         , TAO_IOP::Duplicate
         , TAO_IOP::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr get_primary (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -413,7 +464,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean is_primary_set (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -421,58 +475,73 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     TAO_IOR_Property (void);
-
     virtual ~TAO_IOR_Property (void);
-
+    
+    friend class _TAO_TAO_IOR_Property_Remote_Proxy_Impl;
+    friend class _TAO_TAO_IOR_Property_ThruPOA_Proxy_Impl;
+    friend class _TAO_TAO_IOR_Property_Direct_Proxy_Impl;
+  
   private:
     TAO_IOR_Property (const TAO_IOR_Property &);
     void operator= (const TAO_IOR_Property &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_TAO_IOR_Property;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_
-
+  
   class TAO_IOR_Manipulation;
   typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_IORManip_Export TAO_IOR_Manipulation_var : public TAO_Base_var
   {
   public:
     TAO_IOR_Manipulation_var (void); // default constructor
-    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {}
+    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {} 
     TAO_IOR_Manipulation_var (const TAO_IOR_Manipulation_var &); // copy constructor
     ~TAO_IOR_Manipulation_var (void); // destructor
-
+    
     TAO_IOR_Manipulation_var &operator= (TAO_IOR_Manipulation_ptr);
     TAO_IOR_Manipulation_var &operator= (const TAO_IOR_Manipulation_var &);
     TAO_IOR_Manipulation_ptr operator-> (void) const;
-
+    
     operator const TAO_IOR_Manipulation_ptr &() const;
     operator TAO_IOR_Manipulation_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     TAO_IOR_Manipulation_ptr in (void) const;
     TAO_IOR_Manipulation_ptr &inout (void);
     TAO_IOR_Manipulation_ptr &out (void);
     TAO_IOR_Manipulation_ptr _retn (void);
     TAO_IOR_Manipulation_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static TAO_IOR_Manipulation_ptr tao_duplicate (TAO_IOR_Manipulation_ptr);
@@ -483,7 +552,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     TAO_IOR_Manipulation_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -491,13 +560,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
     TAO_IOR_Manipulation_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IORManip_Export TAO_IOR_Manipulation_out
   {
   public:
@@ -510,58 +580,59 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
     operator TAO_IOR_Manipulation_ptr &();
     TAO_IOR_Manipulation_ptr &ptr (void);
     TAO_IOR_Manipulation_ptr operator-> (void);
-
+  
   private:
     TAO_IOR_Manipulation_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
-
+  
   class TAO_IORManip_Export TAO_IOR_Manipulation
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TAO_IOR_Manipulation_ptr _ptr_type;
     typedef TAO_IOR_Manipulation_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
-
+    
     static TAO_IOR_Manipulation_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Manipulation_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Manipulation_ptr _nil (void)
       {
         return (TAO_IOR_Manipulation_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // 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_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-
-    class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
+    
+    class TAO_IORManip_Export _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
       : public TAO_Unbounded_Base_Sequence
     {
     public:
-      // = Initialization and termination methods.
       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum);
       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (
@@ -577,14 +648,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
           const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs
         );
       virtual ~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
-
+      
       // = Accessors.
       TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index) const;
-
+      
       // = Static operations.
       static CORBA::Object **allocbuf (CORBA::ULong nelems);
       static void freebuf (CORBA::Object **buffer);
-
+      
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
@@ -594,7 +665,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
           CORBA::ULong nl,
           CORBA::ULong ol
         );
-
+      
       virtual void _downcast (
           void* target,
           CORBA::Object *src
@@ -605,56 +676,62 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
     class IORList;
     class IORList_var;
-
+    
     // *************************************************************
-    // IORList
+    // TAO_IOP::TAO_IOR_Manipulation::IORList
     // *************************************************************
+    
+    class TAO_IORManip_Export IORList : public 
+    
+    // TAO_IDL - Generated from 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-    class TAO_IORManip_Export IORList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
-      IORList (void); // default ctor
-      IORList (CORBA::ULong max); // uses max size
+      IORList (void);
+      IORList (CORBA::ULong max);
       IORList (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::Object_ptr *buffer,
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          CORBA::Object_ptr *buffer, 
           CORBA::Boolean release = 0
         );
-      IORList (const IORList &); // copy ctor
+      IORList (const IORList &);
       ~IORList (void);
+      
       static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+      
       typedef IORList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
     };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___VAR_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___VAR_CH_
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+    
     // *************************************************************
     // class TAO_IOP::TAO_IOR_Manipulation::IORList_var
     // *************************************************************
-
+    
     class TAO_IORManip_Export IORList_var
     {
     public:
@@ -662,37 +739,40 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
       IORList_var (IORList *);
       IORList_var (const IORList_var &);
       ~IORList_var (void);
-
+      
       IORList_var &operator= (IORList *);
       IORList_var &operator= (const IORList_var &);
       IORList *operator-> (void);
       const IORList *operator-> (void) const;
-
+      
       operator const IORList &() const;
       operator IORList &();
       operator IORList &() const;
-      operator IORList *&(); // variable-size base types only
-
+      
+      // Variable-size base types only.
+      operator IORList *&();
+      
       TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-
-      // in, inout, out, _retn
+      
+      // in, inout, out, _retn 
       const IORList &in (void) const;
       IORList &inout (void);
       IORList *&out (void);
       IORList *_retn (void);
       IORList *ptr (void) const;
-
+    
     private:
       IORList *ptr_;
     };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___OUT_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___OUT_CH_
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+    
     class TAO_IORManip_Export IORList_out
     {
     public:
@@ -705,16 +785,23 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
       IORList *&ptr (void);
       IORList *operator-> (void);
       TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-
+    
     private:
       IORList *&ptr_;
       // Assignment from T_var not allowed.
       void operator= (const IORList_var &);
     };
 
-
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_IORList;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr merge_iors (
         const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -725,7 +812,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         , TAO_IOP::Duplicate
         , TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr add_profiles (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -737,7 +827,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         , TAO_IOP::Duplicate
         , TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr remove_profiles (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -749,7 +842,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         , TAO_IOP::EmptyProfileList
         , TAO_IOP::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean set_property (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -760,7 +856,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         , TAO_IOP::Invalid_IOR
         , TAO_IOP::Duplicate
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean set_primary (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior1,
@@ -774,7 +873,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         , TAO_IOP::MultiProfileList
         , TAO_IOP::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr get_primary (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -784,7 +886,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean is_primary_set (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -793,7 +898,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong is_in_ior (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -803,7 +911,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong get_profile_count (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -812,69 +923,145 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
         CORBA::SystemException
         , TAO_IOP::EmptyProfileList
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     TAO_IOR_Manipulation (void);
-
     virtual ~TAO_IOR_Manipulation (void);
-
+    
+    friend class _TAO_TAO_IOR_Manipulation_Remote_Proxy_Impl;
+    friend class _TAO_TAO_IOR_Manipulation_ThruPOA_Proxy_Impl;
+    friend class _TAO_TAO_IOR_Manipulation_Direct_Proxy_Impl;
+  
   private:
     TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
     void operator= (const TAO_IOR_Manipulation &);
   };
 
-
 #endif /* end #if !defined */
+  
+  // 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_TAO_IOR_Manipulation;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module TAO_IOP
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::EmptyProfileList &); // copying version
 TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::EmptyProfileList*); // noncopying version
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::EmptyProfileList *&); // deprecated
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::EmptyProfileList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::NotFound &); // copying version
 TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::NotFound*); // noncopying version
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::NotFound *&); // deprecated
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::NotFound *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::Duplicate &); // copying version
 TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::Duplicate*); // noncopying version
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Duplicate *&); // deprecated
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::Duplicate *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::Invalid_IOR &); // copying version
 TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::Invalid_IOR*); // noncopying version
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Invalid_IOR *&); // deprecated
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::Invalid_IOR *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::MultiProfileList &); // copying version
 TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::MultiProfileList*); // noncopying version
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::MultiProfileList *&); // deprecated
 TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::MultiProfileList *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Property_ptr); // copying
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Property_ptr *); // non-copying
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Property_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr); // copying
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr *); // non-copying
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::IORList &); // copying version
+TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::IORList*); // noncopying version
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::IORList *&); // deprecated
+TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::IORList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::EmptyProfileList &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::EmptyProfileList &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::NotFound &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::NotFound &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::Duplicate &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::Duplicate &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::Invalid_IOR &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::Invalid_IOR &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::MultiProfileList &);
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiProfileList &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "IORC.i"
@@ -890,3 +1077,4 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i
index a87fece232f..2ac7e82b0ad 100644
--- a/TAO/tao/IORManipulation/IORC.i
+++ b/TAO/tao/IORManipulation/IORC.i
@@ -19,40 +19,32 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// *************************************************************
-// Inline operations for exception TAO_IOP::EmptyProfileList
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::NotFound
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::Duplicate
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::Invalid_IOR
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception TAO_IOP::MultiProfileList
-// *************************************************************
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___CI_)
 #define _TAO_IOP_TAO_IOR_PROPERTY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+TAO_IOP::TAO_IOR_Property::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_
 
-ACE_INLINE CORBA::Object **
+ACE_INLINE
+CORBA::Object **
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (CORBA::ULong nelems)
 {
   CORBA::Object **buf = 0;
@@ -67,11 +59,15 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
   return buf;
 }
 
-ACE_INLINE void 
+ACE_INLINE
+void 
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (CORBA::Object **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -87,64 +83,83 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
 }
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum,
-  CORBA::ULong length,
-  CORBA::Object* *value,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::Object* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs)
+TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(
+    const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    CORBA::Object **tmp1 = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_);
-    CORBA::Object ** const tmp2 = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
-      }
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      CORBA::Object **tmp1 =
+        _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_);
+      CORBA::Object ** const tmp2 =
+        ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator= (const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs)
+ACE_INLINE
+TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &
+TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator= (
+    const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object **, this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Object::_nil ();
+      CORBA::Object **tmp =
+        ACE_reinterpret_cast (CORBA::Object **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::release (tmp[i]);
+          tmp[i] = CORBA::Object::_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_);
+        }
     }
-    if (this->maximum_ < rhs.maximum_)
+  else
     {
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_);
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_);
     }
-  }
-  else
-    this->buffer_ = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_);
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  CORBA::Object **tmp1 = ACE_reinterpret_cast (CORBA::Object **, this->buffer_);
-  CORBA::Object ** const tmp2 = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
+  CORBA::Object **tmp1 =
+    ACE_reinterpret_cast (CORBA::Object **, this->buffer_);
+  
+  CORBA::Object ** const tmp2 =
+    ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
@@ -154,70 +169,78 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
   return *this;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  CORBA::Object ** const tmp = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, this->buffer_);
+  CORBA::Object ** const tmp =
+    ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, this->buffer_);
   return TAO_Object_Manager<CORBA::Object,CORBA::Object_var> (tmp + index, this->release_);
 }
 
-ACE_INLINE CORBA::Object* *
+ACE_INLINE
+CORBA::Object* *
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::Object **result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::Object**, 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::Object**,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(CORBA::Object**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const CORBA::Object* *
+ACE_INLINE
+const CORBA::Object* *
 TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const CORBA::Object ** ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::Object ** ACE_CAST_CONST, this->buffer_);
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class TAO_IOP::TAO_IOR_Manipulation::IORList_var
 // *************************************************************
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (void) // default constructor
+TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (void)
   : ptr_ (0)
 {}
 
@@ -227,21 +250,26 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (IORList *p)
 {}
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &p) // copy constructor
+TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::TAO_IOP::TAO_IOR_Manipulation::IORList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::TAO_IOP::TAO_IOR_Manipulation::IORList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::~IORList_var (void) // destructor
+TAO_IOP::TAO_IOR_Manipulation::IORList_var::~IORList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_var &
+ACE_INLINE
+TAO_IOP::TAO_IOR_Manipulation::IORList_var &
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (IORList *p)
 {
   delete this->ptr_;
@@ -249,7 +277,8 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (IORList *p)
   return *this;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList_var &
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &p)
 {
   if (this != &p)
@@ -261,8 +290,12 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_
         }
       else
         {
-          IORList *deep_copy =
-            new IORList (*p.ptr_);
+          IORList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              IORList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -277,63 +310,68 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_
   return *this;
 }
 
-ACE_INLINE const ::TAO_IOP::TAO_IOR_Manipulation::IORList *
+ACE_INLINE
+const ::TAO_IOP::TAO_IOR_Manipulation::IORList *
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList *
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator const ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::TAO_IOP::TAO_IOR_Manipulation::IORList &
+ACE_INLINE
+const ::TAO_IOP::TAO_IOR_Manipulation::IORList &
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList &
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList &
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *&
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList *&
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::out (void)
 {
   delete this->ptr_;
@@ -341,7 +379,8 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList *
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::_retn (void)
 {
   ::TAO_IOP::TAO_IOR_Manipulation::IORList *tmp = this->ptr_;
@@ -349,12 +388,16 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList *
 TAO_IOP::TAO_IOR_Manipulation::IORList_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 TAO_IOP::TAO_IOR_Manipulation::IORList_out
 // *************************************************************
@@ -367,7 +410,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (IORList *&p)
 }
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (IORList_var &p) // constructor from _var
+TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (IORList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -375,124 +418,211 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (IORList_var &p) // cons
 }
 
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_out &p) // copy constructor
+TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_out &p)
   : ptr_ (ACE_const_cast (IORList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList_out &
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList_out &
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_out &p)
 {
   this->ptr_ = ACE_const_cast (IORList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList_out &
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList_out &
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (IORList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *&
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList *&
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *
+ACE_INLINE
+::TAO_IOP::TAO_IOR_Manipulation::IORList *
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___CI_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___CI_
 
+ACE_INLINE
+CORBA::Boolean
+TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::EmptyProfileList &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TAO_IOP::EmptyProfileList &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::EmptyProfileList&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    TAO_IOP::EmptyProfileList&
+  )
 {
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::NotFound &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TAO_IOP::NotFound &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::NotFound&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    TAO_IOP::NotFound&
+  )
 {
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::Duplicate &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TAO_IOP::Duplicate &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::Duplicate&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    TAO_IOP::Duplicate&
+  )
 {
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::Invalid_IOR &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TAO_IOP::Invalid_IOR &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::Invalid_IOR&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    TAO_IOP::Invalid_IOR&
+  )
 {
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::MultiProfileList &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TAO_IOP::MultiProfileList &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::MultiProfileList&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    TAO_IOP::MultiProfileList&
+  )
 {
   return 1;
 }
diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile
index 6f56519cf14..95acd6f78b3 100644
--- a/TAO/tao/IORManipulation/Makefile
+++ b/TAO/tao/IORManipulation/Makefile
@@ -67,14 +67,14 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/IORC.o .obj/IORC.so .shobj/IORC.o .shobj/IORC.so: IORC.cpp IORManip_Loader.h $(ACE_ROOT)/ace/pre.h \
+.obj/IORC.o .obj/IORC.so .shobj/IORC.o .shobj/IORC.so: IORC.cpp IORManipulation.h $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/Object_Loader.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -101,10 +101,29 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -117,18 +136,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -138,6 +152,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -156,27 +188,11 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/Object_Loader.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -190,21 +206,11 @@ endif
   $(ACE_ROOT)/ace/Timer_Queue_T.i \
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h IORC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -213,7 +219,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i IORC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/LocalObject.i IORManip_Loader.h \
+  ior_manip_export.h $(TAO_ROOT)/tao/Object_Loader.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Object_Loader.i IORC.h IORC.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/PolicyC.h \
@@ -225,21 +241,25 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -257,16 +277,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -290,14 +313,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -341,10 +356,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -415,7 +450,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -444,7 +480,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -492,6 +529,16 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -500,6 +547,8 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i IORC.i IORManipulation.h \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i
@@ -559,12 +608,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -577,13 +623,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -593,6 +639,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -611,35 +675,11 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/LocalObject.i IORManip_Loader.h \
-  ior_manip_export.h $(TAO_ROOT)/tao/Object_Loader.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/Object_Loader.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -653,7 +693,30 @@ endif
   $(ACE_ROOT)/ace/Timer_Queue_T.i \
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h IORC.h IORC.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/LocalObject.i IORManip_Loader.h \
+  ior_manip_export.h $(TAO_ROOT)/tao/Object_Loader.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Object_Loader.i IORC.h IORC.i \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -666,10 +729,16 @@ endif
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/CONV_FRAMEC.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.i \
@@ -679,17 +748,20 @@ endif
   $(TAO_ROOT)/tao/Profile.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -709,12 +781,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -736,14 +806,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
diff --git a/TAO/tao/IORManipulation/TAO_IORManip.dsp b/TAO/tao/IORManipulation/TAO_IORManip.dsp
index c4c7008d0c5..210064b50c3 100644
--- a/TAO/tao/IORManipulation/TAO_IORManip.dsp
+++ b/TAO/tao/IORManipulation/TAO_IORManip.dsp
@@ -156,6 +156,21 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\IORC.cpp

+

+!IF  "$(CFG)" == "IORManip - Win32 Release"

+

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "IORManip - Win32 Debug"

+

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "IORManip - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "IORManip - Win32 MFC Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/IORTable/IORTable.pidl b/TAO/tao/IORTable/IORTable.pidl
index d0ff4dffcaf..41548bd2fea 100644
--- a/TAO/tao/IORTable/IORTable.pidl
+++ b/TAO/tao/IORTable/IORTable.pidl
@@ -13,7 +13,7 @@
  *
  *   The command used to generate code from this file is:
  *
- *     tao_idl.exe -o orig -Ge 1 -Sa -St -DCORBA3 \
+ *     tao_idl -o orig -Ge 1 -Sa -St \
  *          -Wb,export_macro=TAO_IORTable_Export \
  *          -Wb,export_include=iortable_export.h \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp
index 10e43b670cd..79c6d54b828 100644
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ b/TAO/tao/IORTable/IORTableC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IORTableC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "IORTableC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,7 +44,9 @@
 #include "IORTableC.i"
 #endif /* !defined INLINE */
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 IORTable::AlreadyBound::AlreadyBound (void)
   : CORBA::UserException (
         "IDL:IORTable/AlreadyBound:1.0",
@@ -48,12 +55,10 @@ IORTable::AlreadyBound::AlreadyBound (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 IORTable::AlreadyBound::~AlreadyBound (void)
 {
 }
 
-// Copy constructor.
 IORTable::AlreadyBound::AlreadyBound (const ::IORTable::AlreadyBound &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -62,7 +67,6 @@ IORTable::AlreadyBound::AlreadyBound (const ::IORTable::AlreadyBound &_tao_excp)
 {
 }
 
-// Assignment operator.
 IORTable::AlreadyBound&
 IORTable::AlreadyBound::operator= (const ::IORTable::AlreadyBound &_tao_excp)
 {
@@ -70,18 +74,12 @@ IORTable::AlreadyBound::operator= (const ::IORTable::AlreadyBound &_tao_excp)
   return *this;
 }
 
-void IORTable::AlreadyBound::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AlreadyBound *tmp = ACE_static_cast (AlreadyBound*, _tao_void_pointer);
-  delete tmp;
-}
-
 IORTable::AlreadyBound *
-IORTable::AlreadyBound::_downcast (CORBA::Exception *exc)
+IORTable::AlreadyBound::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:IORTable/AlreadyBound:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:IORTable/AlreadyBound:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (AlreadyBound *, exc);
+      return ACE_dynamic_cast (AlreadyBound *, _tao_excp);
     }
   else
     {
@@ -102,13 +100,13 @@ IORTable::AlreadyBound::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      IORTable::AlreadyBound (*this),
+      ::IORTable::AlreadyBound (*this),
       0
     );
   return result;
 }
 
-void IORTable::AlreadyBound::_raise ()
+void IORTable::AlreadyBound::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -139,7 +137,11 @@ void IORTable::AlreadyBound::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 IORTable::NotFound::NotFound (void)
   : CORBA::UserException (
         "IDL:IORTable/NotFound:1.0",
@@ -148,12 +150,10 @@ IORTable::NotFound::NotFound (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 IORTable::NotFound::~NotFound (void)
 {
 }
 
-// Copy constructor.
 IORTable::NotFound::NotFound (const ::IORTable::NotFound &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -162,7 +162,6 @@ IORTable::NotFound::NotFound (const ::IORTable::NotFound &_tao_excp)
 {
 }
 
-// Assignment operator.
 IORTable::NotFound&
 IORTable::NotFound::operator= (const ::IORTable::NotFound &_tao_excp)
 {
@@ -170,18 +169,12 @@ IORTable::NotFound::operator= (const ::IORTable::NotFound &_tao_excp)
   return *this;
 }
 
-void IORTable::NotFound::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NotFound *tmp = ACE_static_cast (NotFound*, _tao_void_pointer);
-  delete tmp;
-}
-
 IORTable::NotFound *
-IORTable::NotFound::_downcast (CORBA::Exception *exc)
+IORTable::NotFound::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:IORTable/NotFound:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:IORTable/NotFound:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (NotFound *, exc);
+      return ACE_dynamic_cast (NotFound *, _tao_excp);
     }
   else
     {
@@ -202,13 +195,13 @@ IORTable::NotFound::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      IORTable::NotFound (*this),
+      ::IORTable::NotFound (*this),
       0
     );
   return result;
 }
 
-void IORTable::NotFound::_raise ()
+void IORTable::NotFound::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -239,6 +232,11 @@ void IORTable::NotFound::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int IORTable::Table::_tao_class_id = 0;
 
 IORTable::Table_ptr
@@ -284,13 +282,23 @@ tao_IORTable_Table_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_IORTable_Table_marshal (
+    IORTable::Table_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // IORTable::Table_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-IORTable::Table_var::Table_var (void) // default constructor
+IORTable::Table_var::Table_var (void)
   : ptr_ (Table::_nil ())
 {}
 
@@ -300,12 +308,12 @@ IORTable::Table_var::ptr (void) const
   return this->ptr_;
 }
 
-IORTable::Table_var::Table_var (const ::IORTable::Table_var &p) // copy constructor
+IORTable::Table_var::Table_var (const ::IORTable::Table_var &p)
   : TAO_Base_var (),
     ptr_ (Table::_duplicate (p.ptr ()))
 {}
 
-IORTable::Table_var::~Table_var (void) // destructor
+IORTable::Table_var::~Table_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -409,10 +417,11 @@ IORTable::Table_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // IORTable::Table_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 IORTable::Table_out::Table_out (Table_ptr &p)
@@ -421,14 +430,14 @@ IORTable::Table_out::Table_out (Table_ptr &p)
   this->ptr_ = ::IORTable::Table::_nil ();
 }
 
-IORTable::Table_out::Table_out (Table_var &p) // constructor from _var
+IORTable::Table_out::Table_out (Table_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::IORTable::Table::_nil ();
 }
 
-IORTable::Table_out::Table_out (const ::IORTable::Table_out &p) // copy constructor
+IORTable::Table_out::Table_out (const ::IORTable::Table_out &p)
   : ptr_ (ACE_const_cast (Table_out &, p).ptr_)
 {}
 
@@ -459,7 +468,7 @@ IORTable::Table_out::operator ::IORTable::Table_ptr &() // cast
 }
 
 ::IORTable::Table_ptr &
-IORTable::Table_out::ptr (void) // ptr
+IORTable::Table_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -470,9 +479,8 @@ IORTable::Table_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 IORTable::Table::Table (void)
 {}
@@ -480,7 +488,8 @@ IORTable::Table::Table (void)
 IORTable::Table::~Table (void)
 {}
 
-IORTable::Table_ptr IORTable::Table::_narrow (
+IORTable::Table_ptr
+IORTable::Table::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -495,43 +504,61 @@ IORTable::Table::_unchecked_narrow (
   )
 {
   if (CORBA::is_nil (obj))
-    return Table::_nil ();
+    {
+      return Table::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Table_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Table::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Table::_tao_class_id
+                )
+            )
         );
 }
 
 IORTable::Table_ptr
 IORTable::Table::_duplicate (Table_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *IORTable::Table::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::IORTable, Table)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::IORTable, Table)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -540,6 +567,9 @@ const char* IORTable::Table::_interface_repository_id (void) const
   return "IDL:IORTable/Table:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int IORTable::Locator::_tao_class_id = 0;
 
 IORTable::Locator_ptr
@@ -585,13 +615,23 @@ tao_IORTable_Locator_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_IORTable_Locator_marshal (
+    IORTable::Locator_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // IORTable::Locator_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-IORTable::Locator_var::Locator_var (void) // default constructor
+IORTable::Locator_var::Locator_var (void)
   : ptr_ (Locator::_nil ())
 {}
 
@@ -601,12 +641,12 @@ IORTable::Locator_var::ptr (void) const
   return this->ptr_;
 }
 
-IORTable::Locator_var::Locator_var (const ::IORTable::Locator_var &p) // copy constructor
+IORTable::Locator_var::Locator_var (const ::IORTable::Locator_var &p)
   : TAO_Base_var (),
     ptr_ (Locator::_duplicate (p.ptr ()))
 {}
 
-IORTable::Locator_var::~Locator_var (void) // destructor
+IORTable::Locator_var::~Locator_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -710,10 +750,11 @@ IORTable::Locator_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // IORTable::Locator_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 IORTable::Locator_out::Locator_out (Locator_ptr &p)
@@ -722,14 +763,14 @@ IORTable::Locator_out::Locator_out (Locator_ptr &p)
   this->ptr_ = ::IORTable::Locator::_nil ();
 }
 
-IORTable::Locator_out::Locator_out (Locator_var &p) // constructor from _var
+IORTable::Locator_out::Locator_out (Locator_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::IORTable::Locator::_nil ();
 }
 
-IORTable::Locator_out::Locator_out (const ::IORTable::Locator_out &p) // copy constructor
+IORTable::Locator_out::Locator_out (const ::IORTable::Locator_out &p)
   : ptr_ (ACE_const_cast (Locator_out &, p).ptr_)
 {}
 
@@ -760,7 +801,7 @@ IORTable::Locator_out::operator ::IORTable::Locator_ptr &() // cast
 }
 
 ::IORTable::Locator_ptr &
-IORTable::Locator_out::ptr (void) // ptr
+IORTable::Locator_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -771,17 +812,16 @@ IORTable::Locator_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
-
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 IORTable::Locator::Locator (void)
 {}
 
 IORTable::Locator::~Locator (void)
 {}
 
-IORTable::Locator_ptr IORTable::Locator::_narrow (
+IORTable::Locator_ptr
+IORTable::Locator::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -796,43 +836,61 @@ IORTable::Locator::_unchecked_narrow (
   )
 {
   if (CORBA::is_nil (obj))
-    return Locator::_nil ();
+    {
+      return Locator::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Locator_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Locator::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Locator::_tao_class_id
+                )
+            )
         );
 }
 
 IORTable::Locator_ptr
 IORTable::Locator::_duplicate (Locator_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *IORTable::Locator::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::IORTable, Locator)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::IORTable, Locator)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h
index caca2220eb9..cfa2f2f6967 100644
--- a/TAO/tao/IORTable/IORTableC.h
+++ b/TAO/tao/IORTable/IORTableC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_IORTABLEC_H_
 #define _TAO_IDL_ORIG_IORTABLEC_H_
 
@@ -54,21 +57,30 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  IORTable
 {
-  class Locator;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
+  class Locator;
+
 #if !defined (_IORTABLE_LOCATOR___PTR_CH_)
 #define _IORTABLE_LOCATOR___PTR_CH_
   
   typedef Locator *Locator_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IORTABLE_LOCATOR___VAR_CH_)
 #define _IORTABLE_LOCATOR___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_IORTable_Export Locator_var : public TAO_Base_var
   {
   public:
@@ -108,13 +120,14 @@ TAO_NAMESPACE  IORTable
     Locator_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IORTABLE_LOCATOR___OUT_CH_)
 #define _IORTABLE_LOCATOR___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IORTable_Export Locator_out
   {
   public:
@@ -131,11 +144,12 @@ TAO_NAMESPACE  IORTable
   private:
     Locator_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_IORTABLE_ALREADYBOUND_CH_)
 #define _IORTABLE_ALREADYBOUND_CH_
   
@@ -148,9 +162,7 @@ TAO_NAMESPACE  IORTable
     ~AlreadyBound (void);
 
     AlreadyBound &operator= (const AlreadyBound &);
-
-    static void _tao_any_destructor (void*);
-
+    
     static AlreadyBound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -168,13 +180,15 @@ TAO_NAMESPACE  IORTable
         ACE_ENV_ARG_DECL_NOT_USED
       );
     
-    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
   };
 
-
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_IORTABLE_NOTFOUND_CH_)
 #define _IORTABLE_NOTFOUND_CH_
   
@@ -187,9 +201,7 @@ TAO_NAMESPACE  IORTable
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-
-    static void _tao_any_destructor (void*);
-
+    
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -207,25 +219,29 @@ TAO_NAMESPACE  IORTable
         ACE_ENV_ARG_DECL_NOT_USED
       );
     
-    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
   };
 
-
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_IORTABLE_TABLE___PTR_CH_)
 #define _IORTABLE_TABLE___PTR_CH_
   
   class Table;
   typedef Table *Table_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IORTABLE_TABLE___VAR_CH_)
 #define _IORTABLE_TABLE___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_IORTable_Export Table_var : public TAO_Base_var
   {
   public:
@@ -265,13 +281,14 @@ TAO_NAMESPACE  IORTable
     Table_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IORTABLE_TABLE___OUT_CH_)
 #define _IORTABLE_TABLE___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IORTable_Export Table_out
   {
   public:
@@ -288,11 +305,12 @@ TAO_NAMESPACE  IORTable
   private:
     Table_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_IORTABLE_TABLE_CH_)
 #define _IORTABLE_TABLE_CH_
   
@@ -300,11 +318,8 @@ TAO_NAMESPACE  IORTable
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Table_ptr _ptr_type;
     typedef Table_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -325,6 +340,11 @@ TAO_NAMESPACE  IORTable
         return (Table_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void bind (
         const char * object_key,
         const char * IOR
@@ -335,6 +355,9 @@ TAO_NAMESPACE  IORTable
         , IORTable::AlreadyBound
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void rebind (
         const char * object_key,
         const char * IOR
@@ -344,6 +367,9 @@ TAO_NAMESPACE  IORTable
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void unbind (
         const char * object_key
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -353,6 +379,9 @@ TAO_NAMESPACE  IORTable
         , IORTable::NotFound
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_locator (
         IORTable::Locator_ptr the_locator
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -361,36 +390,46 @@ TAO_NAMESPACE  IORTable
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     Table (void);
-    
     virtual ~Table (void);
+    
+    friend class _TAO_Table_Remote_Proxy_Impl;
+    friend class _TAO_Table_ThruPOA_Proxy_Impl;
+    friend class _TAO_Table_Direct_Proxy_Impl;
   
   private:
     Table (const Table &);
     void operator= (const Table &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_IORTABLE_LOCATOR___PTR_CH_)
 #define _IORTABLE_LOCATOR___PTR_CH_
   
   class Locator;
   typedef Locator *Locator_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IORTABLE_LOCATOR___VAR_CH_)
 #define _IORTABLE_LOCATOR___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_IORTable_Export Locator_var : public TAO_Base_var
   {
   public:
@@ -430,13 +469,14 @@ TAO_NAMESPACE  IORTable
     Locator_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_IORTABLE_LOCATOR___OUT_CH_)
 #define _IORTABLE_LOCATOR___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_IORTable_Export Locator_out
   {
   public:
@@ -453,11 +493,12 @@ TAO_NAMESPACE  IORTable
   private:
     Locator_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_IORTABLE_LOCATOR_CH_)
 #define _IORTABLE_LOCATOR_CH_
   
@@ -465,11 +506,8 @@ TAO_NAMESPACE  IORTable
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Locator_ptr _ptr_type;
     typedef Locator_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -490,6 +528,11 @@ TAO_NAMESPACE  IORTable
         return (Locator_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * locate (
         const char * object_key
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -499,39 +542,59 @@ TAO_NAMESPACE  IORTable
         , IORTable::NotFound
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     Locator (void);
-    
     virtual ~Locator (void);
+    
+    friend class _TAO_Locator_Remote_Proxy_Impl;
+    friend class _TAO_Locator_ThruPOA_Proxy_Impl;
+    friend class _TAO_Locator_Direct_Proxy_Impl;
   
   private:
     Locator (const Locator &);
     void operator= (const Locator &);
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module IORTable
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_IORTable_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IORTable::AlreadyBound &);
 TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::AlreadyBound &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_IORTable_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IORTable::NotFound &);
 TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFound &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "IORTableC.i"
@@ -547,3 +610,4 @@ TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFoun
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/IORTable/IORTableC.i b/TAO/tao/IORTable/IORTableC.i
index a87e7d21564..cea503f3318 100644
--- a/TAO/tao/IORTable/IORTableC.i
+++ b/TAO/tao/IORTable/IORTableC.i
@@ -19,52 +19,91 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// *************************************************************
-// Inline operations for exception IORTable::AlreadyBound
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception IORTable::NotFound
-// *************************************************************
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_IORTABLE_TABLE___CI_)
 #define _IORTABLE_TABLE___CI_
 
+ACE_INLINE
+CORBA::Boolean
+IORTable::Table::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_IORTABLE_LOCATOR___CI_)
 #define _IORTABLE_LOCATOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+IORTable::Locator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IORTable::AlreadyBound &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IORTable::AlreadyBound &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,IORTable::AlreadyBound&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    IORTable::AlreadyBound&
+  )
 {
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IORTable::NotFound &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IORTable::NotFound &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,IORTable::NotFound&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    IORTable::NotFound&
+  )
 {
   return 1;
 }
diff --git a/TAO/tao/IORTable/Makefile b/TAO/tao/IORTable/Makefile
index daaa0af8585..ff1a6590de7 100644
--- a/TAO/tao/IORTable/Makefile
+++ b/TAO/tao/IORTable/Makefile
@@ -99,25 +99,8 @@ endif
   $(TAO_ROOT)/tao/corbafwd.i IORTableC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -130,9 +113,41 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
@@ -155,17 +170,32 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -189,12 +219,18 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
@@ -203,10 +239,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -222,16 +260,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -248,25 +281,9 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h
+  $(TAO_ROOT)/tao/Adapter.i
 
 .obj/IORTableC.o .obj/IORTableC.so .shobj/IORTableC.o .shobj/IORTableC.so: IORTableC.cpp IORTableC.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corba.h \
@@ -302,25 +319,8 @@ endif
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -333,9 +333,41 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
@@ -358,17 +390,32 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -392,12 +439,18 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
@@ -406,10 +459,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -425,16 +480,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -454,15 +504,15 @@ endif
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -481,21 +531,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -508,14 +543,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -561,6 +588,28 @@ endif
   $(TAO_ROOT)/tao/target_specification.h \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -631,7 +680,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -660,7 +710,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -669,13 +720,28 @@ endif
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   $(TAO_ROOT)/tao/Exception.i \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -693,35 +759,38 @@ endif
   $(ACE_ROOT)/ace/Timer_Queue_T.i \
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h IOR_Table_Impl.h IORTable.h \
-  IORTableC.h $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Adapter.i IOR_Table_Impl.h IORTable.h \
+  IORTableC.h $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -731,10 +800,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -750,16 +821,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -773,21 +839,14 @@ endif
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i IORTableC.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -875,25 +934,8 @@ endif
   $(TAO_ROOT)/tao/corbafwd.i IORTableC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -906,9 +948,41 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
@@ -931,17 +1005,32 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -965,12 +1054,18 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/NVList.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
@@ -979,10 +1074,12 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -998,16 +1095,11 @@ endif
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1020,30 +1112,6 @@ endif
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i IORTableC.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/IORTable/TAO_IORTable.dsp b/TAO/tao/IORTable/TAO_IORTable.dsp
index 2f0b6cd6364..660117c83a5 100644
--- a/TAO/tao/IORTable/TAO_IORTable.dsp
+++ b/TAO/tao/IORTable/TAO_IORTable.dsp
@@ -165,6 +165,7 @@ SOURCE=.\IORTable.cpp
 # Begin Source File

 

 SOURCE=.\IORTableC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index 0f073cf3340..dca1b689107 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -12,7 +12,9 @@
 #include "tao/ORB_Core.h"
 #include "tao/Object.h"
 
-ACE_RCSID(IORTable, Table_Adapter, "$Id$")
+ACE_RCSID (IORTable, 
+           Table_Adapter, 
+           "$Id$")
 
 TAO_Table_Adapter::TAO_Table_Adapter (TAO_ORB_Core *orb_core)
   :  orb_core_ (orb_core)
@@ -53,14 +55,14 @@ TAO_Table_Adapter::priority (void) const
 }
 
 int
-TAO_Table_Adapter::dispatch (TAO_ObjectKey &key,
+TAO_Table_Adapter::dispatch (TAO::ObjectKey &key,
                              TAO_ServerRequest &,
                              CORBA::Object_out forward_to
                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var object_key;
-  TAO_ObjectKey::encode_sequence_to_string (object_key.out (),
+  TAO::ObjectKey::encode_sequence_to_string (object_key.out (),
                                             key);
   ACE_TRY
     {
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h
index 40f87cc5b12..350e0bc5cf0 100644
--- a/TAO/tao/IORTable/Table_Adapter.h
+++ b/TAO/tao/IORTable/Table_Adapter.h
@@ -43,7 +43,7 @@ public:
   virtual void check_close (int wait_for_completion
                             ACE_ENV_ARG_DECL);
   virtual int priority (void) const;
-  virtual int dispatch (TAO_ObjectKey &key,
+  virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
                         CORBA::Object_out foward_to
                         ACE_ENV_ARG_DECL)
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index d4319e014bb..28eccdf3206 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -1,3 +1,7 @@
+// -*- C++ -*-
+//
+// $Id$
+
 #include "LocalObject.h"
 
 #if !defined (__ACE_INLINE__)
@@ -7,7 +11,6 @@
 #include "PolicyC.h"
 #include "debug.h"
 
-
 ACE_RCSID (tao,
            LocalObject,
            "$Id$")
@@ -63,7 +66,7 @@ CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj
 // TAO's extensions
 
 
-TAO_ObjectKey *
+TAO::ObjectKey *
 CORBA::LocalObject::_key (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index d8b1f52d2fd..04062892a86 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -28,6 +28,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "Object_KeyC.h"
+
 namespace CORBA
 {
   /**
@@ -162,7 +164,7 @@ namespace CORBA
     // = TAO extensions
 
     /// Throws CORBA::NO_IMPLEMENT.
-    virtual TAO_ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
+    virtual TAO::ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     /// Useful for template programming.
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index e3cdcc5c84d..11a6aee4d06 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -115,7 +115,6 @@ ORB_CORE_FILES = \
   DynamicInterface_Adapter.cpp \
   Object_KeyC.cpp \
   IFR_Client_Adapter.cpp \
-  IFR_TypeCodes.cpp \
   Invocation.cpp \
   Interceptor.cpp \
   InterceptorC.cpp \
@@ -238,6 +237,7 @@ TEMPLATE_FILES = \
   IOPS_T.cpp \
   PollableS_T.cpp \
   Sequence_T.cpp \
+  Any_T.cpp \
   TAOS_T.cpp \
   TimeBaseS_T.cpp \
   TAO_Singleton.cpp
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index 304309adc24..8050c5cb0fa 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -93,7 +93,6 @@ OBJFILES = \
 	$(OBJDIR)\GIOP_Message_Version.obj \
 	$(OBJDIR)\GIOP_Utils.obj \
 	$(OBJDIR)\IFR_Client_Adapter.obj \
-	$(OBJDIR)\IFR_TypeCodes.obj \
 	$(OBJDIR)\IIOPC.obj \
 	$(OBJDIR)\IIOP_Acceptor.obj \
 	$(OBJDIR)\IIOP_Connection_Handler.obj \
diff --git a/TAO/tao/Makefile.dirs b/TAO/tao/Makefile.dirs
index 36547950881..13b82cb9b45 100644
--- a/TAO/tao/Makefile.dirs
+++ b/TAO/tao/Makefile.dirs
@@ -37,16 +37,13 @@ endif # corba_messaging
 ifeq ($(rt_corba),1)
   DIRS += RTCORBA RTPortableServer
 endif # rt_corba
-
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-
 DIRS += IFR_Client Domain TypeCodeFactory
 
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
diff --git a/TAO/tao/Makefile.tao b/TAO/tao/Makefile.tao
index 2a0b1efa0ad..429664d9c73 100644
--- a/TAO/tao/Makefile.tao
+++ b/TAO/tao/Makefile.tao
@@ -153,7 +153,7 @@ ORB_CORE_FILES = \
   Environment \
   Object \
   LocalObject \
-  ObjectIDList \
+  ObjectIDListC \
   ORB \
   corbafwd \
   Policy_ForwardC \
@@ -304,6 +304,7 @@ TEMPLATE_FILES = \
   Connector_Impl \
   Connector_Impl \
   Sequence_T \
+  Any_T \
   TAO_Singleton
 
 ifndef TAO_ROOT
@@ -324,9 +325,8 @@ include $(TAO_ROOT)/rules.tao.GNU
 ifeq ($(minimum_corba),0)
 
 ORB_CORE_FILES += \
-  Services \
+  ServicesC \
   NVList \
-  IFR_TypeCodes \
   Dynamic_Adapter
 
 endif # minimum_corba
@@ -568,7 +568,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -597,7 +598,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -620,6 +622,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -628,11 +659,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i Transport_Acceptor.inl
 
 .obj/Transport_Connector.o .obj/Transport_Connector.so .shobj/Transport_Connector.o .shobj/Transport_Connector.so: Transport_Connector.cpp Transport_Connector.h \
@@ -695,7 +734,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -724,7 +764,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -784,6 +825,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -792,21 +835,40 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h CurrentC.i Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
+  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
   Policy_Manager.h Policy_Set.h \
@@ -814,14 +876,9 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  params.i TAO_Singleton_Manager.h \
+  params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -833,8 +890,8 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
@@ -881,14 +938,11 @@ realclean:
   GIOP_Message_Version.inl \
   operation_details.h Service_Context.h \
   Service_Context.inl \
-  target_specification.h Object_KeyC.h \
-  Object_KeyC.i target_specification.i \
-  operation_details.i Invocation.i MProfile.h \
-  MProfile.i Profile.h \
-  Tagged_Components.h CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
+  target_specification.h target_specification.i operation_details.i \
+  Invocation.i MProfile.h MProfile.i \
+  Profile.h Tagged_Components.h \
   Tagged_Components.i \
-  GIOP_Message_Version.h Profile.i Thread_Lane_Resources.h \
+  GIOP_Message_Version.h Object_KeyC.h Profile.i Thread_Lane_Resources.h \
   Thread_Lane_Resources.i debug.h \
   Connect_Strategy.h Client_Strategy_Factory.h
 
@@ -951,7 +1005,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -980,7 +1035,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1040,6 +1096,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -1048,21 +1106,40 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h CurrentC.i Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
+  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
   Policy_Manager.h Policy_Set.h \
@@ -1070,14 +1147,9 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  params.i TAO_Singleton_Manager.h \
+  params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -1089,8 +1161,8 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
@@ -1160,7 +1232,13 @@ realclean:
   Queued_Message.inl Asynch_Queued_Message.h Flushing_Strategy.h \
   Thread_Lane_Resources.h \
   Thread_Lane_Resources.i debug.h \
-  Resume_Handle.h Resume_Handle.inl Notify_Handler.h
+  Resume_Handle.h Resume_Handle.inl Notify_Handler.h Codeset_Manager.h \
+  Profile.h \
+  Tagged_Components.h \
+  Tagged_Components.i \
+  GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
+  Profile.i
 
 .obj/Incoming_Message_Queue.o .obj/Incoming_Message_Queue.so .shobj/Incoming_Message_Queue.o .shobj/Incoming_Message_Queue.so: Incoming_Message_Queue.cpp \
   Incoming_Message_Queue.h $(ACE_ROOT)/ace/pre.h \
@@ -1224,7 +1302,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1253,7 +1332,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1276,6 +1356,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -1284,18 +1393,27 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl ORB_Core.h corbafwd.h ORB.h Exception.h \
-  Services.h Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h CurrentC.i Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
+  ServicesC.h OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
+  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
   Policy_Manager.h Policy_Set.h \
@@ -1303,18 +1421,14 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -1326,28 +1440,13 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
-  DynamicC.h DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  DynamicC.h StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
@@ -1355,15 +1454,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -1447,7 +1539,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1474,7 +1567,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1534,6 +1628,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -1542,21 +1638,40 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h CurrentC.i Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
+  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
   Policy_Manager.h Policy_Set.h \
@@ -1564,14 +1679,9 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  params.i TAO_Singleton_Manager.h \
+  params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -1583,8 +1693,8 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
@@ -1616,8 +1726,8 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.h \
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i Resume_Handle.h \
-  Resume_Handle.inl
+  $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+  Resume_Handle.h Resume_Handle.inl
 
 .obj/Resume_Handle.o .obj/Resume_Handle.so .shobj/Resume_Handle.o .shobj/Resume_Handle.so: Resume_Handle.cpp Resume_Handle.h \
   $(ACE_ROOT)/ace/pre.h TAO_Export.h \
@@ -1679,7 +1789,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1708,7 +1819,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1716,7 +1828,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i Services.h \
+  Exception.i ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -1729,20 +1842,52 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
+  OctetSeqC.i \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  CDR.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i Policy_ForwardC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
@@ -1756,13 +1901,10 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -1773,34 +1915,24 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Exception.h Adapter.i \
-  PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
+  StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any.h \
-  IOPC.i PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h \
+  IOPC.i PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   IOPC.h \
   Service_Callbacks.i \
@@ -1809,15 +1941,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -1898,7 +2023,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1927,7 +2053,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1950,6 +2077,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -1958,30 +2114,42 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   CONV_FRAMEC.h \
   CONV_FRAMEC.i \
   Tagged_Components.i PolicyC.h \
-  CurrentC.h CurrentC.i Policy_ForwardC.h \
-  Exception.h Remote_Object_Proxy_Impl.h \
+  CurrentC.h CurrentC.i Policy_ForwardC.h Exception.h \
+  Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i GIOP_Message_Version.h \
-  GIOP_Message_Version.inl Profile.i \
-  Object_KeyC.h Object_KeyC.i \
-  Messaging_PolicyValueC.h IOPC.h Sequence.h Messaging_PolicyValueC.i \
-  Stub.h MProfile.h \
+  GIOP_Message_Version.inl Object_KeyC.h \
+  Profile.i Messaging_PolicyValueC.h IOPC.h Sequence.h \
+  Messaging_PolicyValueC.i Stub.h \
+  MProfile.h \
   PolicyC.h \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -1990,19 +2158,14 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -2020,12 +2183,10 @@ realclean:
   PortableInterceptorC.h \
   CurrentC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -2035,21 +2196,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -2062,14 +2208,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -2097,7 +2235,6 @@ realclean:
   ORB_Core_Auto_Ptr.inl \
   Stub.i debug.h \
   target_specification.h \
-  Object_KeyC.h \
   target_specification.i
 
 .obj/Endpoint.o .obj/Endpoint.so .shobj/Endpoint.o .shobj/Endpoint.so: Endpoint.cpp Endpoint.h \
@@ -2134,7 +2271,8 @@ realclean:
   TAO_Export.h \
   corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -2185,7 +2323,8 @@ realclean:
   corbafwd.i \
   Endpoint.h \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -2245,7 +2384,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2254,7 +2394,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -2267,22 +2408,56 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -2301,13 +2476,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -2324,16 +2497,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -2345,21 +2521,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -2372,14 +2533,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -2405,8 +2558,6 @@ realclean:
   ORB_Core.i \
   Profile.h \
   Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
@@ -2418,7 +2569,7 @@ realclean:
   Transport_Descriptor_Interface.inl
 
 .obj/Connection_Handler.o .obj/Connection_Handler.so .shobj/Connection_Handler.o .shobj/Connection_Handler.so: Connection_Handler.cpp Connection_Handler.h \
-  $(ACE_ROOT)/ace/pre.h LF_CH_Event.h LF_Event.h TAO_Export.h \
+  $(ACE_ROOT)/ace/pre.h LF_CH_Event.h LF_Event.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl LF_Event.inl \
@@ -2479,7 +2630,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2508,7 +2660,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2516,7 +2669,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i Services.h \
+  Exception.i ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -2529,20 +2683,52 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
+  OctetSeqC.i \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  CDR.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i Policy_ForwardC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
@@ -2556,13 +2742,10 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -2573,34 +2756,24 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Exception.h Adapter.i \
-  PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
+  StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any.h \
-  IOPC.i PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h \
+  IOPC.i PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   IOPC.h \
   Service_Callbacks.i \
@@ -2609,15 +2782,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -2650,6 +2816,11 @@ realclean:
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl Wait_Strategy.h Wait_Strategy.inl \
   $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
@@ -2701,7 +2872,8 @@ realclean:
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -2709,6 +2881,11 @@ realclean:
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  CONV_FRAMEC.h \
+  CDR.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -2729,7 +2906,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2760,44 +2938,75 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  Exception.i \
-  Acceptor_Registry.i \
-  Profile.h \
-  Tagged_Components.h \
-  IOPC.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
   Sequence.i \
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  CONV_FRAMEC.i \
+  Acceptor_Registry.i \
+  Profile.h \
+  Tagged_Components.h \
+  IOPC.h \
+  Object.h \
+  Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
   Tagged_Components.i \
   PolicyC.h \
   CurrentC.h \
@@ -2814,10 +3023,14 @@ realclean:
   Protocol_Factory.h \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   Policy_Manager.h \
@@ -2825,12 +3038,8 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -2847,12 +3056,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -2862,21 +3069,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -2889,14 +3081,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -2994,7 +3178,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3021,7 +3206,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -3068,6 +3254,119 @@ realclean:
   orbconf.h \
   TAO_Export.h \
   corbafwd.i \
+  Object_KeyC.h \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  Sequence.i \
+  Sequence_T.h \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  Object_KeyC.i \
   Acceptor_Filter.i
 
 .obj/iiop_endpoints.o .obj/iiop_endpoints.so .shobj/iiop_endpoints.o .shobj/iiop_endpoints.so: iiop_endpoints.cpp iiop_endpoints.h \
@@ -3122,12 +3421,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -3140,13 +3436,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3156,6 +3452,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -3174,21 +3488,35 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Typecode.h \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Exception.h \
   Exception.i \
-  Typecode.i iiop_endpoints.i
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i iiop_endpoints.i
 
 .obj/IIOP_Factory.o .obj/IIOP_Factory.so .shobj/IIOP_Factory.o .shobj/IIOP_Factory.so: IIOP_Factory.cpp IIOP_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -3257,7 +3585,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3284,7 +3613,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -3330,6 +3660,16 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -3338,11 +3678,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Transport_Acceptor.inl \
   IIOP_Connection_Handler.h \
@@ -3384,7 +3732,8 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
@@ -3421,14 +3770,6 @@ realclean:
   Acceptor_Impl.h \
   $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(ACE_ROOT)/ace/Hashable.h \
@@ -3445,10 +3786,14 @@ realclean:
   Acceptor_Impl.cpp \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -3463,9 +3808,10 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
   params.i \
   TAO_Singleton_Manager.h \
@@ -3478,12 +3824,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -3530,6 +3874,9 @@ realclean:
   Incoming_Message_Queue.inl \
   Synch_Refcountable.h \
   Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.i \
@@ -3613,7 +3960,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3640,7 +3988,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -3687,6 +4036,16 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -3695,11 +4054,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Transport_Acceptor.inl \
   IIOP_Connection_Handler.h \
@@ -3741,7 +4108,8 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
@@ -3778,14 +4146,6 @@ realclean:
   Acceptor_Impl.h \
   $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(ACE_ROOT)/ace/Hashable.h \
@@ -3802,10 +4162,14 @@ realclean:
   Acceptor_Impl.cpp \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -3820,9 +4184,10 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
   params.i \
   TAO_Singleton_Manager.h \
@@ -3835,12 +4200,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -3887,6 +4250,9 @@ realclean:
   Incoming_Message_Queue.inl \
   Synch_Refcountable.h \
   Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.i \
@@ -3974,7 +4340,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4003,7 +4370,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -4026,6 +4394,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -4034,11 +4431,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   CONV_FRAMEC.h \
   CONV_FRAMEC.i \
@@ -4053,8 +4458,6 @@ realclean:
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
   Profile.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
   IIOP_Endpoint.h \
   Endpoint.h \
   Endpoint.i \
@@ -4065,24 +4468,21 @@ realclean:
   $(ACE_ROOT)/ace/INET_Addr.i \
   IIOP_Endpoint.i \
   IIOP_Profile.i CDR.h Environment.h \
-  ORB.h corbafwd.h Exception.h Services.h \
-  Services.i CORBA_String.h objectid.h \
-  PolicyC.h ORB.i ORB_Core.h \
-  Policy_Manager.h Policy_Set.h \
+  ORB.h corbafwd.h Exception.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  ObjectIdListC.h ObjectIdListC.i objectid.h PolicyC.h \
+  ORB.i ORB_Core.h Policy_Manager.h \
+  Policy_Set.h \
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h params.h \
   params.i TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
@@ -4095,28 +4495,13 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
-  CurrentC.h DynamicC.h DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h \
-  Sequence.h OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  CurrentC.h DynamicC.h StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
@@ -4124,15 +4509,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -4215,7 +4593,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4244,7 +4623,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -4306,6 +4686,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -4314,11 +4696,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl \
@@ -4326,6 +4716,16 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
   IIOPC.h \
   IIOPC.i \
@@ -4352,11 +4752,6 @@ realclean:
   $(ACE_ROOT)/ace/Synch_Options.h \
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -4383,7 +4778,8 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
@@ -4424,10 +4820,14 @@ realclean:
   Acceptor_Impl.cpp \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -4442,7 +4842,6 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   params.h \
@@ -4457,12 +4856,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -4502,12 +4899,8 @@ realclean:
   IIOP_Acceptor.i IIOP_Profile.h \
   Profile.h \
   Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
   Tagged_Components.i \
   Profile.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
   IIOP_Endpoint.h \
   IIOP_Endpoint.i \
   IIOP_Profile.i Acceptor_Registry.h \
@@ -4547,7 +4940,8 @@ realclean:
   GIOP_Utils.i \
   GIOP_Message_State.h \
   GIOP_Message_State.inl \
-  GIOP_Message_Base.i GIOP_Message_Lite.h \
+  GIOP_Message_Base.i \
+  GIOP_Message_Lite.h \
   GIOP_Message_Lite.i Protocols_Hooks.h \
   Policy_ForwardC.h Adapter.h
 
@@ -4596,7 +4990,8 @@ realclean:
   $(ACE_ROOT)/ace/Init_ACE.i \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/SOCK_IO.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/SOCK_IO.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
   $(ACE_ROOT)/ace/INET_Addr.i \
   $(ACE_ROOT)/ace/SOCK_Stream.i \
@@ -4611,7 +5006,8 @@ realclean:
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4648,7 +5044,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -4783,6 +5180,10 @@ realclean:
   Sequence.i \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -4794,17 +5195,23 @@ realclean:
   IIOP_Profile.h Profile.h \
   Tagged_Components.h \
   IOPC.h \
-  Exception.h \
-  Exception.i \
   Object.h \
   Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   CONV_FRAMEC.h \
   CONV_FRAMEC.i \
@@ -4819,25 +5226,24 @@ realclean:
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
   Profile.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
   IIOP_Endpoint.h \
   Endpoint.h \
   Endpoint.i \
   CORBA_String.h \
   CORBA_String.inl \
   IIOP_Endpoint.i \
-  IIOP_Profile.i debug.h ORB_Core.h ORB.h \
-  Exception.h Services.h Services.i \
-  CORBA_String.h objectid.h PolicyC.h \
+  IIOP_Profile.i debug.h ORB_Core.h \
+  ORB.h Exception.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  ObjectIdListC.h ObjectIdListC.i objectid.h PolicyC.h \
   ORB.i Environment.h Policy_Manager.h \
   Policy_Set.h \
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
-  params.h params.i \
+  CONV_FRAMEC.h params.h params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
@@ -4845,8 +5251,8 @@ realclean:
   TAO_Singleton.h \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
-  CurrentC.h DynamicC.h DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h \
-  Sequence.h OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  CurrentC.h DynamicC.h StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   PortableInterceptorC.i Parser_Registry.h \
@@ -4875,12 +5281,17 @@ realclean:
   operation_details.h Service_Context.h \
   Service_Context.inl \
   target_specification.h target_specification.i operation_details.i \
-  Invocation.i Connect_Strategy.h Thread_Lane_Resources.h \
-  Thread_Lane_Resources.i Transport.h \
-  Transport_Timer.h Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
+  Transport.h Transport_Timer.h Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h Synch_Refcountable.inl \
-  Transport.inl Wait_Strategy.h Wait_Strategy.inl
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl Invocation.i Connect_Strategy.h Thread_Lane_Resources.h \
+  Thread_Lane_Resources.i \
+  Wait_Strategy.h Wait_Strategy.inl
 
 .obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.so .shobj/IIOP_Acceptor.o .shobj/IIOP_Acceptor.so: IIOP_Acceptor.cpp \
   IIOP_Acceptor.h \
@@ -4946,7 +5357,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4975,7 +5387,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -4998,6 +5411,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -5006,26 +5448,22 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Transport_Acceptor.inl \
   IIOP_Connection_Handler.h \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Connection_Handler.h \
   LF_CH_Event.h \
   LF_Event.h \
@@ -5041,16 +5479,12 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
   $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Containers_T.h \
@@ -5073,7 +5507,8 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
@@ -5089,9 +5524,6 @@ realclean:
   $(ACE_ROOT)/ace/Module.cpp \
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Recyclable.h \
   $(ACE_ROOT)/ace/Recyclable.inl \
   $(ACE_ROOT)/ace/Svc_Handler.cpp \
@@ -5113,14 +5545,6 @@ realclean:
   Acceptor_Impl.h \
   $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(ACE_ROOT)/ace/Hashable.h \
@@ -5137,10 +5561,14 @@ realclean:
   Acceptor_Impl.cpp \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -5155,9 +5583,10 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
   params.i \
   TAO_Singleton_Manager.h \
@@ -5170,12 +5599,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -5222,6 +5649,9 @@ realclean:
   Incoming_Message_Queue.inl \
   Synch_Refcountable.h \
   Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.i \
@@ -5231,22 +5661,20 @@ realclean:
   IIOP_Profile.h \
   Profile.h \
   Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
   Tagged_Components.i \
   Profile.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
   IIOP_Endpoint.h \
   IIOP_Endpoint.i \
   IIOP_Profile.i \
   MProfile.h \
   MProfile.i \
-  Protocols_Hooks.h
+  Protocols_Hooks.h \
+  Codeset_Manager.h
 
 .obj/IIOP_Connection_Handler.o .obj/IIOP_Connection_Handler.so .shobj/IIOP_Connection_Handler.o .shobj/IIOP_Connection_Handler.so: IIOP_Connection_Handler.cpp \
   IIOP_Connection_Handler.h \
-  $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/Reactor.h \
   $(ACE_ROOT)/ace/Handle_Set.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
@@ -5275,7 +5703,8 @@ realclean:
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Handle_Set.i \
   $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5332,12 +5761,9 @@ realclean:
   Sequence.i \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -5350,6 +5776,23 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -5367,15 +5810,21 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IIOPC.i \
@@ -5386,16 +5835,12 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
   $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Containers_T.h \
@@ -5418,7 +5863,8 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
@@ -5434,9 +5880,6 @@ realclean:
   $(ACE_ROOT)/ace/Module.cpp \
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Recyclable.h \
   $(ACE_ROOT)/ace/Recyclable.inl \
   $(ACE_ROOT)/ace/Svc_Handler.cpp \
@@ -5460,12 +5903,14 @@ realclean:
   debug.h \
   ORB_Core.h \
   ORB.h \
-  Exception.h \
-  Exception.i \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -5473,6 +5918,8 @@ realclean:
   Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -5487,6 +5934,8 @@ realclean:
   LocalObject.i \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
   params.i \
   TAO_Singleton_Manager.h \
@@ -5499,16 +5948,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -5529,14 +5981,6 @@ realclean:
   Cleanup_Func_Registry.h \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -5560,6 +6004,9 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
   IIOP_Transport.i \
   IIOP_Endpoint.h \
@@ -5611,7 +6058,8 @@ realclean:
   TAO_Export.h \
   corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -5675,7 +6123,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -5695,6 +6144,36 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -5703,12 +6182,20 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i Any.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i Any_T.h \
+  Any.h \
   Object.h \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  Any.i IOPC.i debug.h
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Any_T.h \
+  Marshal.h \
+  Marshal.i \
+  debug.h IOPC.i debug.h
 
 .obj/IIOPC.o .obj/IIOPC.so .shobj/IIOPC.o .shobj/IIOPC.so: IIOPC.cpp IIOPC.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -5762,12 +6249,9 @@ realclean:
   Sequence.i \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -5780,13 +6264,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5796,6 +6280,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -5814,29 +6316,53 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  IIOPC.i \
-  Typecode.h \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Exception.h \
   Exception.i \
   Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  IIOPC.i \
+  Any_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
-  Any.i
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h
 
 .obj/default_client.o .obj/default_client.so .shobj/default_client.o .shobj/default_client.so: default_client.cpp default_client.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -5877,7 +6403,8 @@ realclean:
   TAO_Export.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -5908,7 +6435,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5961,7 +6489,8 @@ realclean:
   corbafwd.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  Exception.i Services.h \
+  Exception.i ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -5974,20 +6503,33 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Exception.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
+  OctetSeqC.i \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  CDR.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i Policy_ForwardC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
@@ -5998,8 +6540,8 @@ realclean:
   LocalObject.i \
   debug.h \
   Policy_Manager.i Resource_Factory.h \
-  params.h params.i \
-  TAO_Singleton_Manager.h \
+  CONV_FRAMEC.h CONV_FRAMEC.i params.h \
+  params.i TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -6010,17 +6552,22 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Exception.h Adapter.i \
-  PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h DynamicC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
+  DynamicC.h StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any.h \
-  IOPC.i PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h \
+  IOPC.i PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
@@ -6031,15 +6578,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -6111,7 +6651,8 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -6142,7 +6683,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -6194,7 +6736,8 @@ realclean:
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -6207,22 +6750,37 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -6238,6 +6796,8 @@ realclean:
   debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
   params.i \
   TAO_Singleton_Manager.h \
@@ -6255,16 +6815,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -6288,14 +6851,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -6359,7 +6914,8 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.i \
   TAO_Export.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -6367,6 +6923,16 @@ realclean:
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  CONV_FRAMEC.h \
+  CDR.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -6387,7 +6953,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -6418,6 +6985,29 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  Sequence.i \
+  Sequence_T.h \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -6436,47 +7026,32 @@ realclean:
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
-  default_resource.i \
-  ORB_Core.h \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  orbconf.h \
-  corbafwd.i \
-  ORB.h \
   Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  CONV_FRAMEC.i \
+  default_resource.i \
+  ORB_Core.h \
+  ORB.h \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -6508,16 +7083,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -6541,14 +7119,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -6602,11 +7172,40 @@ realclean:
   LF_Strategy.h \
   LF_Strategy.inl \
   LF_Strategy_Complete.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Codeset_Manager.h \
+  Profile.h \
+  Tagged_Components.h \
+  Tagged_Components.i \
+  GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
+  Profile.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Transport.inl \
   $(ACE_ROOT)/ace/TP_Reactor.h \
   $(ACE_ROOT)/ace/Select_Reactor.h \
   $(ACE_ROOT)/ace/Select_Reactor_T.h \
   $(ACE_ROOT)/ace/Select_Reactor_Base.h \
-  $(ACE_ROOT)/ace/Token.h $(ACE_ROOT)/ace/Token.i \
+  $(ACE_ROOT)/ace/Token.h \
   $(ACE_ROOT)/ace/Pipe.h $(ACE_ROOT)/ace/Pipe.i \
   $(ACE_ROOT)/ace/Select_Reactor_Base.i \
   $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
@@ -6619,7 +7218,9 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp \
-  $(ACE_ROOT)/ace/Arg_Shifter.h
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  $(ACE_ROOT)/ace/Codeset_Registry.h \
+  $(ACE_ROOT)/ace/Codeset_Registry.inl
 
 .obj/xt_resource.o .obj/xt_resource.so .shobj/xt_resource.o .shobj/xt_resource.so: xt_resource.cpp \
   xt_resource.h \
@@ -6661,7 +7262,8 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.i \
   TAO_Export.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -6669,6 +7271,16 @@ realclean:
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  CONV_FRAMEC.h \
+  CDR.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -6689,7 +7301,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -6720,6 +7333,29 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  Sequence.i \
+  Sequence_T.h \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -6738,6 +7374,12 @@ realclean:
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CONV_FRAMEC.i \
   default_resource.i
 
 .obj/qt_resource.o .obj/qt_resource.so .shobj/qt_resource.o .shobj/qt_resource.so: qt_resource.cpp \
@@ -6780,7 +7422,8 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.i \
   TAO_Export.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -6788,6 +7431,16 @@ realclean:
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  CONV_FRAMEC.h \
+  CDR.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -6808,7 +7461,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -6839,6 +7493,29 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  Sequence.i \
+  Sequence_T.h \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -6857,6 +7534,12 @@ realclean:
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CONV_FRAMEC.i \
   default_resource.i
 
 .obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp Marshal.h \
@@ -6893,25 +7576,8 @@ realclean:
   TAO_Export.h \
   corbafwd.i \
   Typecode.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -6924,9 +7590,41 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
@@ -6949,15 +7647,29 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
   Typecode.i \
   Marshal.i \
@@ -6984,6 +7696,8 @@ realclean:
   Sequence_T.cpp \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   Any.i \
   ValueBase.h \
@@ -7024,25 +7738,8 @@ realclean:
   TAO_Export.h \
   corbafwd.i \
   Typecode.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -7055,9 +7752,41 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
@@ -7080,15 +7809,29 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
   Typecode.i \
   Marshal.i \
@@ -7138,25 +7881,8 @@ realclean:
   TAO_Export.h \
   corbafwd.i \
   Typecode.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -7169,9 +7895,41 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
@@ -7194,15 +7952,29 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
   Typecode.i \
   Marshal.i \
@@ -7229,6 +8001,8 @@ realclean:
   Environment.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   Any.i \
   ValueBase.h \
@@ -7299,7 +8073,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -7328,7 +8103,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7337,7 +8113,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
@@ -7348,22 +8125,56 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -7372,8 +8183,9 @@ realclean:
   PolicyC.i \
   ORB.i
 
-.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp Any.h \
+.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp Any_T.h \
   $(ACE_ROOT)/ace/pre.h \
+  Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -7427,7 +8239,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -7456,7 +8269,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7485,26 +8299,64 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
   Marshal.h \
   Marshal.i \
+  debug.h \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -7519,19 +8371,16 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -7548,12 +8397,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -7565,21 +8412,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -7592,14 +8424,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -7623,8 +8447,9 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i \
-  AbstractBase.h \
-  AbstractBase.inl
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp
 
 .obj/CORBA_String.o .obj/CORBA_String.so .shobj/CORBA_String.o .shobj/CORBA_String.so: CORBA_String.cpp \
   CORBA_String.h \
@@ -7664,8 +8489,7 @@ realclean:
   Managed_Types.i \
   CORBA_String.inl
 
-.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp CurrentC.h \
-  $(ACE_ROOT)/ace/pre.h \
+.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp CurrentC.h $(ACE_ROOT)/ace/pre.h \
   Object.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -7718,12 +8542,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -7736,13 +8557,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -7752,6 +8573,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -7770,21 +8609,50 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i \
+  Any_T.h \
+  Any.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h
 
 .obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -7860,7 +8728,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -7885,7 +8754,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7895,6 +8765,32 @@ realclean:
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
   Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Typecode.i \
   Environment.h \
   Environment.i \
@@ -7919,13 +8815,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   Any.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -7944,10 +8846,9 @@ realclean:
   debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -7964,12 +8865,17 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  Any_T.h \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -7981,21 +8887,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -8008,14 +8899,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -8102,7 +8985,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -8131,7 +9015,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -8162,10 +9047,41 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -8174,10 +9090,14 @@ realclean:
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -8192,13 +9112,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -8215,16 +9133,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -8236,21 +9157,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -8263,14 +9169,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -8314,10 +9212,30 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   PortableInterceptor.h \
   RequestInfo_Util.h \
@@ -8391,7 +9309,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -8420,7 +9339,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -8429,7 +9349,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -8442,20 +9363,54 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Services.i \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -8474,13 +9429,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -8497,16 +9450,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -8518,21 +9474,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -8545,14 +9486,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -8630,12 +9563,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -8648,13 +9578,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -8664,6 +9594,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -8682,37 +9630,59 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   Stub.h \
   MProfile.h \
   PolicyC.h \
   CurrentC.h \
   CurrentC.i \
-  Exception.h \
-  Exception.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -8727,13 +9697,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -8750,16 +9718,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -8771,21 +9742,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -8798,14 +9754,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -8834,8 +9782,6 @@ realclean:
   Stub.i \
   Profile.h \
   Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
@@ -8855,10 +9801,30 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   Connector_Registry.h \
   Endpoint.h \
@@ -8926,12 +9892,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -8944,13 +9907,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -8960,6 +9923,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -8978,29 +9959,46 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i LocalObject.i PolicyC.h \
-  CurrentC.h Object.h \
-  CurrentC.i Policy_ForwardC.h \
-  Exception.h Exception.i \
-  Remote_Object_Proxy_Impl.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i Object_KeyC.h LocalObject.i \
+  PolicyC.h CurrentC.h Object.h \
+  CurrentC.i Policy_ForwardC.h Exception.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i debug.h
 
-.obj/ObjectIDList.o .obj/ObjectIDList.so .shobj/ObjectIDList.o .shobj/ObjectIDList.so: ObjectIDList.cpp \
-  ObjectIDList.h \
+.obj/ObjectIDListC.o .obj/ObjectIDListC.so .shobj/ObjectIDListC.o .shobj/ObjectIDListC.so: ObjectIDListC.cpp ObjectIdListC.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -9052,23 +10050,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  ObjectIDList.i \
   Typecode.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -9081,6 +10065,34 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -9105,23 +10117,33 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
   Exception.i \
   Typecode.i \
-  ORB.h \
-  Services.h \
-  Services.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  objectid.h \
+  Environment.h \
+  Environment.i ObjectIdListC.i \
+  Stub.h \
+  MProfile.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
@@ -9132,15 +10154,168 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
   PolicyC.i \
+  MProfile.i \
+  ORB.h \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
+  CORBA_String.h \
+  CORBA_String.inl \
+  ObjectIdListC.h \
+  objectid.h \
   ORB.i \
+  ORB_Core.h \
+  Policy_Manager.h \
+  Policy_Set.h \
+  Policy_Set.i \
+  LocalObject.h \
+  LocalObject.i \
+  debug.h \
+  Policy_Manager.i \
+  Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  params.h \
+  params.i \
+  TAO_Singleton_Manager.h \
+  TAO_Singleton_Manager.inl \
+  TAO_Singleton.h \
+  TAO_Singleton.inl \
+  TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  Adapter.h \
+  Adapter.i \
+  PolicyFactory_Registry.h \
+  PortableInterceptorC.h \
+  DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Any.i
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
+  ValueBase.h \
+  ValueBase.i \
+  ObjectReferenceTemplateC.i \
+  Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOPC.i \
+  PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  Parser_Registry.h \
+  Parser_Registry.i \
+  Service_Callbacks.h \
+  Service_Callbacks.i \
+  Fault_Tolerance_Service.h \
+  Fault_Tolerance_Service.i \
+  Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  Cleanup_Func_Registry.inl \
+  Object_Ref_Table.h \
+  Interceptor_List.h \
+  Interceptor_List.inl \
+  PICurrent.h \
+  PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  ORB_Core.i \
+  ORB_Core_Auto_Ptr.h \
+  ORB_Core_Auto_Ptr.inl \
+  Stub.i \
+  Invocation.h \
+  Synch_Reply_Dispatcher.h \
+  Reply_Dispatcher.h \
+  Condition.h \
+  Condition.inl \
+  Condition.cpp \
+  Reply_Dispatcher.i \
+  LF_Invocation_Event.h \
+  LF_Event.h \
+  LF_Event.inl \
+  LF_Invocation_Event.inl \
+  GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
+  operation_details.h \
+  Service_Context.h \
+  Service_Context.inl \
+  target_specification.h \
+  target_specification.i \
+  operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
+  Invocation.i \
+  PortableInterceptor.h \
+  RequestInfo_Util.h \
+  ClientRequestInfo_i.h \
+  ClientRequestInfo_i.inl \
+  ClientInterceptorAdapter.h \
+  ClientInterceptorAdapter.inl
 
 .obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp ORB.h $(ACE_ROOT)/ace/pre.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -9201,7 +10376,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -9230,7 +10406,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -9238,7 +10415,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i Services.h \
+  Exception.i ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -9251,23 +10429,7 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  varbase.h \
-  Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h Encodable.h \
-  PolicyC.i ORB.i ORB_Table.h \
+  Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -9295,10 +10457,30 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
+  varbase.h \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i Policy_ForwardC.h \
+  Remote_Object_Proxy_Impl.h \
+  Object_Proxy_Impl.h Encodable.h \
+  PolicyC.i ORB.i ORB_Table.h \
   ORB_Table.inl Connector_Registry.h \
   Endpoint.h Endpoint.i \
   Connector_Registry.i IOR_Parser.h \
-  Exception.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
@@ -9306,8 +10488,7 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.i \
   IOR_Parser.i Parser_Registry.h \
   Parser_Registry.i Object.h Typecode.h \
-  Typecode.i Stub.h \
-  MProfile.h \
+  Stub.h MProfile.h \
   PolicyC.h \
   MProfile.i \
   ORB.h \
@@ -9320,6 +10501,8 @@ realclean:
   debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
   objectid.h \
   CORBA_String.h \
@@ -9340,15 +10523,19 @@ realclean:
   PortableInterceptorC.h \
   CurrentC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -9400,17 +10587,14 @@ realclean:
   TAO_Internal.h TAO_Export.h NVList.h \
   NVList.i Dynamic_Adapter.h CDR.h \
   MProfile.h Profile.h Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
   Tagged_Components.i \
   GIOP_Message_Version.h \
-  GIOP_Message_Version.inl Profile.i \
-  default_ports.h ORBInitInfo.h PortableInterceptorC.h LocalObject.h \
-  StringSeqC.h ORBInitInfo.inl ORBInitializer_Registry.h \
+  GIOP_Message_Version.inl Object_KeyC.h \
+  Profile.i default_ports.h ORBInitInfo.h PortableInterceptorC.h \
+  LocalObject.h StringSeqC.h ORBInitInfo.inl ORBInitializer_Registry.h \
   CodecFactory_ORBInitializer.h TypeCodeFactory_Adapter.h \
   PICurrent_ORBInitializer.h PICurrent.h ValueFactory_Map.h \
-  ValueFactory_Map.i Object_KeyC.h \
-  Object_KeyC.i \
+  ValueFactory_Map.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -9523,11 +10707,9 @@ realclean:
   Sequence.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -9540,13 +10722,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -9556,6 +10738,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -9574,15 +10774,32 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i varbase.h Policy_ForwardC.i \
   Stub.h \
@@ -9591,21 +10808,26 @@ realclean:
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   varbase.h \
   CurrentC.i \
-  Exception.h \
-  Exception.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  CDR.h \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -9620,13 +10842,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -9643,16 +10863,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -9664,21 +10887,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -9691,14 +10899,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -9726,7 +10926,6 @@ realclean:
   ORB_Core_Auto_Ptr.inl \
   Stub.i \
   Invocation.h \
-  CDR.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
   Condition.h \
@@ -9743,10 +10942,30 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   PortableInterceptor.h \
   RequestInfo_Util.h \
@@ -9808,12 +11027,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -9826,13 +11042,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -9842,6 +11058,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -9860,34 +11094,55 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i Policy_ForwardC.h \
-  Exception.h Exception.i \
-  Remote_Object_Proxy_Impl.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i Policy_ForwardC.h \
+  Exception.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i Stub.h \
   MProfile.h \
   PolicyC.h \
   MProfile.i \
   ORB.h \
-  Exception.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -9902,13 +11157,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -9926,16 +11179,19 @@ realclean:
   PortableInterceptorC.h \
   CurrentC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -9947,21 +11203,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -9974,14 +11215,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -10025,10 +11258,30 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   PortableInterceptor.h \
   RequestInfo_Util.h \
@@ -10090,12 +11343,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -10108,13 +11358,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -10124,6 +11374,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -10142,26 +11410,46 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i Environment.h \
-  ORB_Core.h corbafwd.h ORB.h Exception.h \
-  Exception.i Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h Object.h \
-  Object.i \
-  CurrentC.i Policy_ForwardC.h \
+  ORB_Core.h corbafwd.h ORB.h Exception.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Policy_Manager.h \
@@ -10175,13 +11463,10 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -10192,34 +11477,24 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Exception.h Adapter.i \
-  PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h DynamicC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
+  DynamicC.h StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any.h \
-  IOPC.i PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h \
+  IOPC.i PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   IOPC.h \
   Service_Callbacks.i \
@@ -10228,15 +11503,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -10504,7 +11772,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -10533,7 +11802,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -10560,6 +11830,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -10568,16 +11867,22 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Encodable.h \
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -10592,13 +11897,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -10615,16 +11918,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -10636,21 +11942,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -10663,14 +11954,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -10714,10 +11997,30 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   IFR_Client_Adapter.h \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
@@ -10759,25 +12062,8 @@ realclean:
   TAO_Export.h \
   corbafwd.i \
   Typecode.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -10790,9 +12076,41 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
@@ -10815,17 +12133,32 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
   Typecode.i \
+  Any_T.h \
   Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -10849,12 +12182,18 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   NVList.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   NVList.i \
   LocalObject.h \
   LocalObject.i \
@@ -10863,10 +12202,12 @@ realclean:
   OctetSeqC.i \
   Principal.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -10882,15 +12223,10 @@ realclean:
   ValueBase.i \
   ValueFactory.h \
   ValueFactory.i \
-  AbstractBase.h \
-  AbstractBase.inl \
   DomainC.h \
   WrongTransactionC.h \
   WrongTransactionC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  ObjectIDList.h \
-  ObjectIDList.i \
+  ObjectIDListC.h \
   StringSeqC.h \
   StringSeqC.i \
   PortableInterceptorC.h \
@@ -10903,22 +12239,22 @@ realclean:
   IOPC.h \
   IOPC.i \
   PortableInterceptorC.i PolicyC.h \
-  Sequence.h DomainC.i Stub.h \
+  DomainC.i Stub.h \
   MProfile.h \
   MProfile.i \
   ORB_Core.h \
   Policy_Manager.h \
   Policy_Set.h \
   Policy_Set.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
   params.i \
   TAO_Singleton_Manager.h \
@@ -10937,21 +12273,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -10964,14 +12285,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -11017,6 +12330,28 @@ realclean:
   target_specification.h \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   PortableInterceptor.h \
   RequestInfo_Util.h \
@@ -11062,7 +12397,8 @@ realclean:
   orbconf.h \
   TAO_Export.h \
   corbafwd.i \
-  CDR.h \
+  Any_T.h \
+  Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
@@ -11089,7 +12425,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -11118,7 +12455,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -11132,8 +12470,6 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Any.h \
   Object.h \
   Policy_ForwardC.h \
   Sequence.h \
@@ -11145,16 +12481,54 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
   Environment.i \
+  CDR.h \
+  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i TAO_Export.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h TAO_Export.h \
   SmartProxies/Smart_Proxies.h \
   SmartProxies/smartproxies_export.h \
   TAO_Singleton.h \
@@ -11179,10 +12553,14 @@ realclean:
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -11191,31 +12569,26 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   Adapter.h \
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -11227,21 +12600,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -11254,14 +12612,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -11305,10 +12655,30 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   RequestInfo_Util.h
 
@@ -11365,24 +12735,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  OctetSeqC.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  Principal.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -11395,6 +12750,34 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -11419,15 +12802,35 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  OctetSeqC.i \
+  Principal.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i
 
@@ -11482,6 +12885,96 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
   Environment.i
 
@@ -11551,12 +13044,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -11569,6 +13059,23 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -11593,23 +13100,41 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
-  Exception.h \
-  Exception.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
@@ -11618,10 +13143,16 @@ realclean:
   Profile.h \
   Tagged_Components.h \
   IOPC.h \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   CONV_FRAMEC.h \
   CONV_FRAMEC.i \
@@ -11663,7 +13194,8 @@ realclean:
   TAO_Export.h \
   corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -11697,12 +13229,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -11715,6 +13244,23 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -11739,33 +13285,55 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
-  Exception.h \
-  Exception.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -11780,13 +13348,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -11803,16 +13369,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -11824,21 +13393,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -11851,14 +13405,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -11885,12 +13431,12 @@ realclean:
   ORB_Core_Auto_Ptr.h \
   ORB_Core_Auto_Ptr.inl \
   Stub.i Profile.h corbafwd.h \
-  Tagged_Components.h CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
+  Tagged_Components.h \
   Tagged_Components.i PolicyC.h \
   GIOP_Message_Version.h \
-  GIOP_Message_Version.inl Profile.i \
-  Sequence.h Object.h Invocation.h CDR.h Synch_Reply_Dispatcher.h \
+  GIOP_Message_Version.inl Object_KeyC.h \
+  Profile.i Sequence.h Object.h Invocation.h CDR.h \
+  Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
   Condition.h \
   Condition.inl \
@@ -11903,14 +13449,8 @@ realclean:
   GIOP_Message_Version.h \
   Messaging_SyncScopeC.h operation_details.h Service_Context.h \
   Service_Context.inl \
-  target_specification.h Object_KeyC.h \
-  Object_KeyC.i target_specification.i \
-  operation_details.i Invocation.i Asynch_Invocation.h \
-  Invocation.h \
-  Asynch_Invocation.i ORB_Core.h \
-  Client_Strategy_Factory.h TAO_Export.h Sync_Strategies.h \
-  Transport.h \
-  Transport_Cache_Manager.h \
+  target_specification.h target_specification.i operation_details.i \
+  Transport.h Exception.h Transport_Cache_Manager.h \
   Cache_Entries.h \
   Transport_Descriptor_Interface.h \
   Transport_Descriptor_Interface.inl \
@@ -11918,16 +13458,21 @@ realclean:
   $(ACE_ROOT)/ace/Recyclable.inl \
   Cache_Entries.inl \
   Transport_Cache_Manager.inl \
-  Transport_Timer.h \
-  Incoming_Message_Queue.h \
+  Transport_Timer.h TAO_Export.h Incoming_Message_Queue.h \
   Pluggable_Messaging_Utils.h \
   Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Synch_Refcountable.h \
+  Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  Synch_Refcountable.inl \
-  Transport.inl \
+  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  CONV_FRAMEC.h Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl Invocation.i Asynch_Invocation.h \
+  Invocation.h \
+  Asynch_Invocation.i ORB_Core.h \
+  Client_Strategy_Factory.h Sync_Strategies.h \
+  Transport.h \
   TAOC.h \
   TimeBaseC.h \
   SmartProxies/Smart_Proxies.h \
@@ -11940,12 +13485,14 @@ realclean:
   Buffering_Constraint_Policy.i debug.h
 
 .obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp Typecode.h \
-  $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
@@ -11953,6 +13500,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_Memory.h \
@@ -11961,51 +13509,56 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  Exception.h \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  orbconf.h \
-  TAO_Export.h \
-  corbafwd.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
@@ -12028,15 +13581,35 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  TAO_Export.h \
+  corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
   Typecode.i \
   Environment.h \
@@ -12062,6 +13635,8 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   Any.i \
   Marshal.h \
@@ -12109,7 +13684,8 @@ realclean:
   AbstractBase.inl \
   Stub.h \
   MProfile.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -12140,12 +13716,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -12158,6 +13731,23 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -12182,33 +13772,55 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
-  Exception.h \
-  Exception.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -12223,13 +13835,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -12246,16 +13856,17 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -12267,21 +13878,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -12294,14 +13890,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -12330,8 +13918,6 @@ realclean:
   Stub.i \
   Profile.h \
   Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
@@ -12372,6 +13958,8 @@ realclean:
   orbconf.h \
   TAO_Export.h \
   corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
@@ -12398,7 +13986,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -12427,7 +14016,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -12444,10 +14034,9 @@ realclean:
   CDR.i \
   ORB.h \
   Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -12455,11 +14044,43 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -12467,6 +14088,8 @@ realclean:
   Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -12486,13 +14109,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -12509,16 +14130,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -12530,21 +14154,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -12557,14 +14166,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -12626,7 +14227,8 @@ realclean:
   TAO_Export.h \
   corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -12649,8 +14251,8 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
@@ -12681,7 +14283,8 @@ realclean:
   $(ACE_ROOT)/ace/Init_ACE.i \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
@@ -12690,7 +14293,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -12703,7 +14307,8 @@ realclean:
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -12811,6 +14416,8 @@ realclean:
   orbconf.h \
   TAO_Export.h \
   corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
@@ -12837,7 +14444,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -12866,7 +14474,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -12884,10 +14493,9 @@ realclean:
   ORB_Core.h \
   ORB.h \
   Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -12895,11 +14503,43 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -12907,6 +14547,8 @@ realclean:
   Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -12925,13 +14567,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -12948,16 +14588,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -12969,21 +14612,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -12996,14 +14624,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -13073,8 +14693,7 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl
 
-.obj/Object_KeyC.o .obj/Object_KeyC.so .shobj/Object_KeyC.o .shobj/Object_KeyC.so: Object_KeyC.cpp \
-  Object_KeyC.h \
+.obj/Object_KeyC.o .obj/Object_KeyC.so .shobj/Object_KeyC.o .shobj/Object_KeyC.so: Object_KeyC.cpp Object_KeyC.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -13126,23 +14745,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Object_KeyC.i \
   Typecode.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -13155,6 +14760,34 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -13179,17 +14812,151 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
   Exception.i \
-  Typecode.i
+  Typecode.i \
+  Environment.h \
+  Environment.i Object_KeyC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ORB_Core.h \
+  ORB.h \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
+  CORBA_String.h \
+  CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
+  objectid.h \
+  PolicyC.h \
+  CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
+  varbase.h \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object.i \
+  CurrentC.i \
+  Remote_Object_Proxy_Impl.h \
+  Object_Proxy_Impl.h \
+  Encodable.h \
+  PolicyC.i \
+  ORB.i \
+  Policy_Manager.h \
+  Policy_Set.h \
+  Policy_Set.i \
+  LocalObject.h \
+  LocalObject.i \
+  debug.h \
+  Policy_Manager.i \
+  Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  params.h \
+  params.i \
+  TAO_Singleton_Manager.h \
+  TAO_Singleton_Manager.inl \
+  TAO_Singleton.h \
+  TAO_Singleton.inl \
+  TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  Adapter.h \
+  Adapter.i \
+  PolicyFactory_Registry.h \
+  PortableInterceptorC.h \
+  DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
+  Any.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
+  ValueBase.h \
+  ValueBase.i \
+  ObjectReferenceTemplateC.i \
+  Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOPC.i \
+  PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  Parser_Registry.h \
+  Parser_Registry.i \
+  Service_Callbacks.h \
+  Service_Callbacks.i \
+  Fault_Tolerance_Service.h \
+  Fault_Tolerance_Service.i \
+  Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  Cleanup_Func_Registry.inl \
+  Object_Ref_Table.h \
+  Interceptor_List.h \
+  Interceptor_List.inl \
+  PICurrent.h \
+  PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  ORB_Core.i
 
 .obj/Protocols_Hooks.o .obj/Protocols_Hooks.so .shobj/Protocols_Hooks.o .shobj/Protocols_Hooks.so: Protocols_Hooks.cpp Protocols_Hooks.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -13243,11 +15010,9 @@ realclean:
   Sequence.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -13260,13 +15025,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -13276,6 +15041,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -13294,21 +15077,37 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i varbase.h Policy_ForwardC.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
@@ -13368,11 +15167,9 @@ realclean:
   Sequence.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -13385,13 +15182,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -13401,6 +15198,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -13419,27 +15234,11 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i varbase.h Policy_ForwardC.i \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -13454,13 +15253,28 @@ realclean:
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i varbase.h Policy_ForwardC.i \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
   Default_Protocols_Hooks.i PolicyC.h \
   CurrentC.h Object.h \
   Policy_ForwardC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
-  varbase.h \
-  CurrentC.i Exception.h \
-  Exception.i Remote_Object_Proxy_Impl.h \
+  varbase.h CurrentC.i Exception.h \
+  Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
@@ -13474,7 +15288,8 @@ realclean:
   Connection_Handler.inl
 
 .obj/Messaging_SyncScopeC.o .obj/Messaging_SyncScopeC.so .shobj/Messaging_SyncScopeC.o .shobj/Messaging_SyncScopeC.so: Messaging_SyncScopeC.cpp Messaging_SyncScopeC.h \
-  $(ACE_ROOT)/ace/pre.h corbafwd.h \
+  $(ACE_ROOT)/ace/pre.h \
+  corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -13506,26 +15321,8 @@ realclean:
   TAO_Export.h \
   corbafwd.i Messaging_SyncScopeC.i \
   Typecode.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  Exception.h \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -13538,9 +15335,41 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
@@ -13563,15 +15392,29 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
   Typecode.i
 
@@ -13608,6 +15451,8 @@ realclean:
   orbconf.h \
   TAO_Export.h \
   corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
@@ -13634,7 +15479,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -13663,7 +15509,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -13681,8 +15528,6 @@ realclean:
   Reply_Dispatcher.h \
   IOPC.h \
   Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
   Object.h \
   Policy_ForwardC.h \
@@ -13693,16 +15538,53 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Condition.h \
   Condition.inl \
@@ -13714,12 +15596,35 @@ realclean:
   LF_Invocation_Event.inl \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
-  Messaging_SyncScopeC.h corbafwd.h Messaging_SyncScopeC.i \
-  operation_details.h Service_Context.h \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i operation_details.h \
+  corbafwd.h Service_Context.h \
   Service_Context.inl \
-  target_specification.h Object_KeyC.h \
-  Object_KeyC.i target_specification.i \
-  operation_details.i Invocation.i Stub.h \
+  target_specification.h target_specification.i operation_details.i \
+  Transport.h Exception.h Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h TAO_Export.h Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl Invocation.i Stub.h \
   MProfile.h \
   PolicyC.h \
   CurrentC.h \
@@ -13730,10 +15635,14 @@ realclean:
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -13742,19 +15651,9 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -13771,12 +15670,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -13785,21 +15682,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -13812,14 +15694,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -13846,27 +15720,10 @@ realclean:
   ORB_Core_Auto_Ptr.h \
   ORB_Core_Auto_Ptr.inl \
   Stub.i Profile.h Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
   Tagged_Components.i PolicyC.h \
-  GIOP_Message_Version.h Profile.i Timeprobe.h \
-  $(ACE_ROOT)/ace/Timeprobe.h Object_KeyC.h debug.h \
-  Transport.h Exception.h Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Transport_Descriptor_Interface.inl \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  Cache_Entries.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h TAO_Export.h Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl Connector_Registry.h Endpoint.h \
-  Endpoint.i \
+  GIOP_Message_Version.h Object_KeyC.h Profile.i Timeprobe.h \
+  $(ACE_ROOT)/ace/Timeprobe.h debug.h Connector_Registry.h \
+  Endpoint.h Endpoint.i \
   Connector_Registry.i Wait_Strategy.h \
   Wait_Strategy.inl Transport_Mux_Strategy.h Bind_Dispatcher_Guard.h \
   Bind_Dispatcher_Guard.i \
@@ -13879,7 +15736,9 @@ realclean:
   SmartProxies/Smart_Proxies.h \
   SmartProxies/smartproxies_export.h \
   SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i TAOC.i
+  TimeBaseC.i TAOC.i Codeset_Manager.h \
+  Profile.h \
+  Transport.h
 
 .obj/Invocation_Endpoint_Selectors.o .obj/Invocation_Endpoint_Selectors.so .shobj/Invocation_Endpoint_Selectors.o .shobj/Invocation_Endpoint_Selectors.so: Invocation_Endpoint_Selectors.cpp \
   Invocation_Endpoint_Selectors.h \
@@ -13946,7 +15805,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -13975,7 +15835,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -14004,15 +15865,52 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Condition.h \
   Condition.inl \
@@ -14030,10 +15928,37 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   Stub.h \
   MProfile.h \
@@ -14046,10 +15971,14 @@ realclean:
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -14058,19 +15987,9 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -14087,12 +16006,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -14100,21 +16017,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -14127,14 +16029,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -14163,15 +16057,11 @@ realclean:
   Stub.i \
   Profile.h \
   Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
   Tagged_Components.i \
   Profile.i \
   Endpoint.h \
   Endpoint.i \
   Base_Transport_Property.h \
-  Transport_Descriptor_Interface.h \
-  Transport_Descriptor_Interface.inl \
   Base_Transport_Property.inl
 
 .obj/Asynch_Invocation.o .obj/Asynch_Invocation.so .shobj/Asynch_Invocation.o .shobj/Asynch_Invocation.so: Asynch_Invocation.cpp \
@@ -14210,6 +16100,8 @@ realclean:
   orbconf.h \
   TAO_Export.h \
   corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
@@ -14236,7 +16128,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -14265,7 +16158,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -14284,8 +16178,6 @@ realclean:
   Reply_Dispatcher.h \
   IOPC.h \
   Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
   Object.h \
   Policy_ForwardC.h \
@@ -14296,15 +16188,52 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Condition.h \
   Condition.inl \
@@ -14322,10 +16251,37 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   Asynch_Invocation.i \
   Timeprobe.h \
@@ -14341,10 +16297,14 @@ realclean:
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -14353,19 +16313,9 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -14382,12 +16332,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -14395,21 +16343,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -14422,14 +16355,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -14458,30 +16383,9 @@ realclean:
   Stub.i \
   Profile.h \
   Tagged_Components.h \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
   Tagged_Components.i \
   Profile.i \
-  Transport_Mux_Strategy.h \
-  Transport.h \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Transport_Descriptor_Interface.inl \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  Cache_Entries.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  Synch_Refcountable.inl \
-  Transport.inl
+  Transport_Mux_Strategy.h
 
 .obj/operation_details.o .obj/operation_details.so .shobj/operation_details.o .shobj/operation_details.so: operation_details.cpp \
   operation_details.h \
@@ -14547,7 +16451,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -14576,7 +16481,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -14599,6 +16505,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -14607,16 +16542,22 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i
 
@@ -14627,11 +16568,13 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i PortableInterceptorC.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h PortableInterceptorC.h \
   corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -14644,7 +16587,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -14673,12 +16615,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -14691,13 +16630,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -14707,6 +16646,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -14725,36 +16682,59 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i DynamicC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i DynamicC.h \
+  StringSeqC.h corbafwd.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h corbafwd.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h OctetSeqC.i ValueBase.h \
   ValueBase.i Exception.h \
   ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
+  Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h IOPC.i PolicyC.h \
   Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
-  PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
-  ClientRequestInfo.inl ClientRequestInfo_i.h PICurrent.h \
+  PolicyC.i PortableInterceptorC.i LocalObject.h Object_KeyC.h \
+  LocalObject.i ClientRequestInfo.inl ClientRequestInfo_i.h PICurrent.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp PICurrent.inl \
@@ -14814,12 +16794,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -14832,13 +16809,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -14848,6 +16825,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -14866,39 +16861,62 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i DynamicC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i DynamicC.h \
+  StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h OctetSeqC.i ValueBase.h \
   ValueBase.i Exception.h \
   ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
+  Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h IOPC.i PolicyC.h \
   Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i PortableInterceptorC.i PICurrent.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp LocalObject.h LocalObject.i \
-  PICurrent.inl ClientRequestInfo_i.inl Invocation.h CDR.h \
+  $(ACE_ROOT)/ace/Array_Base.cpp LocalObject.h Object_KeyC.h \
+  LocalObject.i PICurrent.inl ClientRequestInfo_i.inl Invocation.h CDR.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
   IOPC.h \
@@ -14914,17 +16932,42 @@ realclean:
   GIOP_Message_Version.inl \
   operation_details.h Service_Context.h \
   Service_Context.inl \
-  target_specification.h Object_KeyC.h \
-  Object_KeyC.i target_specification.i \
-  operation_details.i Invocation.i Stub.h \
+  target_specification.h target_specification.i operation_details.i \
+  Transport.h Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl Invocation.i Stub.h \
   MProfile.h \
   PolicyC.h \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -14932,19 +16975,9 @@ realclean:
   Policy_Set.h \
   Policy_Set.i \
   LocalObject.h \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -14963,21 +16996,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -14987,14 +17005,6 @@ realclean:
   Cleanup_Func_Registry.h \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -15019,10 +17029,8 @@ realclean:
   ORB_Core.i \
   ORB_Core_Auto_Ptr.h \
   ORB_Core_Auto_Ptr.inl \
-  Stub.i AbstractBase.h \
-  AbstractBase.inl Profile.h \
-  Tagged_Components.h CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
+  Stub.i AbstractBase.h Profile.h \
+  Tagged_Components.h \
   Tagged_Components.i \
   GIOP_Message_Version.h Profile.i debug.h
 
@@ -15058,11 +17066,29 @@ realclean:
   orbconf.h \
   TAO_Export.h \
   corbafwd.i DynamicC.h \
-  corbafwd.h \
-  Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  corbafwd.h StringSeqC.h Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  Sequence.i \
+  Sequence_T.h \
+  Sequence.h \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -15075,18 +17101,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -15096,6 +17117,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -15114,45 +17153,52 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i StringSeqC.i \
+  Any_T.h \
+  Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   Object.h \
   Policy_ForwardC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
   CDR.h \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i DynamicC.i Any.h StringSeqC.h \
-  Sequence.h StringSeqC.i
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h DynamicC.i Any.h
 
 .obj/ClientInterceptorAdapter.o .obj/ClientInterceptorAdapter.so .shobj/ClientInterceptorAdapter.o .shobj/ClientInterceptorAdapter.so: ClientInterceptorAdapter.cpp \
   ClientInterceptorAdapter.h $(ACE_ROOT)/ace/pre.h orbconf.h \
@@ -15161,10 +17207,12 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i Interceptor_List.h corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h Interceptor_List.h corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -15177,7 +17225,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -15207,12 +17254,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -15225,13 +17269,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -15241,6 +17285,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -15259,32 +17321,55 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i DynamicC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i DynamicC.h \
+  StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h OctetSeqC.i ValueBase.h \
   ValueBase.i Exception.h \
   ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
+  Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h IOPC.i PolicyC.h \
   Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i PortableInterceptorC.i \
@@ -15292,8 +17377,8 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Interceptor_List.inl \
   ClientInterceptorAdapter.inl ClientRequestInfo.h LocalObject.h \
-  LocalObject.i ClientRequestInfo.inl ClientRequestInfo_i.h PICurrent.h \
-  PICurrent.inl ClientRequestInfo_i.inl Invocation.h CDR.h \
+  Object_KeyC.h LocalObject.i ClientRequestInfo.inl ClientRequestInfo_i.h \
+  PICurrent.h PICurrent.inl ClientRequestInfo_i.inl Invocation.h CDR.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
   IOPC.h \
@@ -15309,28 +17394,42 @@ realclean:
   GIOP_Message_Version.inl \
   operation_details.h Service_Context.h \
   Service_Context.inl \
-  target_specification.h Object_KeyC.h \
-  Object_KeyC.i target_specification.i \
-  operation_details.i Invocation.i ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h \
-  ORB.i Environment.h Policy_Manager.h \
+  target_specification.h target_specification.i operation_details.i \
+  Transport.h Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl Invocation.i ORB_Core.h ORB.h ServicesC.h \
+  OctetSeqC.h ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h ORB.i \
+  Environment.h Policy_Manager.h \
   Policy_Set.h \
   PolicyC.h \
   Policy_Set.i \
   LocalObject.h \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -15344,35 +17443,12 @@ realclean:
   Adapter.i PolicyFactory_Registry.h \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -15444,21 +17520,9 @@ realclean:
   Sequence.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i OctetSeqC.i StringSeqC.h \
-  StringSeqC.i ValueBase.h $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  ValueBase.i Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -15471,6 +17535,34 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -15495,16 +17587,33 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i ObjectReferenceTemplateC.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i OctetSeqC.i StringSeqC.h \
+  StringSeqC.i ValueBase.h ValueBase.i \
+  Exception.h ObjectReferenceTemplateC.i \
   Stub.h \
   MProfile.h \
   PolicyC.h \
@@ -15517,19 +17626,23 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
-  Exception.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -15544,13 +17657,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -15567,10 +17678,16 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
   Messaging_SyncScopeC.h \
@@ -15581,21 +17698,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -15608,14 +17710,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -15659,17 +17753,36 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   PortableInterceptor.h \
   ValueFactory.h \
   ValueFactory.i \
   RequestInfo_Util.h \
   ClientRequestInfo_i.h \
-  StringSeqC.h \
   ClientRequestInfo_i.inl \
   ClientInterceptorAdapter.h \
   ClientInterceptorAdapter.inl
@@ -15728,12 +17841,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -15746,13 +17856,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -15762,6 +17872,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -15780,43 +17908,70 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i DynamicC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i DynamicC.h \
+  StringSeqC.h corbafwd.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h corbafwd.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h OctetSeqC.i ValueBase.h \
   ValueBase.i Exception.h \
   ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
+  Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h IOPC.i PolicyC.h \
   Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
-  PolicyC.i PortableInterceptorC.i Stub.h \
+  PolicyC.i PortableInterceptorC.i \
+  Stub.h \
   MProfile.h \
   PolicyC.h \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -15825,19 +17980,16 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -15856,21 +18008,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -15884,14 +18021,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -15936,10 +18065,30 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   PortableInterceptor.h \
   RequestInfo_Util.h \
@@ -16006,12 +18155,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -16024,13 +18170,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -16040,6 +18186,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -16058,55 +18222,75 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i DynamicC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i DynamicC.h \
+  StringSeqC.h corbafwd.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h corbafwd.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h OctetSeqC.i ValueBase.h \
   ValueBase.i Exception.h \
   ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
+  Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h IOPC.i PolicyC.h \
   Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
-  PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
-  PICurrent.inl ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h \
-  ORB.i Environment.h Policy_Manager.h \
+  PolicyC.i PortableInterceptorC.i LocalObject.h Object_KeyC.h \
+  LocalObject.i PICurrent.inl ORB_Core.h ORB.h ServicesC.h \
+  OctetSeqC.h ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h ORB.i \
+  Environment.h Policy_Manager.h \
   Policy_Set.h \
   PolicyC.h \
   Policy_Set.i \
   LocalObject.h \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -16120,37 +18304,15 @@ realclean:
   Adapter.i PolicyFactory_Registry.h \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  Interceptor_List.h Interceptor_List.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
   $(ACE_ROOT)/ace/Thread_Control.inl \
@@ -16170,8 +18332,6 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
   TAO_Server_Request.h Tagged_Profile.h \
   GIOPC.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   GIOPC.i \
   Tagged_Profile.i Service_Context.h \
   Service_Context.inl \
@@ -16230,12 +18390,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -16248,13 +18405,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -16264,6 +18421,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -16282,59 +18457,80 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i LocalObject.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i Object_KeyC.h LocalObject.i \
   PortableInterceptorC.h CurrentC.h \
-  Object.h \
-  CurrentC.i DynamicC.h \
+  Object.h CurrentC.i DynamicC.h \
+  StringSeqC.h corbafwd.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h corbafwd.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h OctetSeqC.i ValueBase.h \
   ValueBase.i Exception.h \
   ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h Any.h IOPC.i PolicyC.h Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
+  Messaging_SyncScopeC.i IOPC.h Any_T.h IOPC.i PolicyC.h \
+  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i PortableInterceptorC.i PICurrent.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp PICurrent.inl ORB_Core.h \
-  ORB.h Services.h Services.i \
-  CORBA_String.h CORBA_String.inl \
-  objectid.h ORB.i Environment.h \
-  Policy_Manager.h Policy_Set.h \
+  ORB.h ServicesC.h OctetSeqC.h \
+  ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h ORB.i \
+  Environment.h Policy_Manager.h \
+  Policy_Set.h \
   PolicyC.h \
   Policy_Set.i \
   LocalObject.h \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -16348,37 +18544,15 @@ realclean:
   Adapter.i PolicyFactory_Registry.h \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  Interceptor_List.h Interceptor_List.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
   $(ACE_ROOT)/ace/Thread_Control.inl \
@@ -16429,11 +18603,29 @@ realclean:
   $(ACE_ROOT)/ace/CDR_Base.inl \
   orbconf.h \
   TAO_Export.h \
-  corbafwd.i \
-  Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  corbafwd.i StringSeqC.h corbafwd.h \
+  Sequence.h Managed_Types.h \
+  Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  Sequence.i \
+  Sequence_T.h \
+  Sequence.h \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -16446,18 +18638,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -16467,6 +18654,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -16485,44 +18690,52 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i StringSeqC.i \
+  Any_T.h \
+  Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   Object.h \
   Policy_ForwardC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
   CDR.h \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i DynamicC.i \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h DynamicC.i \
   Stub.h \
   MProfile.h \
   PolicyC.h \
@@ -16534,10 +18747,14 @@ realclean:
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -16546,19 +18763,16 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -16576,10 +18790,7 @@ realclean:
   PortableInterceptorC.h \
   DynamicC.h \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -16591,21 +18802,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -16618,14 +18814,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -16669,10 +18857,30 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   PortableInterceptor.h \
   RequestInfo_Util.h \
@@ -16732,11 +18940,9 @@ realclean:
   Sequence.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i OctetSeqC.i Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -16749,13 +18955,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -16765,6 +18971,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -16783,15 +19007,33 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i OctetSeqC.i Any_T.h \
+  Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   Object.h \
   Policy_ForwardC.h \
@@ -16799,17 +19041,22 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i CDR.h Typecode.h ORB_Core.h ORB.h \
-  Exception.h Services.h Services.i \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Any_T.h \
+  Marshal.h \
+  Marshal.i \
+  debug.h ORB_Core.h ORB.h Exception.h \
+  ServicesC.h OctetSeqC.h ServicesC.i \
   CORBA_String.h CORBA_String.inl \
-  objectid.h PolicyC.h CurrentC.h \
-  CurrentC.i Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
+  ObjectIdListC.h ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  CurrentC.i Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
   Policy_Manager.h Policy_Set.h \
@@ -16817,18 +19064,14 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -16840,28 +19083,13 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
-  DynamicC.h Any.h DynamicC.i \
-  ObjectReferenceTemplateC.h StringSeqC.h StringSeqC.i ValueBase.h \
+  DynamicC.h StringSeqC.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h IOPC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   IOPC.h \
   Service_Callbacks.i \
@@ -16870,15 +19098,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -16950,8 +19171,158 @@ realclean:
   Sequence.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
-  Environment.i StringSeqC.i Any.h \
+  Environment.i StringSeqC.i Any_T.h \
+  Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
+  CDR.i \
+  varbase.h \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Any_T.h \
+  Marshal.h \
+  Marshal.i \
+  debug.h
+
+.obj/Codeset_Manager.o .obj/Codeset_Manager.so .shobj/Codeset_Manager.o .shobj/Codeset_Manager.so: Codeset_Manager.cpp \
+  Codeset_Manager.h \
+  CONV_FRAMEC.h \
+  $(ACE_ROOT)/ace/pre.h \
+  CDR.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  TAO_Export.h \
+  corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
@@ -16969,11 +19340,17 @@ realclean:
   $(ACE_ROOT)/ace/ACE.i \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -17002,7 +19379,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -17010,19 +19388,371 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  Sequence.i \
+  Sequence_T.h \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CONV_FRAMEC.i \
+  Profile.h \
+  Tagged_Components.h \
+  IOPC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
+  Any.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
+  IOPC.i \
+  Tagged_Components.i \
+  PolicyC.h \
+  CurrentC.h \
+  CurrentC.i \
+  Remote_Object_Proxy_Impl.h \
+  Object_Proxy_Impl.h \
+  Encodable.h \
+  PolicyC.i \
+  GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
+  Profile.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
+  TAO_Server_Request.h \
+  Tagged_Profile.h \
+  GIOPC.h \
+  GIOPC.i \
+  Tagged_Profile.i \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  Service_Context.h \
+  Service_Context.inl \
+  PICurrent.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  PortableInterceptorC.h \
+  DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
+  ValueBase.h \
+  ValueBase.i \
+  ObjectReferenceTemplateC.i \
+  Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i \
+  PortableInterceptorC.i \
+  LocalObject.h \
+  LocalObject.i \
+  PICurrent.inl \
+  TAO_Server_Request.i \
+  operation_details.h \
+  target_specification.h \
+  target_specification.i \
+  operation_details.i \
+  ORB_Core.h \
+  ORB.h \
+  ServicesC.h \
+  ServicesC.i \
+  CORBA_String.h \
+  CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
+  objectid.h \
+  ORB.i \
+  Policy_Manager.h \
+  Policy_Set.h \
+  Policy_Set.i \
+  Policy_Manager.i \
+  Resource_Factory.h \
+  params.h \
+  params.i \
+  TAO_Singleton_Manager.h \
+  TAO_Singleton_Manager.inl \
+  TAO_Singleton.h \
+  TAO_Singleton.inl \
+  TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  Adapter.h \
+  Adapter.i \
+  PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  Parser_Registry.h \
+  Parser_Registry.i \
+  Service_Callbacks.h \
+  Service_Callbacks.i \
+  Fault_Tolerance_Service.h \
+  Fault_Tolerance_Service.i \
+  Cleanup_Func_Registry.h \
+  Cleanup_Func_Registry.inl \
+  Object_Ref_Table.h \
+  Interceptor_List.h \
+  Interceptor_List.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  ORB_Core.i \
+  $(ACE_ROOT)/ace/Codeset_Registry.h \
+  $(ACE_ROOT)/ace/Codeset_Registry.inl
+
+.obj/Codeset_Translator_Factory.o .obj/Codeset_Translator_Factory.so .shobj/Codeset_Translator_Factory.o .shobj/Codeset_Translator_Factory.so: Codeset_Translator_Factory.cpp \
+  Codeset_Translator_Factory.h $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  TAO_Export.h \
+  corbafwd.i \
+  CONV_FRAMEC.h \
+  CDR.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  Sequence.i \
+  Sequence_T.h \
+  Sequence_T.i \
+  Sequence_T.cpp \
   Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Exception.h \
   Exception.i \
   Typecode.i \
-  Any.i CDR.h Typecode.h
+  Environment.h \
+  Environment.i \
+  CONV_FRAMEC.i \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  debug.h
 
 .obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp ORB_Core.h $(ACE_ROOT)/ace/pre.h \
   corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
@@ -17083,7 +19813,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -17112,7 +19843,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -17120,7 +19852,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i Services.h \
+  Exception.i ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -17133,20 +19866,52 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
+  OctetSeqC.i \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  CDR.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i Policy_ForwardC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
@@ -17160,13 +19925,10 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -17177,34 +19939,24 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Exception.h Adapter.i \
-  PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h DynamicC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
+  DynamicC.h StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any.h \
-  IOPC.i PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h \
+  IOPC.i PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   IOPC.h \
   Service_Callbacks.i \
@@ -17213,15 +19965,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -17247,14 +19992,14 @@ realclean:
   Server_Strategy_Factory.h \
   default_server.i default_resource.h \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
   default_resource.i debug.h MProfile.h \
   MProfile.i Profile.h \
-  Tagged_Components.h CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
+  Tagged_Components.h \
   Tagged_Components.i \
   GIOP_Message_Version.h \
-  GIOP_Message_Version.inl Profile.i \
-  Stub.h MProfile.h \
+  GIOP_Message_Version.inl Object_KeyC.h \
+  Profile.i Stub.h MProfile.h \
   ORB.h \
   ORB_Core.h \
   ORB_Core_Auto_Ptr.h \
@@ -17290,6 +20035,9 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
   TAOC.h \
   TimeBaseC.h \
@@ -17299,9 +20047,8 @@ realclean:
   TimeBaseC.i \
   TAOC.i \
   Sync_Strategies.i Object_Loader.h \
-  Object_Loader.i ObjectIDList.h \
-  ObjectIDList.i Services_Activate.h \
-  Invocation.h CDR.h Synch_Reply_Dispatcher.h \
+  Object_Loader.i ObjectIDListC.h Services_Activate.h Invocation.h CDR.h \
+  Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
   Condition.h \
   Condition.inl \
@@ -17314,9 +20061,8 @@ realclean:
   GIOP_Message_Version.h \
   operation_details.h Service_Context.h \
   Service_Context.inl \
-  target_specification.h Object_KeyC.h \
-  Object_KeyC.i target_specification.i \
-  operation_details.i Invocation.i BiDir_Adapter.h Collocation_Resolver.h \
+  target_specification.h target_specification.i operation_details.i \
+  Transport.h Invocation.i BiDir_Adapter.h Collocation_Resolver.h \
   Collocation_Resolver.i \
   Endpoint_Selector_Factory.h Flushing_Strategy.h Request_Dispatcher.h \
   Stub_Factory.h Thread_Lane_Resources.h \
@@ -17338,7 +20084,8 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.cpp \
   $(ACE_ROOT)/ace/Arg_Shifter.h \
   $(ACE_ROOT)/ace/Argv_Type_Converter.h \
-  $(ACE_ROOT)/ace/Argv_Type_Converter.inl
+  $(ACE_ROOT)/ace/Argv_Type_Converter.inl Codeset_Manager.h \
+  Profile.h
 
 .obj/ORB_Core_Auto_Ptr.o .obj/ORB_Core_Auto_Ptr.so .shobj/ORB_Core_Auto_Ptr.o .shobj/ORB_Core_Auto_Ptr.so: ORB_Core_Auto_Ptr.cpp ORB_Core_Auto_Ptr.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -17400,7 +20147,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -17429,7 +20177,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -17437,7 +20186,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  Exception.i Services.h \
+  Exception.i ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -17450,20 +20200,52 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
+  OctetSeqC.i \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  CDR.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i Policy_ForwardC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
@@ -17477,13 +20259,10 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -17494,34 +20273,24 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Exception.h Adapter.i \
-  PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h DynamicC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
+  DynamicC.h StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any.h \
-  IOPC.i PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h \
+  IOPC.i PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   IOPC.h \
   Service_Callbacks.i \
@@ -17530,15 +20299,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -17568,10 +20330,12 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -17584,7 +20348,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -17617,11 +20380,13 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   Collocation_Resolver.h \
   corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -17634,7 +20399,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -17654,7 +20418,8 @@ realclean:
   Collocation_Resolver.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -17685,7 +20450,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -17745,6 +20511,18 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -17753,6 +20531,8 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i
 
 .obj/Stub_Factory.o .obj/Stub_Factory.so .shobj/Stub_Factory.o .shobj/Stub_Factory.so: Stub_Factory.cpp Stub_Factory.h \
@@ -17846,7 +20626,8 @@ realclean:
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -17857,7 +20638,8 @@ realclean:
   $(ACE_ROOT)/ace/Init_ACE.i \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
@@ -17865,7 +20647,8 @@ realclean:
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -17926,7 +20709,8 @@ realclean:
   corbafwd.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  Exception.i Services.h \
+  Exception.i ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -17939,20 +20723,25 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Exception.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
+  OctetSeqC.i \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  CDR.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i Policy_ForwardC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
@@ -17967,8 +20756,9 @@ realclean:
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -17979,17 +20769,22 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Exception.h Adapter.i \
-  PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h DynamicC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
+  DynamicC.h StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any.h \
-  IOPC.i PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h \
+  IOPC.i PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
@@ -18031,10 +20826,11 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   TAO_Export.h \
   $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -18047,7 +20843,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -18119,7 +20914,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -18128,7 +20924,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -18141,22 +20938,56 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -18175,13 +21006,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -18198,16 +21027,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -18219,21 +21051,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -18246,14 +21063,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -18293,12 +21102,13 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   Leader_Follower.h \
   LF_Follower.h \
   TAO_Export.h \
   $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -18311,7 +21121,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -18382,7 +21191,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -18391,7 +21201,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -18404,22 +21215,56 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -18438,13 +21283,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -18461,16 +21304,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -18482,21 +21328,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -18509,14 +21340,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -18557,12 +21380,13 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   Leader_Follower.h \
   LF_Follower.h \
   TAO_Export.h \
   $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -18575,7 +21399,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -18646,7 +21469,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -18655,7 +21479,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -18668,22 +21493,56 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -18702,13 +21561,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -18725,16 +21582,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -18746,21 +21606,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -18773,14 +21618,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -18822,10 +21659,11 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   TAO_Export.h \
   $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -18838,7 +21676,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -18909,7 +21746,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -18918,7 +21756,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -18931,22 +21770,56 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -18965,13 +21838,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -18988,16 +21859,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -19009,21 +21883,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -19036,14 +21895,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -19098,6 +21949,9 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl
 
 .obj/Leader_Follower_Flushing_Strategy.o .obj/Leader_Follower_Flushing_Strategy.so .shobj/Leader_Follower_Flushing_Strategy.o .shobj/Leader_Follower_Flushing_Strategy.so:  \
@@ -19115,9 +21969,10 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -19130,7 +21985,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -19201,7 +22055,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -19210,7 +22065,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -19223,22 +22079,56 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -19257,13 +22147,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -19280,16 +22168,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -19301,21 +22192,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -19328,14 +22204,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -19382,6 +22250,9 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
   Queued_Message.h \
   LF_Invocation_Event.h \
@@ -19401,9 +22272,10 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -19416,7 +22288,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -19488,7 +22359,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -19497,7 +22369,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -19510,22 +22383,56 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -19544,13 +22451,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -19567,16 +22472,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -19588,21 +22496,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -19615,14 +22508,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -19738,9 +22623,10 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -19753,7 +22639,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -19824,7 +22709,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -19833,7 +22719,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -19846,22 +22733,56 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -19880,13 +22801,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -19903,16 +22822,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -19924,21 +22846,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -19951,14 +22858,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -20051,7 +22950,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -20080,7 +22980,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -20128,7 +23029,8 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -20138,7 +23040,8 @@ realclean:
   Resource_Factory.h \
   TAO_Export.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -20146,6 +23049,16 @@ realclean:
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  CONV_FRAMEC.h \
+  CDR.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -20166,7 +23079,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -20194,47 +23108,73 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/SString.i \
-  Protocol_Factory.h \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  orbconf.h \
-  corbafwd.i \
-  ORB_Core.h \
-  ORB.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  Exception.i \
-  Services.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
   Sequence.i \
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  CONV_FRAMEC.i \
+  Protocol_Factory.h \
+  ORB_Core.h \
+  ORB.h \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -20250,9 +23190,6 @@ realclean:
   debug.h \
   Policy_Manager.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -20269,16 +23206,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -20290,21 +23230,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -20317,14 +23242,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -20348,7 +23265,10 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i \
-  Client_Strategy_Factory.h
+  Client_Strategy_Factory.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp
 
 .obj/Server_Strategy_Factory.o .obj/Server_Strategy_Factory.so .shobj/Server_Strategy_Factory.o .shobj/Server_Strategy_Factory.so: Server_Strategy_Factory.cpp \
   Server_Strategy_Factory.h \
@@ -20456,7 +23376,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -20485,7 +23406,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -20547,6 +23469,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -20555,11 +23479,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl \
@@ -20567,6 +23499,16 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
   TAOC.h \
   PolicyC.h \
@@ -20601,24 +23543,22 @@ realclean:
   MProfile.h \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
   Policy_Manager.h \
   Policy_Set.h \
   Policy_Set.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   params.h \
   params.i \
   Adapter.h \
@@ -20626,12 +23566,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -20724,7 +23662,8 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -20755,7 +23694,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -20804,45 +23744,59 @@ realclean:
   Client_Strategy_Factory.h \
   default_client.i default_resource.h \
   Resource_Factory.h \
-  default_resource.i Adapter.h \
-  Exception.h \
+  CONV_FRAMEC.h \
+  CDR.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  Exception.i Adapter.i IIOP_Factory.h \
-  Protocol_Factory.h MCAST_Parser.h \
-  IOR_Parser.h \
-  IOR_Parser.i \
-  CORBA_String.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  CORBA_String.inl MCAST_Parser.i \
-  CORBANAME_Parser.h CORBANAME_Parser.i CORBALOC_Parser.h \
-  CORBALOC_Parser.i FILE_Parser.h FILE_Parser.i DLL_Parser.h DLL_Parser.i \
-  StringSeqC.h corbafwd.h Sequence.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
   Sequence.i \
   Sequence_T.h \
-  Sequence.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
-  Environment.i StringSeqC.i ORB_Core.h \
-  ORB.h Exception.h Services.h Services.i \
-  CORBA_String.h objectid.h PolicyC.h CurrentC.h \
+  Environment.i \
+  CONV_FRAMEC.i \
+  default_resource.i Adapter.h \
+  Object_KeyC.h \
+  Object_KeyC.i Adapter.i IIOP_Factory.h \
+  Protocol_Factory.h MCAST_Parser.h \
+  IOR_Parser.h \
+  IOR_Parser.i \
+  CORBA_String.h \
+  CORBA_String.inl MCAST_Parser.i \
+  CORBANAME_Parser.h CORBANAME_Parser.i CORBALOC_Parser.h \
+  CORBALOC_Parser.i FILE_Parser.h FILE_Parser.i DLL_Parser.h DLL_Parser.i \
+  StringSeqC.h corbafwd.h Sequence.h StringSeqC.i ORB_Core.h ORB.h \
+  Exception.h ServicesC.h OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  ObjectIdListC.h ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i Policy_ForwardC.h \
+  Object.i CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
@@ -20866,14 +23820,20 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h \
   PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h OctetSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any.h \
-  IOPC.i PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h \
+  IOPC.i PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
@@ -20884,15 +23844,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -20910,8 +23863,8 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.h \
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i Object_Loader.h \
-  Object_Loader.i Default_Stub_Factory.h \
+  $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
+  Object_Loader.h Object_Loader.i Default_Stub_Factory.h \
   Stub_Factory.h \
   Default_Endpoint_Selector_Factory.h \
   Endpoint_Selector_Factory.h \
@@ -20995,7 +23948,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -21024,7 +23978,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -21052,6 +24007,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -21060,51 +24044,54 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   GIOPC.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   GIOPC.i \
-  Tagged_Profile.i OctetSeqC.h Sequence.h \
-  OctetSeqC.i Service_Context.h \
+  Tagged_Profile.i OctetSeqC.h \
+  Sequence.h OctetSeqC.i Service_Context.h \
   Service_Context.inl Object.h \
   PICurrent.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
-  TAO_Export.h CurrentC.h CurrentC.i \
-  DynamicC.h DynamicC.i ObjectReferenceTemplateC.h StringSeqC.h \
-  StringSeqC.i ValueBase.h ValueBase.i \
-  Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+  TAO_Export.h CurrentC.h CurrentC.i DynamicC.h StringSeqC.h StringSeqC.i \
+  DynamicC.i ObjectReferenceTemplateC.h ValueBase.h \
+  ValueBase.i Exception.h \
+  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i IOPC.h PolicyC.h Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
-  PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
-  PICurrent.inl TAO_Server_Request.i CDR.h Environment.h Principal.h \
-  Principal.i ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h \
-  ORB.i Policy_Manager.h \
-  Policy_Set.h \
+  PolicyC.i PortableInterceptorC.i LocalObject.h Object_KeyC.h \
+  LocalObject.i PICurrent.inl TAO_Server_Request.i CDR.h Environment.h \
+  Principal.h Principal.i ORB_Core.h \
+  ORB.h ServicesC.h OctetSeqC.h \
+  ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h ORB.i \
+  Policy_Manager.h Policy_Set.h \
   PolicyC.h \
   Policy_Set.i \
   LocalObject.h \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -21118,36 +24105,14 @@ realclean:
   Adapter.i PolicyFactory_Registry.h \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  Interceptor_List.h Interceptor_List.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
   $(ACE_ROOT)/ace/Thread_Control.inl \
@@ -21183,16 +24148,23 @@ realclean:
   Transport_Timer.h Incoming_Message_Queue.h Incoming_Message_Queue.inl \
   Synch_Refcountable.h $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl
 
 .obj/Typecode_Constants.o .obj/Typecode_Constants.so .shobj/Typecode_Constants.o .shobj/Typecode_Constants.so: Typecode_Constants.cpp \
   Typecode.h \
-  $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
@@ -21200,6 +24172,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_Memory.h \
@@ -21208,51 +24181,56 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  Exception.h \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  orbconf.h \
-  TAO_Export.h \
-  corbafwd.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
@@ -21275,19 +24253,40 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  TAO_Export.h \
+  corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
   Typecode.i \
   ORB.h \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -21302,20 +24301,25 @@ realclean:
   Sequence_T.cpp \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -21323,22 +24327,23 @@ realclean:
   Encodable.h \
   PolicyC.i \
   ORB.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
   DomainC.h \
   corba.h \
+  Any_T.h \
   Any.h \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   NVList.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   NVList.i \
   LocalObject.h \
   LocalObject.i \
   Principal.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   Principal.i \
   BoundsC.h \
   BoundsC.i \
@@ -21346,12 +24351,9 @@ realclean:
   ValueBase.i \
   ValueFactory.h \
   ValueFactory.i \
-  AbstractBase.h \
-  AbstractBase.inl \
   WrongTransactionC.h \
   WrongTransactionC.i \
-  ObjectIDList.h \
-  ObjectIDList.i \
+  ObjectIDListC.h \
   StringSeqC.h \
   StringSeqC.i \
   PortableInterceptorC.h \
@@ -21430,7 +24432,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -21459,7 +24462,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -21580,7 +24584,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -21609,7 +24614,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -21671,6 +24677,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -21679,11 +24687,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl \
@@ -21691,6 +24707,16 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
   Resume_Handle.h \
   Resume_Handle.inl \
@@ -21708,7 +24734,8 @@ realclean:
   GIOP_Message_Version.inl
 
 .obj/Wait_On_Reactor.o .obj/Wait_On_Reactor.so .shobj/Wait_On_Reactor.o .shobj/Wait_On_Reactor.so: Wait_On_Reactor.cpp \
-  $(ACE_ROOT)/ace/Reactor.h $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Handle_Set.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
@@ -21737,7 +24764,8 @@ realclean:
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Handle_Set.i \
   $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -21813,7 +24841,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -21822,7 +24851,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -21835,22 +24865,44 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -21869,13 +24921,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -21892,16 +24942,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -21913,9 +24966,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -21928,14 +24978,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -21977,6 +25019,9 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
@@ -22057,7 +25102,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -22086,7 +25132,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -22095,7 +25142,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -22108,22 +25156,56 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -22142,13 +25224,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -22165,16 +25245,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -22186,21 +25269,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -22213,14 +25281,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -22273,6 +25333,9 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
@@ -22350,7 +25413,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -22379,7 +25443,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -22402,6 +25467,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -22410,11 +25504,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Reply_Dispatcher.h \
   Condition.h \
@@ -22486,7 +25588,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -22515,7 +25618,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -22538,35 +25642,7 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  varbase.h \
-  Policy_ForwardC.i \
-  Object.i \
-  Any.h \
   Typecode.h \
-  Typecode.i \
-  Any.i \
-  IOPC.i \
-  Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
-  Reply_Dispatcher.i \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  debug.h Transport.h corbafwd.h \
-  Exception.h Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  Transport_Descriptor_Interface.h \
-  Transport_Descriptor_Interface.inl \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -22594,11 +25670,58 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  varbase.h \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i \
+  Any_T.h \
+  Any.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
+  IOPC.i \
+  Reply_Dispatcher.h \
+  Condition.h \
+  Condition.inl \
+  Condition.cpp \
+  Reply_Dispatcher.i \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Transport.h corbafwd.h Exception.h Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
   Transport_Cache_Manager.inl \
   Transport_Timer.h TAO_Export.h Incoming_Message_Queue.h \
   Pluggable_Messaging_Utils.h Incoming_Message_Queue.inl \
   Synch_Refcountable.h $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl
 
 .obj/Muxed_TMS.o .obj/Muxed_TMS.so .shobj/Muxed_TMS.o .shobj/Muxed_TMS.so: Muxed_TMS.cpp Muxed_TMS.h \
@@ -22664,7 +25787,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -22693,7 +25817,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -22716,27 +25841,13 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  varbase.h \
-  Policy_ForwardC.i \
-  Object.i \
-  Any.h \
   Typecode.h \
-  Typecode.i \
-  Any.i \
-  IOPC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
@@ -22758,6 +25869,30 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  varbase.h \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i \
+  Any_T.h \
+  Any.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
+  IOPC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   Reply_Dispatcher.h \
   Condition.h \
   Condition.inl \
@@ -22765,10 +25900,9 @@ realclean:
   Reply_Dispatcher.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
-  debug.h \
   Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i Transport.h \
-  corbafwd.h Exception.h Transport_Cache_Manager.h \
+  Pluggable_Messaging_Utils.i \
+  Transport.h corbafwd.h Exception.h Transport_Cache_Manager.h \
   Cache_Entries.h \
   Transport_Descriptor_Interface.h \
   Transport_Descriptor_Interface.inl \
@@ -22780,11 +25914,22 @@ realclean:
   Pluggable_Messaging_Utils.h Incoming_Message_Queue.inl \
   Synch_Refcountable.h $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h CurrentC.i Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
+  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
   Policy_Manager.h Policy_Set.h \
@@ -22793,12 +25938,8 @@ realclean:
   LocalObject.h \
   LocalObject.i \
   Policy_Manager.i Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  params.i TAO_Singleton_Manager.h \
+  params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -22810,8 +25951,8 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
@@ -22909,7 +26050,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -22938,7 +26080,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -22961,6 +26104,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -22969,11 +26141,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Condition.h \
   Condition.inl \
@@ -23044,7 +26224,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -23073,7 +26254,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -23096,6 +26278,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -23104,11 +26315,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Condition.h \
   Condition.inl \
@@ -23122,10 +26341,14 @@ realclean:
   GIOP_Message_Version.inl \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -23140,19 +26363,16 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -23169,12 +26389,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -23184,21 +26402,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -23211,14 +26414,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -23260,6 +26455,9 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl
 
 .obj/Synch_Refcountable.o .obj/Synch_Refcountable.so .shobj/Synch_Refcountable.o .shobj/Synch_Refcountable.so: Synch_Refcountable.cpp Synch_Refcountable.h \
@@ -23369,7 +26567,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -23398,7 +26597,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -23460,6 +26660,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -23468,11 +26670,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl \
@@ -23480,6 +26690,16 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
   Reply_Dispatcher.h \
   Condition.h \
@@ -23489,10 +26709,14 @@ realclean:
   Asynch_Reply_Dispatcher_Base.i \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -23507,14 +26731,8 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   params.h \
   params.i \
   TAO_Singleton_Manager.h \
@@ -23532,12 +26750,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -23642,7 +26858,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -23671,7 +26888,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -23693,6 +26911,36 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -23701,12 +26949,20 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i Any.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i Any_T.h \
+  Any.h \
   Object.h \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  Any.i IOPC.i \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Any_T.h \
+  Marshal.h \
+  Marshal.i \
+  debug.h IOPC.i \
   Stub.h \
   MProfile.h \
   PolicyC.h \
@@ -23718,10 +26974,14 @@ realclean:
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -23730,19 +26990,16 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -23759,13 +27016,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  Any.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -23776,21 +27030,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -23803,14 +27042,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -23854,10 +27085,30 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   PortableInterceptor.h \
   RequestInfo_Util.h \
@@ -23925,7 +27176,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -23954,7 +27206,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -23976,6 +27229,36 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -23984,6 +27267,8 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i PollableC.i \
   Stub.h \
   MProfile.h \
@@ -23991,17 +27276,20 @@ realclean:
   CurrentC.h \
   Object.h \
   CurrentC.i \
-  Exception.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -24016,13 +27304,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -24039,16 +27325,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -24060,21 +27349,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -24087,14 +27361,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -24138,10 +27404,30 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   PortableInterceptor.h \
   RequestInfo_Util.h \
@@ -24152,7 +27438,8 @@ realclean:
 
 .obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.so .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.so: CONV_FRAMEC.cpp \
   CONV_FRAMEC.h \
-  $(ACE_ROOT)/ace/pre.h CDR.h \
+  $(ACE_ROOT)/ace/pre.h \
+  CDR.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -24184,6 +27471,8 @@ realclean:
   orbconf.h \
   TAO_Export.h \
   corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
@@ -24210,7 +27499,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -24239,7 +27529,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -24257,26 +27548,61 @@ realclean:
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
   Sequence.i \
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CONV_FRAMEC.i \
+  Any_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h
 
 .obj/Tagged_Components.o .obj/Tagged_Components.so .shobj/Tagged_Components.o .shobj/Tagged_Components.so: Tagged_Components.cpp \
   Tagged_Components.h \
@@ -24341,7 +27667,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -24370,7 +27697,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -24393,6 +27721,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -24401,11 +27758,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   CONV_FRAMEC.h \
   CONV_FRAMEC.i \
@@ -24423,10 +27788,14 @@ realclean:
   Profile.i \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   Policy_Manager.h \
@@ -24434,19 +27803,14 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -24463,12 +27827,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -24478,21 +27840,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -24505,14 +27852,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -24600,7 +27939,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -24629,7 +27969,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -24652,6 +27993,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -24660,16 +28030,23 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Service_Context.inl
 
-.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp GIOPC.h \
-  $(ACE_ROOT)/ace/pre.h \
+.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp GIOPC.h $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -24730,7 +28107,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -24759,7 +28137,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -24782,6 +28161,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -24790,15 +28198,118 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
-  IOPC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  GIOPC.i
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
+  IOPC.i GIOPC.i \
+  ORB_Core.h \
+  ORB.h \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
+  CORBA_String.h \
+  CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
+  objectid.h \
+  PolicyC.h \
+  CurrentC.h \
+  CurrentC.i \
+  Remote_Object_Proxy_Impl.h \
+  Object_Proxy_Impl.h \
+  Encodable.h \
+  PolicyC.i \
+  ORB.i \
+  Policy_Manager.h \
+  Policy_Set.h \
+  Policy_Set.i \
+  LocalObject.h \
+  LocalObject.i \
+  Policy_Manager.i \
+  Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  params.h \
+  params.i \
+  TAO_Singleton_Manager.h \
+  TAO_Singleton_Manager.inl \
+  TAO_Singleton.h \
+  TAO_Singleton.inl \
+  TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  Adapter.h \
+  Adapter.i \
+  PolicyFactory_Registry.h \
+  PortableInterceptorC.h \
+  DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
+  ValueBase.h \
+  ValueBase.i \
+  ObjectReferenceTemplateC.i \
+  Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i \
+  PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  Parser_Registry.h \
+  Parser_Registry.i \
+  Service_Callbacks.h \
+  Service_Callbacks.i \
+  Fault_Tolerance_Service.h \
+  Fault_Tolerance_Service.i \
+  Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  Cleanup_Func_Registry.inl \
+  Object_Ref_Table.h \
+  Interceptor_List.h \
+  Interceptor_List.inl \
+  PICurrent.h \
+  PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  ORB_Core.i
 
 .obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp BoundsC.h $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -24859,7 +28370,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -24888,7 +28400,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -24918,24 +28431,59 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
-  Exception.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -24950,13 +28498,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -24973,16 +28519,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -24994,21 +28543,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -25021,14 +28555,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -25072,10 +28598,30 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   PortableInterceptor.h \
   RequestInfo_Util.h \
@@ -25137,12 +28683,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -25155,13 +28698,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -25171,6 +28714,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -25189,29 +28750,52 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i Policy_ForwardC.h \
-  Exception.h Exception.i \
-  Remote_Object_Proxy_Impl.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i Policy_ForwardC.h \
+  Exception.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
-  PolicyC.i TimeBaseC.h Any.h \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  Any.i TAO_Export.h \
+  PolicyC.i TimeBaseC.h Any_T.h \
+  Any.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h TAO_Export.h \
   SmartProxies/Smart_Proxies.h \
   SmartProxies/smartproxies_export.h \
   TAO_Singleton.h \
@@ -25288,7 +28872,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -25317,7 +28902,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -25346,10 +28932,11 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -25362,7 +28949,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -25374,7 +28960,8 @@ realclean:
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -25434,7 +29021,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -25444,6 +29032,33 @@ realclean:
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
   Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Typecode.i
 
 .obj/DLL_ORB.o .obj/DLL_ORB.so .shobj/DLL_ORB.o .shobj/DLL_ORB.so: DLL_ORB.cpp DLL_ORB.h \
@@ -25493,14 +29108,16 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
   $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -25544,7 +29161,8 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
@@ -25617,7 +29235,8 @@ realclean:
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -25625,22 +29244,37 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -25721,7 +29355,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -25750,7 +29385,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -25759,15 +29395,7 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  Adapter.i \
-  Object.h \
-  Policy_ForwardC.h \
+  Object_KeyC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -25780,8 +29408,46 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
+  Object_KeyC.i \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Adapter.i \
+  Object.h \
+  Policy_ForwardC.h \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -25789,14 +29455,16 @@ realclean:
   varbase.h \
   Policy_ForwardC.i \
   Object.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -25814,10 +29482,9 @@ realclean:
   debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -25832,16 +29499,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -25853,21 +29523,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -25880,14 +29535,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -25986,7 +29633,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -26013,7 +29661,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -26090,7 +29739,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -26119,7 +29769,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -26142,6 +29793,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -26150,11 +29830,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Service_Callbacks.i \
   PolicyC.h \
@@ -26229,7 +29917,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -26258,7 +29947,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -26276,7 +29966,8 @@ realclean:
   IOR_Parser.i \
   ORB_Core.h \
   ORB.h \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -26289,22 +29980,55 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -26320,10 +30044,9 @@ realclean:
   debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -26340,16 +30063,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -26361,21 +30087,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
@@ -26386,14 +30097,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -26426,7 +30129,8 @@ realclean:
   $(ACE_ROOT)/ace/Service_Repository.h \
   $(ACE_ROOT)/ace/Service_Repository.i
 
-.obj/IOR_Parser.o .obj/IOR_Parser.so .shobj/IOR_Parser.o .shobj/IOR_Parser.so: IOR_Parser.cpp IOR_Parser.h \
+.obj/IOR_Parser.o .obj/IOR_Parser.so .shobj/IOR_Parser.o .shobj/IOR_Parser.so: IOR_Parser.cpp \
+  IOR_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -26487,7 +30191,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -26516,7 +30221,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -26599,7 +30305,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -26628,7 +30335,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -26661,8 +30369,9 @@ realclean:
   $(ACE_ROOT)/ace/Timer_Queue_T.i \
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h DLL_Parser.i Object_Loader.h \
-  Object_Loader.i Object.h \
+  $(ACE_ROOT)/ace/Reactor_Impl.h DLL_Parser.i \
+  Object_Loader.h Object_Loader.i \
+  Object.h \
   Policy_ForwardC.h \
   Sequence.h \
   Managed_Types.h \
@@ -26676,6 +30385,16 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -26684,6 +30403,8 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
@@ -26752,7 +30473,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -26781,7 +30503,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -26831,6 +30554,16 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -26839,12 +30572,18 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -26919,7 +30658,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -26948,7 +30688,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -26981,8 +30722,9 @@ realclean:
   $(ACE_ROOT)/ace/Timer_Queue_T.i \
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h CORBALOC_Parser.i ORB_Core.h \
-  corbafwd.h ORB.h Exception.h Services.h \
+  $(ACE_ROOT)/ace/Reactor_Impl.h CORBALOC_Parser.i \
+  ORB_Core.h corbafwd.h ORB.h Exception.h ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -26995,20 +30737,32 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
+  OctetSeqC.i \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  CDR.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i Policy_ForwardC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
@@ -27019,8 +30773,8 @@ realclean:
   LocalObject.i \
   debug.h \
   Policy_Manager.i Resource_Factory.h \
-  params.h params.i \
-  TAO_Singleton_Manager.h \
+  CONV_FRAMEC.h CONV_FRAMEC.i params.h \
+  params.i TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -27032,15 +30786,21 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
-  DynamicC.h Any.h \
-  Typecode.h \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
+  DynamicC.h StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
+  Any.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any.h \
-  IOPC.i PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h \
+  IOPC.i PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
@@ -27051,15 +30811,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -27150,7 +30903,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -27179,7 +30933,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -27232,16 +30987,34 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Condition.h \
   Condition.inl \
@@ -27253,12 +31026,29 @@ realclean:
   LF_Invocation_Event.inl \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
-  Messaging_SyncScopeC.h corbafwd.h Messaging_SyncScopeC.i \
-  operation_details.h Service_Context.h \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i operation_details.h \
+  corbafwd.h Service_Context.h \
   Service_Context.inl \
-  target_specification.h Object_KeyC.h \
-  Object_KeyC.i target_specification.i \
-  operation_details.i Invocation.i Stub.h \
+  target_specification.h target_specification.i operation_details.i \
+  Transport.h Exception.h Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h TAO_Export.h Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl Invocation.i Stub.h \
   MProfile.h \
   PolicyC.h \
   CurrentC.h \
@@ -27269,10 +31059,14 @@ realclean:
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -27281,7 +31075,6 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   params.h \
@@ -27301,12 +31094,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -27327,14 +31118,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -27424,7 +31207,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -27453,7 +31237,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -27503,6 +31288,16 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -27511,11 +31306,13 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i ORB_Core.h corbafwd.h ORB.h \
-  Exception.h Services.h Services.i \
-  CORBA_String.h objectid.h PolicyC.h CurrentC.h \
-  Object.h \
-  CurrentC.i Policy_ForwardC.h \
+  Exception.h ServicesC.h OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  ObjectIdListC.h ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
@@ -27526,8 +31323,8 @@ realclean:
   LocalObject.i \
   debug.h \
   Policy_Manager.i Resource_Factory.h \
-  params.h params.i \
-  TAO_Singleton_Manager.h \
+  CONV_FRAMEC.h CONV_FRAMEC.i params.h \
+  params.i TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -27539,14 +31336,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
-  DynamicC.h Any.h \
-  Typecode.h \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
+  DynamicC.h StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
+  Any.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Any.h IOPC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h Any_T.h IOPC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
@@ -27558,15 +31360,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -27668,7 +31463,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -27697,7 +31493,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -27720,6 +31517,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -27728,11 +31554,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Condition.h \
   Condition.inl \
@@ -27742,7 +31576,8 @@ realclean:
 
 .obj/Fault_Tolerance_Service.o .obj/Fault_Tolerance_Service.so .shobj/Fault_Tolerance_Service.o .shobj/Fault_Tolerance_Service.so: Fault_Tolerance_Service.cpp \
   Fault_Tolerance_Service.h \
-  $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
@@ -27791,7 +31626,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -27820,7 +31656,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -27855,6 +31692,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -27863,11 +31729,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Service_Callbacks.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
@@ -27877,16 +31751,19 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   Services_Activate.h \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -27901,13 +31778,11 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -27924,12 +31799,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -27939,21 +31812,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Cleanup_Func_Registry.h \
@@ -27962,14 +31820,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -28052,12 +31902,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -28070,13 +31917,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -28086,6 +31933,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -28104,34 +31969,58 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
   OctetSeqC.h \
   OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -28255,12 +32144,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -28273,13 +32159,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -28289,6 +32175,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -28307,55 +32211,75 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i DynamicC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i DynamicC.h \
+  StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h OctetSeqC.i ValueBase.h \
   ValueBase.i Exception.h \
   ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
+  Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h IOPC.i PolicyC.h \
   Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
-  PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
-  ORBInitInfo.inl ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h \
-  ORB.i Environment.h Policy_Manager.h \
+  PolicyC.i PortableInterceptorC.i LocalObject.h Object_KeyC.h \
+  LocalObject.i ORBInitInfo.inl ORB_Core.h ORB.h ServicesC.h \
+  OctetSeqC.h ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h ORB.i \
+  Environment.h Policy_Manager.h \
   Policy_Set.h \
   PolicyC.h \
   Policy_Set.i \
   LocalObject.h \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -28369,22 +32293,7 @@ realclean:
   Adapter.i PolicyFactory_Registry.h \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   IOPC.h \
   Service_Callbacks.i \
@@ -28393,16 +32302,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h PICurrent.inl \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  PICurrent.inl $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
   $(ACE_ROOT)/ace/Thread_Control.inl \
@@ -28475,12 +32376,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -28493,13 +32391,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -28509,6 +32407,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -28527,41 +32443,65 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i DynamicC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i DynamicC.h \
+  StringSeqC.h corbafwd.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h corbafwd.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h OctetSeqC.i ValueBase.h \
   ValueBase.i Exception.h \
   ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
+  Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h IOPC.i PolicyC.h \
   Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h \
-  ORB.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Array_Base.cpp ORB.h ServicesC.h \
+  OctetSeqC.h ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h ORB.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -28627,12 +32567,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -28645,13 +32582,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -28661,6 +32598,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -28679,42 +32634,11 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  varbase.h \
-  Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i DynamicC.h \
-  Any.h \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h OctetSeqC.i \
-  StringSeqC.h StringSeqC.i ValueBase.h \
-  ValueBase.i Exception.h \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h Encodable.h \
-  PolicyC.i PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -28729,7 +32653,42 @@ realclean:
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  varbase.h \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i DynamicC.h \
+  StringSeqC.h Sequence.h StringSeqC.i \
+  Any_T.h \
+  Any.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h OctetSeqC.i ValueBase.h \
+  ValueBase.i Exception.h \
+  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h IOPC.i PolicyC.h \
+  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  Object_Proxy_Impl.h Encodable.h \
+  PolicyC.i PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp
 
 .obj/Cache_Entries.o .obj/Cache_Entries.so .shobj/Cache_Entries.o .shobj/Cache_Entries.so: Cache_Entries.cpp \
   Cache_Entries.h \
@@ -28799,7 +32758,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -28828,7 +32788,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -28884,6 +32845,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -28892,11 +32855,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl \
@@ -28904,6 +32875,16 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl
 
 .obj/Base_Transport_Property.o .obj/Base_Transport_Property.so .shobj/Base_Transport_Property.o .shobj/Base_Transport_Property.so: Base_Transport_Property.cpp \
@@ -28944,7 +32925,8 @@ realclean:
   Transport_Descriptor_Interface.inl \
   Endpoint.h \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -29001,7 +32983,8 @@ realclean:
   $(ACE_ROOT)/ace/Recyclable.inl \
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -29012,7 +32995,8 @@ realclean:
   $(ACE_ROOT)/ace/Init_ACE.i \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
@@ -29021,7 +33005,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -29034,7 +33019,8 @@ realclean:
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -29111,6 +33097,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -29119,11 +33107,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl \
@@ -29131,14 +33127,27 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl \
-  debug.h \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -29155,11 +33164,6 @@ realclean:
   LocalObject.i \
   Policy_Manager.i \
   Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   params.h \
   params.i \
   TAO_Singleton_Manager.h \
@@ -29177,12 +33181,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -29306,7 +33308,8 @@ realclean:
   Transport_Descriptor_Interface.inl \
   Endpoint.h \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -29353,7 +33356,8 @@ realclean:
   orbconf.h \
   TAO_Export.h \
   corbafwd.i \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -29368,7 +33372,8 @@ realclean:
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -29379,7 +33384,8 @@ realclean:
   $(ACE_ROOT)/ace/Init_ACE.i \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
@@ -29387,7 +33393,8 @@ realclean:
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -29456,6 +33463,10 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -29464,12 +33475,14 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i ORB.h Exception.h \
-  Exception.i Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h Object.h \
-  CurrentC.i Policy_ForwardC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i ORB.h Exception.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h debug.h
@@ -29536,7 +33549,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -29565,7 +33579,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -29645,7 +33660,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -29674,7 +33690,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -29696,6 +33713,36 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -29704,13 +33751,21 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i Any.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i Any_T.h \
+  Any.h \
   Object.h \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  Any.i IOPC.i LocalObject.h \
-  LocalObject.i CDR_Encaps_Codec.h
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Any_T.h \
+  Marshal.h \
+  Marshal.i \
+  debug.h IOPC.i LocalObject.h \
+  Object_KeyC.h LocalObject.i CDR_Encaps_Codec.h
 
 .obj/CodecFactory_ORBInitializer.o .obj/CodecFactory_ORBInitializer.so .shobj/CodecFactory_ORBInitializer.o .shobj/CodecFactory_ORBInitializer.so: CodecFactory_ORBInitializer.cpp \
   CodecFactory_ORBInitializer.h $(ACE_ROOT)/ace/pre.h \
@@ -29766,12 +33821,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -29784,13 +33836,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -29800,6 +33852,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -29818,36 +33888,59 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i \
-  CurrentC.i DynamicC.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i CurrentC.i DynamicC.h \
+  StringSeqC.h corbafwd.h Sequence.h StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
-  Any.i DynamicC.i \
-  ObjectReferenceTemplateC.h OctetSeqC.h corbafwd.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h OctetSeqC.i ValueBase.h \
   ValueBase.i Exception.h \
   ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h Object.h Any.h IOPC.i PolicyC.h \
+  Messaging_SyncScopeC.i IOPC.h Object.h Any_T.h IOPC.i PolicyC.h \
   Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
-  PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
-  CodecFactory.h ORBInitInfo.h ORBInitInfo.inl
+  PolicyC.i PortableInterceptorC.i LocalObject.h Object_KeyC.h \
+  LocalObject.i CodecFactory.h ORBInitInfo.h ORBInitInfo.inl
 
 .obj/CDR_Encaps_Codec.o .obj/CDR_Encaps_Codec.so .shobj/CDR_Encaps_Codec.o .shobj/CDR_Encaps_Codec.so: CDR_Encaps_Codec.cpp CDR.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -29882,6 +33975,8 @@ realclean:
   orbconf.h \
   TAO_Export.h \
   corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
@@ -29908,7 +34003,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -29937,7 +34033,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -29951,16 +34048,45 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i OctetSeqC.h corbafwd.h Sequence.h \
-  Managed_Types.h \
+  CDR.i OctetSeqC.h corbafwd.h \
+  Sequence.h Managed_Types.h \
   Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
   Sequence.i \
   Sequence_T.h \
   Sequence.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
   Environment.i OctetSeqC.i Any.h \
   Object.h \
@@ -29968,15 +34094,21 @@ realclean:
   CDR.h \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
   Any.i Typecode.h Marshal.h \
   Marshal.i CDR_Encaps_Codec.h \
-  TAO_Export.h IOPC.h Exception.h Object.h IOPC.i LocalObject.h \
-  LocalObject.i
+  TAO_Export.h IOPC.h Exception.h Object.h Any_T.h \
+  Any.h \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Any_T.h \
+  Marshal.h \
+  debug.h IOPC.i LocalObject.h \
+  Object_KeyC.h LocalObject.i
 
 .obj/Endpoint_Selector_Factory.o .obj/Endpoint_Selector_Factory.so .shobj/Endpoint_Selector_Factory.o .shobj/Endpoint_Selector_Factory.so: Endpoint_Selector_Factory.cpp \
   Endpoint_Selector_Factory.h \
@@ -30094,7 +34226,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -30123,7 +34256,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -30183,6 +34317,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -30191,16 +34327,34 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl Queued_Message.h LF_Invocation_Event.h LF_Event.h \
   LF_Event.inl LF_Invocation_Event.inl Queued_Message.inl
 
@@ -30265,7 +34419,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -30294,7 +34449,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -30354,6 +34510,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -30362,21 +34520,40 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h CurrentC.i Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
+  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
   Policy_Manager.h Policy_Set.h \
@@ -30384,14 +34561,9 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  params.i TAO_Singleton_Manager.h \
+  params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -30403,8 +34575,8 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
@@ -30526,7 +34698,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -30555,7 +34728,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -30615,6 +34789,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -30623,21 +34799,40 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h CurrentC.i Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
+  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
   Policy_Manager.h Policy_Set.h \
@@ -30645,14 +34840,9 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  params.i TAO_Singleton_Manager.h \
+  params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -30664,8 +34854,8 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
@@ -30763,7 +34953,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -30792,7 +34983,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -30852,6 +35044,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -30860,21 +35054,40 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h CurrentC.i Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
+  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
   Policy_Manager.h Policy_Set.h \
@@ -30882,14 +35095,9 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  params.i TAO_Singleton_Manager.h \
+  params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -30901,8 +35109,8 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
@@ -31018,7 +35226,8 @@ realclean:
   corbafwd.i LF_Invocation_Event.h \
   LF_Event.h TAO_Export.h LF_Event.inl LF_Invocation_Event.inl \
   Queued_Message.inl debug.h $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -31058,7 +35267,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -31110,7 +35320,8 @@ realclean:
   corbafwd.i LF_Invocation_Event.h \
   LF_Event.h TAO_Export.h LF_Event.inl LF_Invocation_Event.inl \
   Queued_Message.inl debug.h $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -31150,7 +35361,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -31230,7 +35442,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -31257,7 +35470,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -31317,6 +35531,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -31325,16 +35541,34 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl
 
 .obj/Connection_Purging_Strategy.o .obj/Connection_Purging_Strategy.so .shobj/Connection_Purging_Strategy.o .shobj/Connection_Purging_Strategy.so: Connection_Purging_Strategy.cpp \
@@ -31408,7 +35642,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -31437,7 +35672,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -31497,6 +35733,8 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -31505,19 +35743,38 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  CONV_FRAMEC.h CONV_FRAMEC.i Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl
 
-.obj/Policy_Set.o .obj/Policy_Set.so .shobj/Policy_Set.o .shobj/Policy_Set.so: Policy_Set.cpp Policy_Set.h \
+.obj/Policy_Set.o .obj/Policy_Set.so .shobj/Policy_Set.o .shobj/Policy_Set.so: Policy_Set.cpp \
+  Policy_Set.h \
   $(ACE_ROOT)/ace/pre.h \
   PolicyC.h \
   corbafwd.h \
@@ -31573,12 +35830,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -31591,13 +35845,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -31607,6 +35861,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -31625,23 +35897,41 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
-  Exception.h \
-  Exception.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
@@ -31697,7 +35987,8 @@ realclean:
   $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -31728,7 +36019,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -31811,7 +36103,8 @@ realclean:
   TAO_Export.h \
   corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -31870,7 +36163,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -31879,7 +36173,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -31892,22 +36187,56 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -31926,13 +36255,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -31949,16 +36276,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -31970,21 +36300,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -31997,14 +36312,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -32099,7 +36406,8 @@ realclean:
   Thread_Lane_Resources_Manager.i \
   Leader_Follower.h \
   LF_Follower.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -32158,7 +36466,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -32167,7 +36476,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -32180,22 +36490,55 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -32211,10 +36554,9 @@ realclean:
   debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -32231,16 +36573,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -32252,21 +36597,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -32279,14 +36609,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -32333,11 +36655,13 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   Thread_Lane_Resources_Manager.h \
   corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -32350,7 +36674,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -32370,7 +36693,8 @@ realclean:
   Thread_Lane_Resources_Manager.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -32401,7 +36725,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -32451,7 +36776,8 @@ realclean:
   ORB.h \
   Exception.h \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -32464,22 +36790,37 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -32495,6 +36836,8 @@ realclean:
   debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
   params.i \
   TAO_Singleton_Manager.h \
@@ -32512,16 +36855,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -32545,14 +36891,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -32638,7 +36976,8 @@ realclean:
   $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -32669,7 +37008,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -32731,6 +37071,18 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -32739,20 +37091,24 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
-  Exception.h \
-  Exception.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -32764,6 +37120,8 @@ realclean:
   debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
   params.i \
   TAO_Singleton_Manager.h \
@@ -32781,16 +37139,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -32814,14 +37175,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -32902,13 +37255,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Object_KeyC.i \
-  IOPC.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -32921,13 +37270,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -32937,6 +37286,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -32955,16 +37322,33 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
   Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  Object_KeyC.i \
+  IOPC.h \
   Object.h \
   Policy_ForwardC.h \
   CDR.h \
@@ -32974,47 +37358,50 @@ realclean:
   varbase.h \
   Policy_ForwardC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i TAO_Server_Request.h corbafwd.h \
   Tagged_Profile.h GIOPC.h \
   GIOPC.i \
-  Tagged_Profile.i OctetSeqC.h Sequence.h \
-  OctetSeqC.i Service_Context.h \
+  Tagged_Profile.i OctetSeqC.h \
+  Sequence.h OctetSeqC.i Service_Context.h \
   Service_Context.inl Object.h \
   PICurrent.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
-  TAO_Export.h CurrentC.h CurrentC.i \
-  DynamicC.h DynamicC.i ObjectReferenceTemplateC.h StringSeqC.h \
-  StringSeqC.i ValueBase.h ValueBase.i \
-  Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+  TAO_Export.h CurrentC.h CurrentC.i DynamicC.h StringSeqC.h StringSeqC.i \
+  DynamicC.i ObjectReferenceTemplateC.h ValueBase.h \
+  ValueBase.i Exception.h \
+  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i IOPC.h PolicyC.h Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
-  PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
-  PICurrent.inl TAO_Server_Request.i ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h \
+  PolicyC.i PortableInterceptorC.i LocalObject.h Object_KeyC.h \
+  LocalObject.i PICurrent.inl TAO_Server_Request.i ORB_Core.h ORB.h \
+  ServicesC.h OctetSeqC.h ServicesC.i \
+  CORBA_String.h CORBA_String.inl \
+  ObjectIdListC.h ObjectIdListC.i objectid.h \
   ORB.i Environment.h Policy_Manager.h \
   Policy_Set.h \
   PolicyC.h \
   Policy_Set.i \
   LocalObject.h \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -33028,36 +37415,14 @@ realclean:
   Adapter.i PolicyFactory_Registry.h \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  Interceptor_List.h Interceptor_List.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
   $(ACE_ROOT)/ace/Thread_Control.inl \
@@ -33076,9 +37441,8 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
-.obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp Services.h \
-  $(ACE_ROOT)/ace/pre.h \
-  Sequence.h \
+.obj/ServicesC.o .obj/ServicesC.so .shobj/ServicesC.o .shobj/ServicesC.so: ServicesC.cpp ServicesC.h $(ACE_ROOT)/ace/pre.h \
+  OctetSeqC.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -33110,6 +37474,7 @@ realclean:
   orbconf.h \
   TAO_Export.h \
   corbafwd.i \
+  Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
@@ -33128,13 +37493,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Services.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -33147,13 +37508,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -33163,6 +37524,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -33181,32 +37560,60 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
+  CDR.i ServicesC.i \
+  Any_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   ORB_Core.h \
   ORB.h \
+  ServicesC.h \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -33221,19 +37628,16 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -33250,12 +37654,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -33267,21 +37669,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -33294,14 +37681,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -33335,10 +37714,12 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
@@ -33355,7 +37736,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -33387,7 +37767,8 @@ realclean:
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -33443,24 +37824,54 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
-  Typecode.h \
-  Exception.h \
-  Exception.i \
-  Typecode.i \
   Any.i \
   NVList.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -33476,40 +37887,6 @@ realclean:
   Marshal.h \
   Marshal.i
 
-.obj/IFR_TypeCodes.o .obj/IFR_TypeCodes.so .shobj/IFR_TypeCodes.o .shobj/IFR_TypeCodes.so: IFR_TypeCodes.cpp \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  orbconf.h \
-  TAO_Export.h \
-  corbafwd.i
-
 .obj/Dynamic_Adapter.o .obj/Dynamic_Adapter.so .shobj/Dynamic_Adapter.o .shobj/Dynamic_Adapter.so: Dynamic_Adapter.cpp \
   Dynamic_Adapter.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -33582,7 +37959,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -33609,7 +37987,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -33618,7 +37997,8 @@ realclean:
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   Exception.i \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -33631,22 +38011,55 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -33662,10 +38075,9 @@ realclean:
   debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -33682,16 +38094,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -33703,21 +38118,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -33730,14 +38130,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -33776,12 +38168,14 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   Policy_Set.h \
   PolicyC.h \
   corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -33794,7 +38188,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -33823,12 +38216,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -33841,13 +38231,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -33857,6 +38247,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -33875,23 +38283,41 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
-  Exception.h \
-  Exception.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
@@ -33903,23 +38329,25 @@ realclean:
   Policy_Manager.i \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -33936,16 +38364,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -33957,21 +38388,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -33984,14 +38400,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -34035,11 +38443,13 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   TAOC.h \
   corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -34052,7 +38462,6 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -34082,12 +38491,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -34100,13 +38506,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -34116,6 +38522,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -34134,32 +38558,56 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
-  Exception.h \
-  Exception.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   Encodable.h \
   PolicyC.i \
   TimeBaseC.h \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   SmartProxies/Smart_Proxies.h \
   SmartProxies/smartproxies_export.h \
   TAO_Singleton.h \
@@ -34239,7 +38687,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -34268,7 +38717,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -34290,6 +38740,36 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -34298,12 +38778,20 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
-  Object.i Any.h \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i Any_T.h \
+  Any.h \
   Object.h \
-  Typecode.h \
-  Exception.h \
-  Typecode.i \
-  Any.i IOPC.i Sequence.h \
+  Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Any_T.h \
+  Marshal.h \
+  Marshal.i \
+  debug.h IOPC.i Sequence.h \
   Messaging_PolicyValueC.i Stub.h \
   MProfile.h \
   PolicyC.h \
@@ -34315,10 +38803,14 @@ realclean:
   PolicyC.i \
   MProfile.i \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   ORB_Core.h \
@@ -34327,19 +38819,16 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -34356,13 +38845,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  Any.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -34373,21 +38859,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -34400,14 +38871,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -34451,10 +38914,30 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
+  Transport.h \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
   Invocation.i \
   PortableInterceptor.h \
   RequestInfo_Util.h \
@@ -34527,7 +39010,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -34556,7 +39040,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -34579,6 +39064,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -34587,11 +39101,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Pluggable_Messaging.i
@@ -34659,7 +39181,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -34688,7 +39211,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -34711,6 +39235,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -34719,19 +39272,31 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -34746,19 +39311,16 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i \
   Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -34775,12 +39337,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -34790,21 +39350,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -34817,14 +39362,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -34913,7 +39450,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -34942,7 +39480,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -34965,6 +39504,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -34973,11 +39541,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Pluggable_Messaging.i \
@@ -34997,16 +39573,16 @@ realclean:
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
   GIOP_Message_State.inl \
-  GIOP_Message_Base.i operation_details.h \
-  corbafwd.h Service_Context.h \
+  GIOP_Message_Base.i \
+  operation_details.h corbafwd.h Service_Context.h \
   Service_Context.inl \
-  target_specification.h Object_KeyC.h \
-  Object_KeyC.i target_specification.i \
-  operation_details.i GIOP_Utils.h debug.h ORB_Core.h ORB.h Exception.h \
-  Services.h Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h PolicyC.h \
-  CurrentC.h CurrentC.i Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
+  target_specification.h target_specification.i operation_details.i \
+  GIOP_Utils.h debug.h ORB_Core.h ORB.h Exception.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
+  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
   Policy_Manager.h Policy_Set.h \
@@ -35014,18 +39590,14 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -35037,28 +39609,13 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
-  DynamicC.h DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  DynamicC.h StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
@@ -35066,15 +39623,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -35122,8 +39672,18 @@ realclean:
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl LF_Strategy.h \
-  LF_Strategy.inl Request_Dispatcher.h
+  LF_Strategy.inl Request_Dispatcher.h \
+  Codeset_Manager.h Profile.h \
+  Tagged_Components.h \
+  Tagged_Components.i \
+  Profile.i \
+  Transport.h
 
 .obj/GIOP_Message_Lite.o .obj/GIOP_Message_Lite.so .shobj/GIOP_Message_Lite.o .shobj/GIOP_Message_Lite.so: GIOP_Message_Lite.cpp \
   GIOP_Message_Lite.h \
@@ -35190,7 +39750,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -35219,7 +39780,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -35242,6 +39804,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -35250,11 +39841,19 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   Pluggable_Messaging.i \
@@ -35265,7 +39864,6 @@ realclean:
   GIOP_Message_Version.inl \
   GIOP_Message_State.inl \
   GIOP_Message_Lite.i \
-  debug.h \
   TAOC.h \
   PolicyC.h \
   CurrentC.h \
@@ -35292,10 +39890,14 @@ realclean:
   TAOC.i \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   ORB.i \
   Policy_Manager.h \
@@ -35308,25 +39910,21 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   Adapter.h \
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -35336,21 +39934,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -35363,14 +39946,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -35398,8 +39973,6 @@ realclean:
   Service_Context.h \
   Service_Context.inl \
   target_specification.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   target_specification.i \
   operation_details.i \
   TAO_Server_Request.h \
@@ -35439,7 +40012,15 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
-  Transport.inl
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory_T.cpp \
+  Transport.inl \
+  Codeset_Manager.h \
+  Profile.h \
+  Tagged_Components.h \
+  Tagged_Components.i \
+  Profile.i
 
 .obj/GIOP_Message_Generator_Parser.o .obj/GIOP_Message_Generator_Parser.so .shobj/GIOP_Message_Generator_Parser.o .shobj/GIOP_Message_Generator_Parser.so: GIOP_Message_Generator_Parser.cpp \
   GIOP_Message_Generator_Parser.h \
@@ -35503,7 +40084,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -35532,7 +40114,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -35558,6 +40141,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -35566,22 +40178,27 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   Pluggable_Messaging_Utils.i \
   GIOP_Utils.h \
   GIOP_Utils.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
   Tagged_Profile.h \
   GIOPC.h \
   GIOPC.i \
-  Tagged_Profile.i \
-  debug.h
+  Tagged_Profile.i
 
 .obj/GIOP_Message_Generator_Parser_10.o .obj/GIOP_Message_Generator_Parser_10.so .shobj/GIOP_Message_Generator_Parser_10.o .shobj/GIOP_Message_Generator_Parser_10.so: GIOP_Message_Generator_Parser_10.cpp \
   GIOP_Message_Generator_Parser_10.h $(ACE_ROOT)/ace/pre.h \
@@ -35645,7 +40262,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -35674,7 +40292,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -35699,6 +40318,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -35707,19 +40355,25 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   IOPC.h \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   GIOP_Utils.i \
   GIOP_Message_Locate_Header.h \
   Tagged_Profile.h \
   GIOPC.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   GIOPC.i \
   Tagged_Profile.i \
   GIOP_Message_Locate_Header.i \
@@ -35733,19 +40387,72 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
-  TAO_Export.h CurrentC.h CurrentC.i \
-  DynamicC.h DynamicC.i ObjectReferenceTemplateC.h StringSeqC.h \
-  StringSeqC.i ValueBase.h ValueBase.i \
-  Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+  TAO_Export.h CurrentC.h CurrentC.i DynamicC.h StringSeqC.h StringSeqC.i \
+  DynamicC.i ObjectReferenceTemplateC.h ValueBase.h \
+  ValueBase.i Exception.h \
+  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i IOPC.h PolicyC.h Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
-  PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
-  PICurrent.inl TAO_Server_Request.i GIOP_Message_State.h \
+  PolicyC.i PortableInterceptorC.i LocalObject.h Object_KeyC.h \
+  LocalObject.i PICurrent.inl TAO_Server_Request.i GIOP_Message_State.h \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
   GIOP_Message_State.inl CORBA_String.h \
-  CORBA_String.inl
+  CORBA_String.inl ORB_Core.h ORB.h \
+  ServicesC.h OctetSeqC.h ServicesC.i \
+  ObjectIdListC.h ObjectIdListC.i objectid.h \
+  ORB.i Environment.h Policy_Manager.h \
+  Policy_Set.h \
+  PolicyC.h \
+  Policy_Set.i \
+  LocalObject.h \
+  Policy_Manager.i Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
+  TAO_Singleton_Manager.inl \
+  TAO_Singleton.h TAO_Singleton.inl \
+  TAO_Singleton.cpp \
+  TAO_Singleton.h \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  TAO_Singleton_Manager.h Adapter.h \
+  Adapter.i PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
+  Parser_Registry.i Service_Callbacks.h \
+  Service_Callbacks.i \
+  Fault_Tolerance_Service.h \
+  Fault_Tolerance_Service.i \
+  Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
+  Interceptor_List.h Interceptor_List.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
 .obj/GIOP_Message_Generator_Parser_11.o .obj/GIOP_Message_Generator_Parser_11.so .shobj/GIOP_Message_Generator_Parser_11.o .shobj/GIOP_Message_Generator_Parser_11.so: GIOP_Message_Generator_Parser_11.cpp \
   GIOP_Message_Generator_Parser_11.h \
@@ -35811,7 +40518,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -35840,7 +40548,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -35915,7 +40624,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -35944,7 +40654,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -35969,6 +40680,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -35977,12 +40717,20 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   IOPC.h \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   GIOP_Utils.i GIOP_Message_State.h \
   GIOP_Message_Version.h \
@@ -35991,8 +40739,6 @@ realclean:
   GIOP_Message_Locate_Header.h \
   Tagged_Profile.h \
   GIOPC.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   GIOPC.i \
   Tagged_Profile.i \
   GIOP_Message_Locate_Header.i \
@@ -36006,15 +40752,15 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
-  TAO_Export.h CurrentC.h CurrentC.i \
-  DynamicC.h DynamicC.i ObjectReferenceTemplateC.h StringSeqC.h \
-  StringSeqC.i ValueBase.h ValueBase.i \
-  Exception.h ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
+  TAO_Export.h CurrentC.h CurrentC.i DynamicC.h StringSeqC.h StringSeqC.i \
+  DynamicC.i ObjectReferenceTemplateC.h ValueBase.h \
+  ValueBase.i Exception.h \
+  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i IOPC.h PolicyC.h Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
-  PolicyC.i PortableInterceptorC.i LocalObject.h LocalObject.i \
-  PICurrent.inl TAO_Server_Request.i TAOC.h TimeBaseC.h \
+  PolicyC.i PortableInterceptorC.i LocalObject.h Object_KeyC.h \
+  LocalObject.i PICurrent.inl TAO_Server_Request.i TAOC.h TimeBaseC.h \
   SmartProxies/Smart_Proxies.h \
   SmartProxies/smartproxies_export.h \
   TAO_Singleton.h \
@@ -36028,59 +40774,33 @@ realclean:
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   SmartProxies/Smart_Proxies.inl \
-  TimeBaseC.i TAOC.i ORB_Core.h ORB.h Services.h \
-  Services.i CORBA_String.h \
-  CORBA_String.inl objectid.h \
-  ORB.i Environment.h Policy_Manager.h \
+  TimeBaseC.i TAOC.i ORB_Core.h ORB.h ServicesC.h \
+  OctetSeqC.h ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h ORB.i \
+  Environment.h Policy_Manager.h \
   Policy_Set.h \
   PolicyC.h \
   Policy_Set.i \
   LocalObject.h \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
-  TAO_Singleton.h Adapter.h Adapter.i PolicyFactory_Registry.h \
-  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \
+  PolicyFactory_Registry.h $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl $(ACE_ROOT)/ace/Thread_Manager.h \
+  Interceptor_List.h Interceptor_List.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
   $(ACE_ROOT)/ace/Thread_Control.inl \
@@ -36109,6 +40829,11 @@ realclean:
   Transport_Timer.h Incoming_Message_Queue.h Incoming_Message_Queue.inl \
   Synch_Refcountable.h $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  Codeset_Translator_Factory.h \
+  CONV_FRAMEC.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl
 
 .obj/GIOP_Message_Generator_Parser_Impl.o .obj/GIOP_Message_Generator_Parser_Impl.so .shobj/GIOP_Message_Generator_Parser_Impl.o .shobj/GIOP_Message_Generator_Parser_Impl.so:  \
@@ -36177,7 +40902,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -36206,7 +40932,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -36222,7 +40949,8 @@ realclean:
   GIOP_Message_Generator_Parser_12.inl \
   GIOP_Message_Generator_Parser_Impl.inl
 
-.obj/GIOP_Utils.o .obj/GIOP_Utils.so .shobj/GIOP_Utils.o .shobj/GIOP_Utils.so: GIOP_Utils.cpp GIOP_Utils.h \
+.obj/GIOP_Utils.o .obj/GIOP_Utils.so .shobj/GIOP_Utils.o .shobj/GIOP_Utils.so: GIOP_Utils.cpp \
+  GIOP_Utils.h \
   $(ACE_ROOT)/ace/pre.h \
   Object.h \
   corbafwd.h \
@@ -36276,12 +41004,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -36294,13 +41019,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -36310,6 +41035,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -36328,36 +41071,63 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   IOPC.h \
-  Exception.h \
-  Exception.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   GIOP_Utils.i \
-  debug.h \
   ORB_Core.h \
   ORB.h \
-  Services.h \
-  Services.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
@@ -36377,13 +41147,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -36400,12 +41168,10 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  DynamicC.i \
+  ObjectReferenceTemplateC.h \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -36415,21 +41181,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -36442,14 +41193,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -36487,6 +41230,10 @@ realclean:
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  CONV_FRAMEC.h Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.h \
+  Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
   Transport.inl
 
 .obj/GIOP_Message_Locate_Header.o .obj/GIOP_Message_Locate_Header.so .shobj/GIOP_Message_Locate_Header.o .shobj/GIOP_Message_Locate_Header.so: GIOP_Message_Locate_Header.cpp \
@@ -36553,7 +41300,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -36582,7 +41330,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -36605,6 +41354,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -36613,15 +41391,21 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   GIOPC.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   GIOPC.i \
   Tagged_Profile.i \
   GIOP_Message_Locate_Header.i
@@ -36680,13 +41464,9 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
-  Environment.h \
-  Environment.i \
-  Object_KeyC.i \
-  IOPC.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -36699,13 +41479,13 @@ realclean:
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -36715,6 +41495,24 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -36733,16 +41531,33 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
   Exception.i \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  Object_KeyC.i \
+  IOPC.h \
   Object.h \
   Policy_ForwardC.h \
   CDR.h \
@@ -36752,10 +41567,16 @@ realclean:
   varbase.h \
   Policy_ForwardC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   target_specification.i
 
@@ -36828,7 +41649,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -36857,7 +41679,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -36874,7 +41697,8 @@ realclean:
   GIOP_Message_Generator_Parser_Impl.inl \
   ORB_Core.h \
   ORB.h \
-  Services.h \
+  ServicesC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -36887,22 +41711,56 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
-  Services.i \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
   objectid.h \
   PolicyC.h \
   CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
@@ -36921,13 +41779,11 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
   params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
@@ -36944,16 +41800,19 @@ realclean:
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
   DynamicC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
   DynamicC.i \
   ObjectReferenceTemplateC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
   ValueBase.h \
   ValueBase.i \
   ObjectReferenceTemplateC.i \
@@ -36965,21 +41824,6 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   Parser_Registry.h \
   Parser_Registry.i \
   Service_Callbacks.h \
@@ -36992,14 +41836,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -37129,7 +41965,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -37158,7 +41995,8 @@ realclean:
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -37181,6 +42019,35 @@ realclean:
   Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Typecode.i \
   Environment.h \
   Environment.i \
   CDR.h \
@@ -37189,22 +42056,29 @@ realclean:
   CDR.i \
   varbase.h \
   Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
   Object.i \
+  Any_T.h \
   Any.h \
-  Typecode.h \
-  Typecode.i \
   Any.i \
+  AbstractBase.h \
+  AbstractBase.inl \
+  Any_T.inl \
+  Any_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   IOPC.i \
   GIOPC.h \
-  Object_KeyC.h \
-  Object_KeyC.i \
   GIOPC.i \
   Tagged_Profile.i ORB_Core.h corbafwd.h \
-  ORB.h Exception.h Services.h Services.i \
-  CORBA_String.h CORBA_String.inl \
-  objectid.h PolicyC.h CurrentC.h \
-  CurrentC.i Policy_ForwardC.h \
-  Remote_Object_Proxy_Impl.h \
+  ORB.h Exception.h ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
+  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h Encodable.h \
   PolicyC.i ORB.i Environment.h \
   Policy_Manager.h Policy_Set.h \
@@ -37212,18 +42086,14 @@ realclean:
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  debug.h \
   Policy_Manager.i Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  params.i TAO_Singleton_Manager.h \
+  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
+  CONV_FRAMEC.i params.h params.i \
+  TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
   TAO_Singleton.h TAO_Singleton.inl \
   TAO_Singleton.cpp \
@@ -37235,28 +42105,13 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
   Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h TAO_Export.h \
-  DynamicC.h DynamicC.i ObjectReferenceTemplateC.h OctetSeqC.h Sequence.h \
-  OctetSeqC.i StringSeqC.h StringSeqC.i ValueBase.h \
+  DynamicC.h StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
+  ObjectReferenceTemplateC.h OctetSeqC.h ValueBase.h \
   ValueBase.i ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
   Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
@@ -37264,15 +42119,8 @@ realclean:
   Cleanup_Func_Registry.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
+  LocalObject.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
diff --git a/TAO/tao/Messaging/Makefile b/TAO/tao/Messaging/Makefile
index ddd8f8560b1..b135fd7e8db 100644
--- a/TAO/tao/Messaging/Makefile
+++ b/TAO/tao/Messaging/Makefile
@@ -77,6 +77,7 @@ endif
 
 .obj/Twoway_Asynch_Invocation.o .obj/Twoway_Asynch_Invocation.so .shobj/Twoway_Asynch_Invocation.o .shobj/Twoway_Asynch_Invocation.so: Twoway_Asynch_Invocation.cpp \
   Twoway_Asynch_Invocation.h $(ACE_ROOT)/ace/pre.h \
+  Messaging.h messaging_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl MessagingC.h \
@@ -108,7 +109,8 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  Messaging_SyncScope_PolicyC.h $(TAO_ROOT)/tao/PolicyC.h \
+  Messaging_SyncScope_PolicyC.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -131,12 +133,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -149,13 +148,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -165,6 +164,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -183,23 +200,41 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
@@ -208,10 +243,16 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   Messaging_SyncScope_PolicyC.i Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -227,6 +268,8 @@ endif
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
@@ -243,33 +286,6 @@ endif
   $(ACE_ROOT)/ace/Recyclable.h \
   $(ACE_ROOT)/ace/Recyclable.inl \
   $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
@@ -282,6 +298,16 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Condition.h \
@@ -303,8 +329,6 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
   $(TAO_ROOT)/tao/Invocation.i \
@@ -313,10 +337,12 @@ endif
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -325,14 +351,8 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
@@ -340,12 +360,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -392,7 +410,8 @@ endif
   $(TAO_ROOT)/tao/Transport_Mux_Strategy.h
 
 .obj/Asynch_Reply_Dispatcher.o .obj/Asynch_Reply_Dispatcher.so .shobj/Asynch_Reply_Dispatcher.o .shobj/Asynch_Reply_Dispatcher.so: Asynch_Reply_Dispatcher.cpp \
-  Asynch_Reply_Dispatcher.h $(ACE_ROOT)/ace/pre.h Messaging.h \
+  Asynch_Reply_Dispatcher.h $(ACE_ROOT)/ace/pre.h \
+  Messaging.h messaging_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl MessagingC.h \
@@ -424,7 +443,8 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  Messaging_SyncScope_PolicyC.h $(TAO_ROOT)/tao/PolicyC.h \
+  Messaging_SyncScope_PolicyC.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -447,12 +467,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -465,13 +482,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -481,6 +498,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -499,23 +534,41 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
@@ -524,10 +577,16 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   Messaging_SyncScope_PolicyC.i Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -543,6 +602,8 @@ endif
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
@@ -558,33 +619,6 @@ endif
   $(ACE_ROOT)/ace/Recyclable.h \
   $(ACE_ROOT)/ace/Recyclable.inl \
   $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
@@ -597,6 +631,16 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Condition.h \
@@ -606,10 +650,12 @@ endif
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.i \
   Asynch_Reply_Dispatcher.i $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
@@ -617,14 +663,8 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
@@ -632,12 +672,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -738,12 +776,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -756,13 +791,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -772,6 +807,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -788,23 +841,41 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
@@ -813,10 +884,16 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   Messaging_SyncScope_PolicyC.i Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -832,6 +909,8 @@ endif
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
@@ -847,33 +926,6 @@ endif
   $(ACE_ROOT)/ace/Recyclable.h \
   $(ACE_ROOT)/ace/Recyclable.inl \
   $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
@@ -886,6 +938,16 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Condition.h \
@@ -904,12 +966,14 @@ endif
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i TAO_ExtC.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h TAO_ExtC.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -922,7 +986,6 @@ endif
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -951,12 +1014,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -969,13 +1029,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -985,6 +1045,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1003,32 +1081,56 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -1047,40 +1149,39 @@ endif
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1092,21 +1193,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -1119,14 +1205,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1189,7 +1267,8 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  Messaging_SyncScope_PolicyC.h $(TAO_ROOT)/tao/PolicyC.h \
+  Messaging_SyncScope_PolicyC.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -1212,12 +1291,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -1230,13 +1306,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1246,6 +1322,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1264,23 +1358,41 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
@@ -1289,10 +1401,16 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   Messaging_SyncScope_PolicyC.i Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -1308,6 +1426,8 @@ endif
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
@@ -1316,12 +1436,10 @@ endif
   $(TAO_ROOT)/tao/TAOC.i Messaging_ORBInitializer.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
@@ -1332,29 +1450,28 @@ endif
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
@@ -1362,21 +1479,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -1389,14 +1491,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1457,7 +1551,8 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  Messaging_SyncScope_PolicyC.h $(TAO_ROOT)/tao/PolicyC.h \
+  Messaging_SyncScope_PolicyC.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -1480,12 +1575,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -1498,13 +1590,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1514,6 +1606,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1532,23 +1642,41 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
@@ -1557,10 +1685,16 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   Messaging_SyncScope_PolicyC.i Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -1576,6 +1710,8 @@ endif
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
@@ -1586,10 +1722,12 @@ endif
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -1598,31 +1736,26 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
@@ -1630,21 +1763,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -1657,14 +1775,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1708,10 +1818,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -1753,7 +1883,8 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  Messaging_SyncScope_PolicyC.h $(TAO_ROOT)/tao/PolicyC.h \
+  Messaging_SyncScope_PolicyC.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -1776,12 +1907,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -1794,13 +1922,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1810,6 +1938,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1828,23 +1974,41 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
@@ -1853,10 +2017,16 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   Messaging_SyncScope_PolicyC.i Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -1872,6 +2042,8 @@ endif
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
@@ -1904,33 +2076,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -1968,12 +2113,8 @@ endif
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/GIOPC.i \
   $(TAO_ROOT)/tao/Tagged_Profile.i \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1982,26 +2123,29 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/PICurrent.inl \
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -2109,12 +2253,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -2127,13 +2268,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2143,6 +2284,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -2161,32 +2320,56 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -2205,10 +2388,14 @@ endif
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -2217,31 +2404,26 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -2253,21 +2435,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -2280,14 +2447,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -2331,10 +2490,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -2399,12 +2578,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -2417,13 +2593,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2433,6 +2609,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -2451,32 +2645,56 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -2495,10 +2713,14 @@ endif
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -2507,31 +2729,26 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -2543,21 +2760,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -2570,14 +2772,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -2621,10 +2815,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -2689,12 +2903,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -2707,13 +2918,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2723,6 +2934,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -2741,23 +2970,41 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
@@ -2768,10 +3015,14 @@ endif
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -2786,13 +3037,11 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -2809,16 +3058,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -2828,21 +3080,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -2855,14 +3092,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -2906,10 +3135,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -2926,11 +3175,13 @@ endif
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -2943,7 +3194,6 @@ endif
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -2972,12 +3222,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -2990,13 +3237,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3006,6 +3253,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -3024,32 +3289,56 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -3068,10 +3357,14 @@ endif
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -3080,31 +3373,26 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -3116,21 +3404,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -3143,14 +3416,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -3194,10 +3459,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -3262,12 +3547,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -3280,13 +3562,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3296,6 +3578,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -3314,34 +3614,58 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -3391,28 +3715,27 @@ endif
   Connection_Timeout_Policy_i.h TAO_ExtC.h Messaging_PolicyFactory.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
@@ -3420,21 +3743,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -3447,14 +3755,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -3535,12 +3835,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -3553,13 +3850,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3569,6 +3866,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -3587,34 +3902,58 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -3675,13 +4014,15 @@ endif
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   Messaging.h \
   messaging_export.h \
   MessagingC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -3694,7 +4035,6 @@ endif
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -3725,12 +4065,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -3743,13 +4080,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3759,6 +4096,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -3777,23 +4132,41 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
@@ -3803,10 +4176,16 @@ endif
   Messaging_SyncScope_PolicyC.i \
   Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
@@ -3824,6 +4203,8 @@ endif
   Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h \
   Messaging_No_ImplC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
@@ -3840,41 +4221,38 @@ endif
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
@@ -3882,21 +4260,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -3909,14 +4272,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -4001,12 +4356,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -4019,13 +4371,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4035,6 +4387,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -4053,34 +4423,58 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -4134,33 +4528,6 @@ endif
   $(ACE_ROOT)/ace/Recyclable.h \
   $(ACE_ROOT)/ace/Recyclable.inl \
   $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
@@ -4171,6 +4538,16 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Condition.h \
@@ -4192,8 +4569,6 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
   $(TAO_ROOT)/tao/Invocation.i \
diff --git a/TAO/tao/Messaging/Messaging.pidl b/TAO/tao/Messaging/Messaging.pidl
index 857b8c77bb8..a897ecb9275 100644
--- a/TAO/tao/Messaging/Messaging.pidl
+++ b/TAO/tao/Messaging/Messaging.pidl
@@ -10,8 +10,8 @@
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *   tao_idl
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
@@ -40,6 +40,7 @@
 #include <Messaging_SyncScope_Policy.pidl>
 #include <Messaging_RT_Policy.pidl>
 #include <Messaging_No_Impl.pidl>
+#include <OctetSeq.pidl>
 
 #pragma prefix "omg.org"
 
@@ -52,13 +53,13 @@ module Messaging
   struct ExceptionHolder {
     boolean         is_system_exception;
     boolean         byte_order;
-    sequence<octet> marshaled_exception;
+    CORBA::OctetSeq marshaled_exception;
   };
 #else
   valuetype ExceptionHolder {
     public boolean         is_system_exception;
     public boolean         byte_order;
-    public sequence<octet> marshaled_exception;
+    public CORBA::OctetSeq marshaled_exception;
   };
 #endif
 
@@ -69,6 +70,4 @@ module Messaging
   interface ReplyHandler { };
 };
 
-#pragma prefix ""
-
 #endif /* TAO_MESSAGING_PIDL */
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index b3bdcc67736..1a32a2384ae 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -19,12 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:315
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
-#include "Messaging.h"
 
+#include "Messaging.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -35,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -43,64 +44,80 @@
 #include "MessagingC.i"
 #endif /* !defined INLINE */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f4578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e48),
-  ACE_NTOHL (0x6f6c6465),
-  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f4578), 
+  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x696f6e48), 
+  ACE_NTOHL (0x6f6c6465), 
+  ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ExceptionHolder:1.0
-  16,
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e486f6c),
+    16,
+  ACE_NTOHL (0x45786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e486f6c), 
   ACE_NTOHL (0x64657200),  // name = ExceptionHolder
-  0, // value modifier
+    0, // value modifier
   CORBA::tk_null, // no stateful base valuetype
 
-  3, // member count
-  20,
-  ACE_NTOHL (0x69735f73),
-  ACE_NTOHL (0x79737465),
-  ACE_NTOHL (0x6d5f6578),
-  ACE_NTOHL (0x63657074),
+3, // member count
+    20,
+  ACE_NTOHL (0x69735f73), 
+  ACE_NTOHL (0x79737465), 
+  ACE_NTOHL (0x6d5f6578), 
+  ACE_NTOHL (0x63657074), 
   ACE_NTOHL (0x696f6e00),  // name = is_system_exception
-  CORBA::tk_boolean,
+    CORBA::tk_boolean,
 
   1, // data member visibility marker
 
   11,
-  ACE_NTOHL (0x62797465),
-  ACE_NTOHL (0x5f6f7264),
+  ACE_NTOHL (0x62797465), 
+  ACE_NTOHL (0x5f6f7264), 
   ACE_NTOHL (0x65720000),  // name = byte_order
-  CORBA::tk_boolean,
+    CORBA::tk_boolean,
 
   1, // data member visibility marker
 
   20,
-  ACE_NTOHL (0x6d617273),
-  ACE_NTOHL (0x68616c65),
-  ACE_NTOHL (0x645f6578),
-  ACE_NTOHL (0x63657074),
+  ACE_NTOHL (0x6d617273), 
+  ACE_NTOHL (0x68616c65), 
+  ACE_NTOHL (0x645f6578), 
+  ACE_NTOHL (0x63657074), 
   ACE_NTOHL (0x696f6e00),  // name = marshaled_exception
-  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,
 
   1, // data member visibility marker
 
@@ -123,9 +140,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_cs.cpp:95
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95
 
 void
 tao_Messaging_ExceptionHolder_add_ref (
@@ -144,7 +160,7 @@ tao_Messaging_ExceptionHolder_remove_ref (
 }
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:299
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298
 
 // *************************************************************
 // Operations for class Messaging::ExceptionHolder_var
@@ -197,11 +213,16 @@ Messaging::ExceptionHolder_var::operator= (const ExceptionHolder_var &p)
     CORBA::add_ref (tmp);
     this->ptr_ = tmp;
   }
-
+  
   return *this;
 }
 
-Messaging::ExceptionHolder_var::operator Messaging::ExceptionHolder*& () // cast
+Messaging::ExceptionHolder_var::operator const Messaging::ExceptionHolder* () const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::ExceptionHolder_var::operator Messaging::ExceptionHolder*& () // cast 
 {
   return this->ptr_;
 }
@@ -258,7 +279,7 @@ Messaging::ExceptionHolder_var::tao_remove_ref (
 }
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:569
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568
 
 // *************************************************************
 // Operations for class Messaging::ExceptionHolder_out
@@ -324,7 +345,7 @@ Messaging::ExceptionHolder_out::operator-> (void)
 // *************************************************************
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_cs.cpp:138
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138
 
 Messaging::ExceptionHolder *
 Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v)
@@ -333,7 +354,7 @@ Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-
+  
   return (ExceptionHolder *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
 }
 
@@ -343,29 +364,31 @@ Messaging::ExceptionHolder::_tao_obv_repository_id (void) const
   return this->_tao_obv_static_repository_id ();
 }
 
-#if defined (_MSC_VER)
-void *
-Messaging::ExceptionHolder::Messaging_ExceptionHolder_tao_obv_narrow (
-    ptr_arith_t type_id
-  )
-{
-  return this->_tao_obv_narrow (type_id);
-}
-#endif /* _MSC_VER */
-
 void *
+#if defined (_MSC_VER)
+Messaging::ExceptionHolder::Messaging_ExceptionHolder_tao_obv_narrow (ptr_arith_t type_id)
+#else
 Messaging::ExceptionHolder::_tao_obv_narrow (ptr_arith_t type_id)
+#endif /* _MSC_VER */
 {
   if (type_id == (ptr_arith_t) &_downcast)
     {
       return this;
     }
-
+  
   void *rval = 0;
-
+  
   return rval;
 }
 
+#if defined (_MSC_VER)
+void *
+Messaging::ExceptionHolder::_tao_obv_narrow (ptr_arith_t type_id)
+{
+  return this->Messaging_ExceptionHolder_tao_obv_narrow (type_id);
+}
+#endif /* _MSC_VER */
+
 void
 Messaging::ExceptionHolder::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -401,29 +424,29 @@ CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (
         base,
         ExceptionHolder::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ExceptionHolder::_downcast (base);
@@ -431,7 +454,7 @@ CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_init_cs.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_init_cs.cpp:84
 
 Messaging::ExceptionHolder_init::ExceptionHolder_init (void)
 {
@@ -441,7 +464,7 @@ Messaging::ExceptionHolder_init::~ExceptionHolder_init (void)
 {
 }
 
-const char*
+const char* 
 Messaging::ExceptionHolder_init::tao_repository_id (void)
 {
   return Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
@@ -459,9 +482,8 @@ Messaging::ExceptionHolder_init::create_for_unmarshal (void)
   return ret_val;
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::ReplyHandler::_tao_class_id = 0;
 
@@ -508,13 +530,23 @@ tao_Messaging_ReplyHandler_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_ReplyHandler_marshal (
+    Messaging::ReplyHandler_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::ReplyHandler_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::ReplyHandler_var::ReplyHandler_var (void) // default constructor
+Messaging::ReplyHandler_var::ReplyHandler_var (void)
   : ptr_ (ReplyHandler::_nil ())
 {}
 
@@ -524,12 +556,12 @@ Messaging::ReplyHandler_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::ReplyHandler_var::ReplyHandler_var (const ::Messaging::ReplyHandler_var &p) // copy constructor
+Messaging::ReplyHandler_var::ReplyHandler_var (const ::Messaging::ReplyHandler_var &p)
   : TAO_Base_var (),
     ptr_ (ReplyHandler::_duplicate (p.ptr ()))
 {}
 
-Messaging::ReplyHandler_var::~ReplyHandler_var (void) // destructor
+Messaging::ReplyHandler_var::~ReplyHandler_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -558,7 +590,7 @@ Messaging::ReplyHandler_var::operator const ::Messaging::ReplyHandler_ptr &() co
   return this->ptr_;
 }
 
-Messaging::ReplyHandler_var::operator ::Messaging::ReplyHandler_ptr &() // cast
+Messaging::ReplyHandler_var::operator ::Messaging::ReplyHandler_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -633,10 +665,11 @@ Messaging::ReplyHandler_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::ReplyHandler_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_ptr &p)
@@ -645,14 +678,14 @@ Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_ptr &p)
   this->ptr_ = ::Messaging::ReplyHandler::_nil ();
 }
 
-Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_var &p) // constructor from _var
+Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::ReplyHandler::_nil ();
 }
 
-Messaging::ReplyHandler_out::ReplyHandler_out (const ::Messaging::ReplyHandler_out &p) // copy constructor
+Messaging::ReplyHandler_out::ReplyHandler_out (const ::Messaging::ReplyHandler_out &p)
   : ptr_ (ACE_const_cast (ReplyHandler_out &, p).ptr_)
 {}
 
@@ -683,7 +716,7 @@ Messaging::ReplyHandler_out::operator ::Messaging::ReplyHandler_ptr &() // cast
 }
 
 ::Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_out::ptr (void) // ptr
+Messaging::ReplyHandler_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -694,19 +727,18 @@ Messaging::ReplyHandler_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 Messaging::_TAO_ReplyHandler_Proxy_Impl::_TAO_ReplyHandler_Proxy_Impl (void)
@@ -717,13 +749,12 @@ Messaging::_TAO_ReplyHandler_Remote_Proxy_Impl::_TAO_ReplyHandler_Remote_Proxy_I
 
 // Remote Implementation of the IDL interface methods
 
-
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -759,20 +790,19 @@ Messaging::_TAO_ReplyHandler_Remote_Proxy_Broker::~_TAO_ReplyHandler_Remote_Prox
 
 Messaging::_TAO_ReplyHandler_Proxy_Impl&
 Messaging::_TAO_ReplyHandler_Remote_Proxy_Broker::select_proxy (
-  ::Messaging::ReplyHandler *
-  ACE_ENV_ARG_DECL_NOT_USED
-)
+    ::Messaging::ReplyHandler *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
   return this->remote_proxy_impl_;
 }
 
-
 //
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:226
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::ReplyHandler::ReplyHandler (int collocated)
 {
@@ -793,10 +823,10 @@ Messaging::ReplyHandler::Messaging_ReplyHandler_setup_collocation (int collocate
 Messaging::ReplyHandler::~ReplyHandler (void)
 {}
 
-void
+void 
 Messaging::ReplyHandler::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ReplyHandler *tmp = ACE_static_cast (ReplyHandler*, _tao_void_pointer);
+  ReplyHandler *tmp = ACE_static_cast (ReplyHandler *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -810,7 +840,7 @@ Messaging::ReplyHandler::_narrow (
     {
       return ReplyHandler::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -819,17 +849,17 @@ Messaging::ReplyHandler::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ReplyHandler::_nil ());
-
+      
       if (is_a == 0)
         {
           return ReplyHandler::_nil ();
         }
     }
-
+  
   return ReplyHandler::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::ReplyHandler_ptr
+Messaging::ReplyHandler_ptr 
 Messaging::ReplyHandler::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -839,18 +869,18 @@ Messaging::ReplyHandler::_unchecked_narrow (
     {
       return ReplyHandler::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-
+      
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-
+      
       ReplyHandler_ptr default_proxy = ReplyHandler::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -868,7 +898,7 @@ Messaging::ReplyHandler::_unchecked_narrow (
               ReplyHandler::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -881,10 +911,10 @@ Messaging::ReplyHandler::_unchecked_narrow (
               ReplyHandler::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
       ACE_reinterpret_cast (
           ReplyHandler_ptr,
@@ -904,7 +934,7 @@ Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -939,7 +969,7 @@ Messaging::ReplyHandler::_is_a (
 void *Messaging::ReplyHandler::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, ReplyHandler)::_tao_class_id)
@@ -958,12 +988,12 @@ void *Messaging::ReplyHandler::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -972,30 +1002,29 @@ const char* Messaging::ReplyHandler::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/ReplyHandler:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_ReplyHandler[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f5265),
-  ACE_NTOHL (0x706c7948),
-  ACE_NTOHL (0x616e646c),
-  ACE_NTOHL (0x65723a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x706c7948), 
+  ACE_NTOHL (0x616e646c), 
+  ACE_NTOHL (0x65723a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0
-  13,
-  ACE_NTOHL (0x5265706c),
-  ACE_NTOHL (0x7948616e),
-  ACE_NTOHL (0x646c6572),
+    13,
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x7948616e), 
+  ACE_NTOHL (0x646c6572), 
   ACE_NTOHL (0x0),  // name = ReplyHandler
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyHandler (
     CORBA::tk_objref,
@@ -1015,7 +1044,10 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_obv_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
+
+OBV_Messaging::ExceptionHolder::~ExceptionHolder (void)
+{}
 
 CORBA::Boolean
 OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm)
@@ -1030,7 +1062,7 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_I
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/field_cs.cpp:568
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_cs.cpp:568
 
 // Accessor to set the member.
 void
@@ -1047,9 +1079,8 @@ OBV_Messaging::ExceptionHolder::is_system_exception (void) const
   return this->_pd_is_system_exception;
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/field_cs.cpp:568
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_cs.cpp:568
 
 // Accessor to set the member.
 void
@@ -1066,215 +1097,97 @@ OBV_Messaging::ExceptionHolder::byte_order (void) const
   return this->_pd_byte_order;
 }
 
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_)
-#define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_
-
-
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:253
-
-// *************************************************************
-// Messaging::ExceptionHolder::_tao_seq_Octet
-// *************************************************************
-
-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  :
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:54
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max)
-{}
-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:54
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max, length, buffer, release)
-{}
-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  :
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:54
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (seq)
-{}
-Messaging::ExceptionHolder::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-void Messaging::ExceptionHolder::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer)
-{
-  _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer);
-  delete tmp;
-}
-
-
-#endif /* end #if !defined */
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_valuetype/field_cs.cpp:744
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_cs.cpp:744
 
 // Accessor to set the member.
 void
-OBV_Messaging::ExceptionHolder::marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &val)
+OBV_Messaging::ExceptionHolder::marshaled_exception (const CORBA::OctetSeq &val)
 {
   this->_pd_marshaled_exception = val;
 }
 
 // Readonly get method.
-const Messaging::ExceptionHolder::_tao_seq_Octet &
+const CORBA::OctetSeq &
 OBV_Messaging::ExceptionHolder::marshaled_exception (void) const
 {
   return this->_pd_marshaled_exception;
 }
 
 // Read/write get method.
-Messaging::ExceptionHolder::_tao_seq_Octet &
+CORBA::OctetSeq &
 OBV_Messaging::ExceptionHolder::marshaled_exception (void)
 {
   return this->_pd_marshaled_exception;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:56
 
-// Copying.
+// Copying insertion.
 void
 operator<<= (
-    CORBA::Any &any,
-    Messaging::ExceptionHolder *value
+    CORBA::Any &_tao_any,
+    Messaging::ExceptionHolder *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << value)
-    {
-      any._tao_replace (
-          Messaging::_tc_ExceptionHolder,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  CORBA::add_ref (_tao_elem);
+  _tao_any <<= &_tao_elem;
 }
 
-// Non-copying.
+// Non-copying insertion.
 void
 operator<<= (
-    CORBA::Any &any,
-    Messaging::ExceptionHolder **value
+    CORBA::Any &_tao_any,
+    Messaging::ExceptionHolder **_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *value)
-    {
-      any._tao_replace (
-          Messaging::_tc_ExceptionHolder,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *value,
-          Messaging::ExceptionHolder::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<Messaging::ExceptionHolder>::insert (
+      _tao_any,
+      Messaging::ExceptionHolder::_tao_any_destructor,
+      Messaging::_tc_ExceptionHolder,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
 operator>>= (
-    const CORBA::Any &any,
-    Messaging::ExceptionHolder *&value
+    const CORBA::Any &_tao_any,
+    Messaging::ExceptionHolder *&_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    value = 0;
-    CORBA::TypeCode_var type = any.type ();
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_ExceptionHolder
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    if (any.any_owns_data ())
-      {
-        const Messaging::ExceptionHolder *const_holder =
-          ACE_static_cast (
-              const Messaging::ExceptionHolder *,
-              any.value ()
-            );
-        value =
-          ACE_const_cast (
-              Messaging::ExceptionHolder *,
-              const_holder
-            );
-        return 1;
-      }
-    else
-      {
-        Messaging::ExceptionHolder *tmp;
-        TAO_InputCDR stream (
-            any._tao_get_cdr (),
-            any._tao_byte_order ()
-          );
+  return
+    TAO::Any_Impl_T<Messaging::ExceptionHolder>::extract (
+        _tao_any,
+        Messaging::ExceptionHolder::_tao_any_destructor,
+        Messaging::_tc_ExceptionHolder,
+        _tao_elem
+      );
+}
 
-        if (stream >> tmp)
-          {
-            ((CORBA::Any *)&any)->_tao_replace (
-                Messaging::_tc_ExceptionHolder,
-                1,
-                ACE_static_cast (void *, tmp),
-                Messaging::ExceptionHolder::_tao_any_destructor
-              );
-            value = tmp;
-            return 1;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ExceptionHolder>::to_value (
+    CORBA::ValueBase *&_tao_elem
+  ) const
+{
+  CORBA::add_ref (this->value_);
+  _tao_elem = this->value_;
+  return 1;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Valuetype_Manager<Messaging::ExceptionHolder, Messaging::ExceptionHolder_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Valuetype_Manager<Messaging::ExceptionHolder, Messaging::ExceptionHolder_var>
+  template class TAO_Valuetype_Manager<Messaging::ExceptionHolder, Messaging::ExceptionHolder_var>;
+  template class TAO::Any_Impl_T<Messaging::ExceptionHolder>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Valuetype_Manager<Messaging::ExceptionHolder, Messaging::ExceptionHolder_var>
+#  pragma instantiate TAO::Any_Impl_T<Messaging::ExceptionHolder>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -1286,26 +1199,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::ReplyHandler_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_ReplyHandler,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          Messaging::ReplyHandler::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<Messaging::ReplyHandler>::insert (
+      _tao_any,
+      Messaging::ReplyHandler::_tao_any_destructor,
+      Messaging::_tc_ReplyHandler,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -1314,60 +1220,35 @@ operator>>= (
     Messaging::ReplyHandler_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::ReplyHandler::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_ReplyHandler
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<Messaging::ReplyHandler>::extract (
+        _tao_any,
+        Messaging::ReplyHandler::_tao_any_destructor,
+        Messaging::_tc_ReplyHandler,
+        _tao_elem
       );
+}
 
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            Messaging::_tc_ReplyHandler,
-            1,
-            _tao_elem,
-            Messaging::ReplyHandler::_tao_any_destructor
-          );
-
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = Messaging::ReplyHandler::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-
-  _tao_elem = Messaging::ReplyHandler::_nil ();
-  return 0;
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyHandler>::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<Messaging::ReplyHandler,Messaging::ReplyHandler_var>;
+  template class TAO::Any_Impl_T<Messaging::ReplyHandler>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>
+# pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler, Messaging::ReplyHandler_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::ReplyHandler>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:742
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740
 
 void
 CORBA::add_ref (Messaging::ExceptionHolder * vt)
@@ -1388,7 +1269,7 @@ CORBA::remove_ref (Messaging::ExceptionHolder * vt)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_cs.cpp:70
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73
 
 CORBA::Boolean
 operator<< (
@@ -1417,7 +1298,7 @@ operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/marshal_cs.cpp:44
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/marshal_cs.cpp:44
 
 CORBA::Boolean
 OBV_Messaging::ExceptionHolder::_tao_marshal_state (TAO_OutputCDR &strm)
@@ -1454,7 +1335,7 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1473,12 +1354,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-
+    
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-
+    
     // Narrow to the right type.
     _tao_objref =
       Messaging::ReplyHandler::_unchecked_narrow (
@@ -1495,3 +1376,5 @@ CORBA::Boolean operator>> (
   ACE_ENDTRY;
   return 0;
 }
+
+
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index ee3b469f979..c84f1bb5d77 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -19,9 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGC_H_
 #define _TAO_IDL_ORIG_MESSAGINGC_H_
@@ -42,6 +41,7 @@
 #include "Messaging_SyncScope_PolicyC.h"
 #include "Messaging_RT_PolicyC.h"
 #include "Messaging_No_ImplC.h"
+#include "tao/OctetSeqC.h"
 #include "tao/ValueBase.h"
 #include "tao/ValueFactory.h"
 
@@ -70,29 +70,28 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:45
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  Messaging
 {
   
   // TAO_IDL - Generated from
-  // be/be_visitor_valuetype/valuetype_ch.cpp:53
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52
   
   class ExceptionHolder;
-  
+
 #if !defined (_MESSAGING_EXCEPTIONHOLDER___PTR_CH_)
 #define _MESSAGING_EXCEPTIONHOLDER___PTR_CH_
   
   typedef ExceptionHolder *ExceptionHolder_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_MESSAGING_EXCEPTIONHOLDER___VAR_CH_)
 #define _MESSAGING_EXCEPTIONHOLDER___VAR_CH_
   
   // TAO_IDL - Generated from
-  // be/be_valuetype.cpp:182
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181
   
   class TAO_Messaging_Export ExceptionHolder_var
   {
@@ -107,6 +106,7 @@ TAO_NAMESPACE  Messaging
     ExceptionHolder_var &operator= (const ExceptionHolder_var &);
     ExceptionHolder* operator-> (void) const;
     
+    operator const ExceptionHolder* () const;
     operator ExceptionHolder*& ();
     // in, inout, out, _retn 
     ExceptionHolder* in (void) const;
@@ -123,16 +123,14 @@ TAO_NAMESPACE  Messaging
   private:
     ExceptionHolder* ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_MESSAGING_EXCEPTIONHOLDER___OUT_CH_)
 #define _MESSAGING_EXCEPTIONHOLDER___OUT_CH_
   
   // TAO_IDL - Generated from
-  // be/be_valuetype.cpp:491
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
   
   class TAO_Messaging_Export ExceptionHolder_out
   {
@@ -151,446 +149,381 @@ TAO_NAMESPACE  Messaging
     ExceptionHolder* &ptr_;
   };
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:96
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_MESSAGING_EXCEPTIONHOLDER_CH_)
 #define _MESSAGING_EXCEPTIONHOLDER_CH_
   
   class TAO_Messaging_Export ExceptionHolder
     : public virtual CORBA::ValueBase
-  
-{
-public:
-  typedef ExceptionHolder_var _var_type;
-  static ExceptionHolder* _downcast (CORBA::ValueBase* );
-  // The address of static _downcast is implicit used as type id
-
-  // (TAO extensions or internals)
-  static CORBA::Boolean _tao_unmarshal (
-      TAO_InputCDR &,
-      ExceptionHolder *&
-    );
-  virtual const char* _tao_obv_repository_id (void) const;
-  static const char* _tao_obv_static_repository_id (void);
-  
-  static void _tao_any_destructor (void *);
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_valuetype/field_ch.cpp:411
-  
-  virtual void is_system_exception (CORBA::Boolean) = 0;
-  virtual CORBA::Boolean is_system_exception (void) const = 0;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_valuetype/field_ch.cpp:411
-  
-  virtual void byte_order (CORBA::Boolean) = 0;
-  virtual CORBA::Boolean byte_order (void) const = 0;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_valuetype/field_ch.cpp:484
-  
-  
-#if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CH_
-  
-  class _tao_seq_Octet;
-  
-  // *************************************************************
-  // _tao_seq_Octet
-  // *************************************************************
-  
-  
-  // TAO_IDL - Generated from 
-  // be/be_visitor_sequence/sequence_ch.cpp:384
-  
-  class TAO_Messaging_Export _tao_seq_Octet : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    _tao_seq_Octet (void); // default ctor
-    _tao_seq_Octet (CORBA::ULong max); // uses max size
-    _tao_seq_Octet (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        CORBA::Octet *buffer, 
-        CORBA::Boolean release = 0
+    typedef ExceptionHolder_var _var_type;
+    static ExceptionHolder* _downcast (CORBA::ValueBase* );
+    // The address of static _downcast is implicit used as type id
+
+    // (TAO extensions or internals)
+    static CORBA::Boolean _tao_unmarshal (
+        TAO_InputCDR &,
+        ExceptionHolder *&
       );
-    _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-    ~_tao_seq_Octet (void);
-    static void _tao_any_destructor (void*);
-    
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    _tao_seq_Octet (
-        CORBA::ULong length,
-        const ACE_Message_Block* mb
-      )
-      : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
+    virtual const char* _tao_obv_repository_id (void) const;
+    static const char* _tao_obv_static_repository_id (void);
     
-  };
-  
-#endif /* end #if !defined */
-  
-  typedef _tao_seq_Octet _marshaled_exception_seq;
-  virtual void marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &) = 0;
-  virtual const Messaging::ExceptionHolder::_tao_seq_Octet &marshaled_exception (void) const = 0;
-  virtual Messaging::ExceptionHolder::_tao_seq_Octet &marshaled_exception (void) = 0;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_valuetype/valuetype_ch.cpp:304
-
-protected:
-  ExceptionHolder (void);
-  virtual ~ExceptionHolder (void);
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_ch.cpp:411
+    
+    virtual void is_system_exception (CORBA::Boolean) = 0;
+    virtual CORBA::Boolean is_system_exception (void) const = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_ch.cpp:411
+    
+    virtual void byte_order (CORBA::Boolean) = 0;
+    virtual CORBA::Boolean byte_order (void) const = 0;virtual void marshaled_exception (const CORBA::OctetSeq &) = 0;
+    virtual const CORBA::OctetSeq &marshaled_exception (void) const = 0;
+    virtual CORBA::OctetSeq &marshaled_exception (void) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:315
   
-  // TAO internals
-  virtual void *_tao_obv_narrow (ptr_arith_t);
+  protected:
+    ExceptionHolder (void);
+    virtual ~ExceptionHolder (void);
+    
+    virtual void *_tao_obv_narrow (ptr_arith_t);
 #if defined (_MSC_VER)
-  virtual void *Messaging_ExceptionHolder_tao_obv_narrow (ptr_arith_t);
+    virtual void *Messaging_ExceptionHolder_tao_obv_narrow (ptr_arith_t);
 #endif /* _MSC_VER */
-  virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
-  virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-  
-private:
-  ExceptionHolder (const ExceptionHolder &);
-  void operator= (const ExceptionHolder &);
-  
-protected:
-  virtual CORBA::Boolean _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) = 0;
-  virtual CORBA::Boolean _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &) = 0;
-  
-};
+    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
+    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
+    
+  private:
+    ExceptionHolder (const ExceptionHolder &);
+    void operator= (const ExceptionHolder &);
+    
+  protected:
+    virtual CORBA::Boolean _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) = 0;
+    virtual CORBA::Boolean _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &) = 0;
+  };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_EXCEPTIONHOLDER___INIT_CH_)
 #define _MESSAGING_EXCEPTIONHOLDER___INIT_CH_
-
-class TAO_Messaging_Export ExceptionHolder_init : public virtual CORBA::ValueFactoryBase
-{
-public:
-  ExceptionHolder_init (void);
-  virtual ~ExceptionHolder_init (void);
   
-  static ExceptionHolder_init* _downcast (CORBA::ValueFactoryBase* );
-  
-  virtual CORBA::ValueBase *create_for_unmarshal (void);
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_init_ch.cpp:71
   
-  // TAO-specific extensions
-public:
-  virtual const char* tao_repository_id (void);
-};
-
+  class TAO_Messaging_Export ExceptionHolder_init : public virtual CORBA::ValueFactoryBase
+  {
+  public:
+    ExceptionHolder_init (void);
+    virtual ~ExceptionHolder_init (void);
+    
+    static ExceptionHolder_init* _downcast (CORBA::ValueFactoryBase* );
+    
+    virtual CORBA::ValueBase *create_for_unmarshal (void);
+    
+    // TAO-specific extensions
+  public:
+    virtual const char* tao_repository_id (void);
+  };
 
 #endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_decl.cpp:44
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionHolder;
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ch.cpp:54
+  
+  // 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_ExceptionHolder;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_REPLYHANDLER___PTR_CH_)
 #define _MESSAGING_REPLYHANDLER___PTR_CH_
-
-class ReplyHandler;
-typedef ReplyHandler *ReplyHandler_ptr;
+  
+  class ReplyHandler;
+  typedef ReplyHandler *ReplyHandler_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REPLYHANDLER___VAR_CH_)
 #define _MESSAGING_REPLYHANDLER___VAR_CH_
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:569
-
-class TAO_Messaging_Export ReplyHandler_var : public TAO_Base_var
-{
-public:
-  ReplyHandler_var (void); // default constructor
-  ReplyHandler_var (ReplyHandler_ptr p) : ptr_ (p) {} 
-  ReplyHandler_var (const ReplyHandler_var &); // copy constructor
-  ~ReplyHandler_var (void); // destructor
-  
-  ReplyHandler_var &operator= (ReplyHandler_ptr);
-  ReplyHandler_var &operator= (const ReplyHandler_var &);
-  ReplyHandler_ptr operator-> (void) const;
-  
-  operator const ReplyHandler_ptr &() const;
-  operator ReplyHandler_ptr &();
-  // in, inout, out, _retn 
-  ReplyHandler_ptr in (void) const;
-  ReplyHandler_ptr &inout (void);
-  ReplyHandler_ptr &out (void);
-  ReplyHandler_ptr _retn (void);
-  ReplyHandler_ptr ptr (void) const;
-  
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static ReplyHandler_ptr tao_duplicate (ReplyHandler_ptr);
-  static void tao_release (ReplyHandler_ptr);
-  static ReplyHandler_ptr tao_nil (void);
-  static ReplyHandler_ptr tao_narrow (
-      CORBA::Object *
-      ACE_ENV_ARG_DECL_NOT_USED
-    );
-  static CORBA::Object * tao_upcast (void *);
-
-private:
-  ReplyHandler_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  ReplyHandler_var (const TAO_Base_var &rhs);
-  ReplyHandler_var &operator= (const TAO_Base_var &rhs);
-};
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_Messaging_Export ReplyHandler_var : public TAO_Base_var
+  {
+  public:
+    ReplyHandler_var (void); // default constructor
+    ReplyHandler_var (ReplyHandler_ptr p) : ptr_ (p) {} 
+    ReplyHandler_var (const ReplyHandler_var &); // copy constructor
+    ~ReplyHandler_var (void); // destructor
+    
+    ReplyHandler_var &operator= (ReplyHandler_ptr);
+    ReplyHandler_var &operator= (const ReplyHandler_var &);
+    ReplyHandler_ptr operator-> (void) const;
+    
+    operator const ReplyHandler_ptr &() const;
+    operator ReplyHandler_ptr &();
+    // in, inout, out, _retn 
+    ReplyHandler_ptr in (void) const;
+    ReplyHandler_ptr &inout (void);
+    ReplyHandler_ptr &out (void);
+    ReplyHandler_ptr _retn (void);
+    ReplyHandler_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ReplyHandler_ptr tao_duplicate (ReplyHandler_ptr);
+    static void tao_release (ReplyHandler_ptr);
+    static ReplyHandler_ptr tao_nil (void);
+    static ReplyHandler_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+  
+  private:
+    ReplyHandler_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ReplyHandler_var (const TAO_Base_var &rhs);
+    ReplyHandler_var &operator= (const TAO_Base_var &rhs);
+  };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REPLYHANDLER___OUT_CH_)
 #define _MESSAGING_REPLYHANDLER___OUT_CH_
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:929
-
-class TAO_Messaging_Export ReplyHandler_out
-{
-public:
-  ReplyHandler_out (ReplyHandler_ptr &);
-  ReplyHandler_out (ReplyHandler_var &);
-  ReplyHandler_out (const ReplyHandler_out &);
-  ReplyHandler_out &operator= (const ReplyHandler_out &);
-  ReplyHandler_out &operator= (const ReplyHandler_var &);
-  ReplyHandler_out &operator= (ReplyHandler_ptr);
-  operator ReplyHandler_ptr &();
-  ReplyHandler_ptr &ptr (void);
-  ReplyHandler_ptr operator-> (void);
-
-private:
-  ReplyHandler_ptr &ptr_;
-};
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
+  class TAO_Messaging_Export ReplyHandler_out
+  {
+  public:
+    ReplyHandler_out (ReplyHandler_ptr &);
+    ReplyHandler_out (ReplyHandler_var &);
+    ReplyHandler_out (const ReplyHandler_out &);
+    ReplyHandler_out &operator= (const ReplyHandler_out &);
+    ReplyHandler_out &operator= (const ReplyHandler_var &);
+    ReplyHandler_out &operator= (ReplyHandler_ptr);
+    operator ReplyHandler_ptr &();
+    ReplyHandler_ptr &ptr (void);
+    ReplyHandler_ptr operator-> (void);
+  
+  private:
+    ReplyHandler_ptr &ptr_;
+  };
 
 #endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ch.cpp:113
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_REPLYHANDLER_CH_)
 #define _MESSAGING_REPLYHANDLER_CH_
-
-// Forward Classes Declaration.
-class _TAO_ReplyHandler_Proxy_Impl;
-class _TAO_ReplyHandler_Remote_Proxy_Impl;
-class _TAO_ReplyHandler_Proxy_Broker;
-class _TAO_ReplyHandler_Remote_Proxy_Broker;
-
-class TAO_Messaging_Export ReplyHandler
-  : public virtual CORBA::Object
-{
-public:
-  typedef ReplyHandler_ptr _ptr_type;
-  typedef ReplyHandler_var _var_type;
-  static int _tao_class_id;
   
-  // The static operations.
-  static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj);
+  class _TAO_ReplyHandler_Proxy_Impl;
+  class _TAO_ReplyHandler_Remote_Proxy_Impl;
+  class _TAO_ReplyHandler_Proxy_Broker;
+  class _TAO_ReplyHandler_Remote_Proxy_Broker;
+  
+  class TAO_Messaging_Export ReplyHandler
+    : public virtual CORBA::Object
+  {
+  public:
+    typedef ReplyHandler_ptr _ptr_type;
+    typedef ReplyHandler_var _var_type;
+    static int _tao_class_id;
+    
+    // The static operations.
+    static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj);
+    
+    static ReplyHandler_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ReplyHandler_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ReplyHandler_ptr _nil (void)
+      {
+        return (ReplyHandler_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
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  private:
+    _TAO_ReplyHandler_Proxy_Broker *the_TAO_ReplyHandler_Proxy_Broker_;
+  
+  protected:
+    ReplyHandler (int collocated = 0);
+    
+    // These methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode.
+    virtual void Messaging_ReplyHandler_setup_collocation (int collocated);
+    
+    ReplyHandler (
+        TAO_Stub *objref, 
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0
+      );
+    virtual ~ReplyHandler (void);
+    
+    friend class _TAO_ReplyHandler_Remote_Proxy_Impl;
+    friend class _TAO_ReplyHandler_ThruPOA_Proxy_Impl;
+    friend class _TAO_ReplyHandler_Direct_Proxy_Impl;
   
-  static ReplyHandler_ptr _narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  private:
+    ReplyHandler (const ReplyHandler &);
+    void operator= (const ReplyHandler &);
+  };
   
-  static ReplyHandler_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  // The Proxy Implementations are used by each interface to
+  // perform a call. Each different implementation encapsulates
+  // an invocation logic.
   
-  static ReplyHandler_ptr _nil (void)
-    {
-      return (ReplyHandler_ptr)0;
-    }
   
-  static void _tao_any_destructor (void*);
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:269
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
   
-  virtual CORBA::Boolean _is_a (
-      const char *type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  class TAO_Messaging_Export _TAO_ReplyHandler_Proxy_Impl
+    : public virtual TAO_Object_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_ReplyHandler_Proxy_Impl (void) {}
   
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
+  protected:
+    _TAO_ReplyHandler_Proxy_Impl (void);
+  };
   
-  virtual const char* _interface_repository_id (void) const;
-private:
-  _TAO_ReplyHandler_Proxy_Broker *the_TAO_ReplyHandler_Proxy_Broker_;
-
-protected:
-  ReplyHandler (int collocated = 0);
+  //
+  //               End Base Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
-  // These methods travese the inheritance tree and set the
-  // parents piece of the given class in the right mode
-  virtual void Messaging_ReplyHandler_setup_collocation (int collocated);
   
-  ReplyHandler (
-      TAO_Stub *objref, 
-      CORBA::Boolean _tao_collocated = 0,
-      TAO_Abstract_ServantBase *servant = 0
-    );
-  virtual ~ReplyHandler (void);
+  ///////////////////////////////////////////////////////////////////////
+  //                Remote Proxy Impl. Declaration
+  //
   
-  friend class _TAO_ReplyHandler_Remote_Proxy_Impl;
-  friend class _TAO_ReplyHandler_ThruPOA_Proxy_Impl;
-  friend class _TAO_ReplyHandler_Direct_Proxy_Impl;
-
-private:
-  ReplyHandler (const ReplyHandler &);
-  void operator= (const ReplyHandler &);
-};
-
-// The Proxy Implementations are used by each interface to
-// perform a call. Each different implementation encapsulates
-// an invocation logic.
-
-
-///////////////////////////////////////////////////////////////////////
-//                    Base Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-class TAO_Messaging_Export _TAO_ReplyHandler_Proxy_Impl
-  : public virtual TAO_Object_Proxy_Impl
-{
-public:
-  virtual ~_TAO_ReplyHandler_Proxy_Impl (void) { }
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
   
-protected:
-  _TAO_ReplyHandler_Proxy_Impl (void);
-};
-
-//
-//               End Base Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                Remote Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-class TAO_Messaging_Export _TAO_ReplyHandler_Remote_Proxy_Impl
-  : public virtual _TAO_ReplyHandler_Proxy_Impl,
-    public virtual TAO_Remote_Object_Proxy_Impl
-{
-public:
-  _TAO_ReplyHandler_Remote_Proxy_Impl (void);
+  class TAO_Messaging_Export _TAO_ReplyHandler_Remote_Proxy_Impl
+    : public virtual _TAO_ReplyHandler_Proxy_Impl,
+      public virtual TAO_Remote_Object_Proxy_Impl
+  {
+  public:
+    _TAO_ReplyHandler_Remote_Proxy_Impl (void);
+    
+    virtual ~_TAO_ReplyHandler_Remote_Proxy_Impl (void) {}
+  };
   
-  virtual ~_TAO_ReplyHandler_Remote_Proxy_Impl (void) { }
+  //
+  //             End Remote Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
-};
-
-//
-//             End Remote Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new 
-// collocation scheme, the proxy to be used can vary on
-// a call by call basis.
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-class TAO_Messaging_Export _TAO_ReplyHandler_Proxy_Broker
-{
-public:
-  virtual ~_TAO_ReplyHandler_Proxy_Broker (void);
-  virtual _TAO_ReplyHandler_Proxy_Impl &select_proxy (
-      ReplyHandler *object
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) = 0;
+  // The Proxy Brokers are used by each interface to get
+  // the right proxy for performing a call. In the new 
+  // collocation scheme, the proxy to be used can vary on
+  // a call by call basis.
   
-protected:
-  _TAO_ReplyHandler_Proxy_Broker (void);
+  ///////////////////////////////////////////////////////////////////////
+  //                 Base Proxy Broker Declaration 
+  //
   
-};
-
-//
-//              End Base Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-class TAO_Messaging_Export _TAO_ReplyHandler_Remote_Proxy_Broker
-  : public virtual _TAO_ReplyHandler_Proxy_Broker
-{
-public: 
-  _TAO_ReplyHandler_Remote_Proxy_Broker (void);
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
   
-  virtual ~_TAO_ReplyHandler_Remote_Proxy_Broker (void);
+  class TAO_Messaging_Export _TAO_ReplyHandler_Proxy_Broker
+  {
+  public:
+    virtual ~_TAO_ReplyHandler_Proxy_Broker (void);
+    virtual _TAO_ReplyHandler_Proxy_Impl &select_proxy (
+        ReplyHandler *object
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+  protected:
+    _TAO_ReplyHandler_Proxy_Broker (void);
+    
+  };
   
-  virtual _TAO_ReplyHandler_Proxy_Impl &select_proxy (
-      ReplyHandler *object
-      ACE_ENV_ARG_DECL
-    );
+  //
+  //              End Base Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-private:
-  _TAO_ReplyHandler_Remote_Proxy_Impl remote_proxy_impl_;
-
-public:
-  // This member function is used to get an handle to the unique instance
-  // of the Remote Proxy Broker that is available for a given
-  // interface.
-  static _TAO_ReplyHandler_Remote_Proxy_Broker *the_TAO_ReplyHandler_Remote_Proxy_Broker (void);
-};
-
-//
-//              End Remote Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
+    
+  ///////////////////////////////////////////////////////////////////////
+  //                 Remote Proxy Broker Declaration 
+  //
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
+  class TAO_Messaging_Export _TAO_ReplyHandler_Remote_Proxy_Broker
+    : public virtual _TAO_ReplyHandler_Proxy_Broker
+  {
+  public: 
+    _TAO_ReplyHandler_Remote_Proxy_Broker (void);
+    
+    virtual ~_TAO_ReplyHandler_Remote_Proxy_Broker (void);
+    
+    virtual _TAO_ReplyHandler_Proxy_Impl &select_proxy (
+        ReplyHandler *object
+        ACE_ENV_ARG_DECL
+      );
+    
+  private:
+    _TAO_ReplyHandler_Remote_Proxy_Impl remote_proxy_impl_;
+  
+  public:
+    // This member function is used to get an handle to the unique instance
+    // of the Remote Proxy Broker that is available for a given
+    // interface.
+    static _TAO_ReplyHandler_Remote_Proxy_Broker *the_TAO_ReplyHandler_Remote_Proxy_Broker (void);
+  };
+  
+  //
+  //              End Remote Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
+  
+  // 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_ReplyHandler;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_decl.cpp:44
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyHandler;
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module Messaging
@@ -598,7 +531,7 @@ TAO_NAMESPACE_CLOSE // module Messaging
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:79
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80
 
 extern TAO_Messaging_Export
 Messaging::_TAO_ReplyHandler_Proxy_Broker *
@@ -606,8 +539,14 @@ Messaging::_TAO_ReplyHandler_Proxy_Broker *
     CORBA::Object_ptr obj
   );
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:55
+
 TAO_NAMESPACE  OBV_Messaging
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
 
 #if !defined (_MESSAGING_EXCEPTIONHOLDER___OBV_CH_)
 #define _MESSAGING_EXCEPTIONHOLDER___OBV_CH_
@@ -618,27 +557,22 @@ TAO_NAMESPACE  OBV_Messaging
       public virtual CORBA::DefaultValueRefCountBase
   {
   public:
+    virtual ~ExceptionHolder (void);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_valuetype/field_ch.cpp:411
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_ch.cpp:411
     
     virtual void is_system_exception (CORBA::Boolean);
     virtual CORBA::Boolean is_system_exception (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_valuetype/field_ch.cpp:411
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_ch.cpp:411
     
     virtual void byte_order (CORBA::Boolean);
     virtual CORBA::Boolean byte_order (void) const;
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_valuetype/field_ch.cpp:484
-    
-    typedef _tao_seq_Octet _marshaled_exception_seq;
-      virtual void marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &);
-    virtual const Messaging::ExceptionHolder::_tao_seq_Octet &marshaled_exception (void) const;
-    virtual Messaging::ExceptionHolder::_tao_seq_Octet &marshaled_exception (void);
-    
-    
+    virtual void marshaled_exception (const CORBA::OctetSeq &);
+    virtual const CORBA::OctetSeq &marshaled_exception (void) const;
+    virtual CORBA::OctetSeq &marshaled_exception (void);
     
   protected:
     virtual CORBA::Boolean _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &);
@@ -649,32 +583,37 @@ TAO_NAMESPACE  OBV_Messaging
   private:
     CORBA::Boolean _pd_is_system_exception;
     CORBA::Boolean _pd_byte_order;
-    _tao_seq_Octet _pd_marshaled_exception;
+    CORBA::OctetSeq _pd_marshaled_exception;
   };
-  
+
 #endif /* end #if !defined */
   
-  }
-TAO_NAMESPACE_CLOSE
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:85
+
+}TAO_NAMESPACE_CLOSE
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
 
-// Any operators for valuetype Messaging::ExceptionHolder
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ExceptionHolder *); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ExceptionHolder **); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ExceptionHolder *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::ReplyHandler
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyHandler_ptr &);
 
-#ifndef __ACE_INLINE__
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
+#ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:684
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682
 
 TAO_NAMESPACE CORBA
 {
@@ -684,39 +623,24 @@ TAO_NAMESPACE CORBA
 TAO_NAMESPACE_CLOSE
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_ch.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *);
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&);
 
-#if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_
-#define _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_
-
-#if 0
-TAO_Messaging_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const Messaging::ExceptionHolder::_tao_seq_Octet &
-  );
-TAO_Messaging_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    Messaging::ExceptionHolder::_tao_seq_Octet &
-  );
-
-#endif /*if 0*/
-
-#endif /* _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ */
-
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr );
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1002
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "MessagingC.i"
@@ -732,3 +656,5 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Reply
 
 #include "ace/post.h"
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/Messaging/MessagingC.i b/TAO/tao/Messaging/MessagingC.i
index 4665fb6e217..a730719b67c 100644
--- a/TAO/tao/Messaging/MessagingC.i
+++ b/TAO/tao/Messaging/MessagingC.i
@@ -19,8 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_ci.cpp:58
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
 Messaging::ExceptionHolder::ExceptionHolder (void)
@@ -30,14 +31,14 @@ ACE_INLINE
 Messaging::ExceptionHolder::~ExceptionHolder (void)
 {}
 
-ACE_INLINE const char*
+ACE_INLINE const char* 
 Messaging::ExceptionHolder::_tao_obv_static_repository_id ()
 {
   return "IDL:omg.org/Messaging/ExceptionHolder:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_REPLYHANDLER___CI_)
 #define _MESSAGING_REPLYHANDLER___CI_
@@ -53,29 +54,37 @@ Messaging::ReplyHandler::ReplyHandler (
   this->Messaging_ReplyHandler_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:714
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:712
 
 #if defined (__ACE_INLINE__)
+
 TAO_NAMESPACE CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (Messaging::ExceptionHolder *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (Messaging::ExceptionHolder *);
 }
 TAO_NAMESPACE_CLOSE
+
 #endif /*__ACE_INLINE__*/
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_ci.cpp:60
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ci.cpp:60
 
 TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *);
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_Messaging_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -86,3 +95,5 @@ TAO_Messaging_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     Messaging::ReplyHandler_ptr &
   );
+
+
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index cb0d3d1370a..c20d9a19c09 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -20,12 +20,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:663
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:670
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_CPP_
 #define _TAO_IDL_ORIG_MESSAGINGS_CPP_
 
+
 #include "MessagingS.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Operation_Table.h"
@@ -34,7 +35,6 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/PortableInterceptor.h"
-
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #include "tao/PICurrent.h"
@@ -43,6 +43,7 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -51,8 +52,10 @@
 #include "MessagingS.i"
 #endif /* !defined INLINE */
 
+
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1694
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
 
 class TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -61,8 +64,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
+
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/taotmp/bala/work/ACE+TAO/temp/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -157,9 +161,10 @@ TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::lookup (const char *str, unsign
 static TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable tao_Messaging_ReplyHandler_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
@@ -167,7 +172,7 @@ static TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable tao_Messaging_ReplyHandle
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker *POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::the_TAO_ReplyHandler_Strategized_Proxy_Broker (void)
@@ -179,8 +184,9 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker *POA_Messaging::_TAO_R
 POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::_TAO_ReplyHandler_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    this->proxy_cache_[i] = 0;
-
+    {
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::~_TAO_ReplyHandler_Strategized_Proxy_Broker (void)
@@ -188,12 +194,11 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::~_TAO_ReplyHandler_St
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     {
       delete this->proxy_cache_[i];
-
+      
       // Hack to prevent bug mentioned in 1204. Refer to 1204
       // for details..
       this->proxy_cache_[i] = 0;
     }
-
 }
 
 Messaging::_TAO_ReplyHandler_Proxy_Impl&
@@ -204,26 +209,27 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::select_proxy (
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
+  
   if (this->proxy_cache_[strategy] != 0)
-    return *this->proxy_cache_[strategy];
-
+    {
+      return *this->proxy_cache_[strategy];
+    }
+  
   this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   return *this->proxy_cache_[strategy];
-
 }
 
-void
+void 
 POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy (
     int strategy
     ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
+  
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -236,7 +242,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
@@ -245,7 +251,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
@@ -255,20 +261,16 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
-      }
-
-  }
+        }
+    }
 }
 
-
 //
 //        End Strategized Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:599
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 Messaging::_TAO_ReplyHandler_Proxy_Broker *
 Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -280,13 +282,13 @@ Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function (CORBA::Object_ptr obj
 int
 Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (long)
 {
-  Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer =
+  Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer = 
     Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int Messaging__TAO_ReplyHandler_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+static int Messaging__TAO_ReplyHandler_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
   Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer));
 
 
@@ -295,18 +297,14 @@ static int Messaging__TAO_ReplyHandler_Proxy_Broker_Stub_Factory_Initializer_Sca
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_Messaging::_TAO_ReplyHandler_ThruPOA_Proxy_Impl::_TAO_ReplyHandler_ThruPOA_Proxy_Impl (void)
 {}
 
-// ThruPOA Implementation of the IDL interface methods
-
-//
+// ThruPOA Implementation of the IDL interface methods//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -319,8 +317,9 @@ POA_Messaging::_TAO_ReplyHandler_Direct_Proxy_Impl::_TAO_ReplyHandler_Direct_Pro
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:98
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
 
 POA_Messaging::ReplyHandler::ReplyHandler (void)
 {
@@ -335,11 +334,11 @@ POA_Messaging::ReplyHandler::~ReplyHandler (void)
 {
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:163
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_Messaging::ReplyHandler::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -349,20 +348,22 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
   POA_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _tao_servant;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
+  
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_Messaging::ReplyHandler::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -372,15 +373,16 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_Messaging::ReplyHandler::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -389,27 +391,27 @@ void POA_Messaging::ReplyHandler::_interface_skel (
   POA_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _tao_servant;
   CORBA::InterfaceDef_ptr _tao_retval = 0;
   CORBA::Boolean _tao_result = 0;
-
+  
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   ACE_TRY
     {
-      _tao_retval =
+      _tao_retval = 
         _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       _tao_server_request.init_reply ();
-
+      
       TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+      
       _tao_result =
         _tao_adapter->interfacedef_cdr_insert (
             _tao_out,
@@ -421,7 +423,7 @@ void POA_Messaging::ReplyHandler::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -429,7 +431,7 @@ void POA_Messaging::ReplyHandler::_interface_skel (
 }
 
 void POA_Messaging::ReplyHandler::_component_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -439,9 +441,10 @@ void POA_Messaging::ReplyHandler::_component_skel (
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << _tao_retval._retn ()))
     ACE_THROW (CORBA::MARSHAL ());
 }
@@ -479,13 +482,13 @@ void* POA_Messaging::ReplyHandler::_downcast (
     {
       return ACE_static_cast (POA_Messaging::ReplyHandler_ptr, this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
       return ACE_static_cast(PortableServer::Servant, this);
     }
-
+  
   return 0;
 }
 
@@ -495,7 +498,7 @@ const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:533
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
 
 void POA_Messaging::ReplyHandler::_dispatch (
     TAO_ServerRequest &req,
@@ -510,17 +513,17 @@ void POA_Messaging::ReplyHandler::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:479
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
 Messaging::ReplyHandler *
 POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     {
       ACE_NEW_RETURN (
@@ -545,12 +548,9 @@ POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-
+  
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
   return ::Messaging::ReplyHandler::_unchecked_narrow (obj.in ());
 }
-
-
-
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h
index 76c60ad3a24..db1baeafe6a 100644
--- a/TAO/tao/Messaging/MessagingS.h
+++ b/TAO/tao/Messaging/MessagingS.h
@@ -19,9 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:433
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:443
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_H_
 #define _TAO_IDL_ORIG_MESSAGINGS_H_
@@ -29,10 +28,10 @@
 #include "ace/pre.h"
 #include "Messaging.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/PortableServer/Collocated_Object.h"
@@ -51,104 +50,99 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:46
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
 
 TAO_NAMESPACE  POA_Messaging
 {
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:82
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
+  
   class ReplyHandler;
   typedef ReplyHandler *ReplyHandler_ptr;
-  // Forward Classes Declaration
+  
   class _TAO_ReplyHandler_ThruPOA_Proxy_Impl;
   class _TAO_ReplyHandler_Direct_Proxy_Impl;
   class _TAO_ReplyHandler_Strategized_Proxy_Broker;
-
+  
   class TAO_Messaging_Export ReplyHandler
     : public virtual PortableServer::ServantBase
   {
   protected:
     ReplyHandler (void);
-
+  
   public:
     ReplyHandler (const ReplyHandler& rhs);
     virtual ~ReplyHandler (void);
-
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::Messaging::ReplyHandler *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
-
-
-  };
-
-
+  };  
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:39
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+  
   class TAO_Messaging_Export _TAO_ReplyHandler_Strategized_Proxy_Broker : public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-
+    
     virtual ::Messaging::_TAO_ReplyHandler_Proxy_Impl &select_proxy (
       ::Messaging::ReplyHandler *object
       ACE_ENV_ARG_DECL
     );
-
+  
   private:
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
@@ -156,66 +150,59 @@ TAO_NAMESPACE  POA_Messaging
       int collocation_strategy
       ACE_ENV_ARG_DECL
     );
-
+    
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::Messaging::_TAO_ReplyHandler_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+    
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-
+  
   public:
     static _TAO_ReplyHandler_Strategized_Proxy_Broker *the_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
   };
-
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-  class TAO_Messaging_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl :
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  
+  class TAO_Messaging_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl : 
     public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl
   {
   public:
     _TAO_ReplyHandler_ThruPOA_Proxy_Impl (void);
-
-    virtual ~_TAO_ReplyHandler_ThruPOA_Proxy_Impl (void) { }
-
-
+    
+    virtual ~_TAO_ReplyHandler_ThruPOA_Proxy_Impl (void) {}
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
 
-class TAO_Messaging_Export _TAO_ReplyHandler_Direct_Proxy_Impl :
+class TAO_Messaging_Export _TAO_ReplyHandler_Direct_Proxy_Impl : 
   public virtual Messaging::_TAO_ReplyHandler_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_ReplyHandler_Direct_Proxy_Impl (void);
-
-  virtual ~_TAO_ReplyHandler_Direct_Proxy_Impl (void) { }
-
-  };
+  
+  virtual ~_TAO_ReplyHandler_Direct_Proxy_Impl (void) {}};
 
 
 //
@@ -225,14 +212,13 @@ public:
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:81
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
 }
 TAO_NAMESPACE_CLOSE // module Messaging
 
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1038
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
 
 #include "MessagingS_T.h"
 
diff --git a/TAO/tao/Messaging/MessagingS.i b/TAO/tao/Messaging/MessagingS.i
index f455a06b8f0..e86a7e25a26 100644
--- a/TAO/tao/Messaging/MessagingS.i
+++ b/TAO/tao/Messaging/MessagingS.i
@@ -19,3 +19,4 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
diff --git a/TAO/tao/Messaging/MessagingS_T.cpp b/TAO/tao/Messaging/MessagingS_T.cpp
index 21aa0387261..63bb736b57d 100644
--- a/TAO/tao/Messaging/MessagingS_T.cpp
+++ b/TAO/tao/Messaging/MessagingS_T.cpp
@@ -19,9 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:770
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:777
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_T_CPP_
 #define _TAO_IDL_ORIG_MESSAGINGS_T_CPP_
diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h
index bc33cfc9487..731132c86d4 100644
--- a/TAO/tao/Messaging/MessagingS_T.h
+++ b/TAO/tao/Messaging/MessagingS_T.h
@@ -19,14 +19,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:597
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:604
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_T_H_
 #define _TAO_IDL_ORIG_MESSAGINGS_T_H_
 
 #include "ace/pre.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -34,11 +34,16 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+
 #if defined (ACE_HAS_USING_KEYWORD)
 TAO_NAMESPACE  POA_Messaging
 {
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/tie_sh.cpp:89
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -49,9 +54,13 @@ TAO_NAMESPACE  POA_Messaging
     // the T& ctor
     ReplyHandler_tie (T &t, PortableServer::POA_ptr poa);
     // ctor taking a POA
-    ReplyHandler_tie (T *tp, CORBA::Boolean release=1);
+    ReplyHandler_tie (T *tp, CORBA::Boolean release = 1);
     // ctor taking pointer and an ownership flag
-    ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    ReplyHandler_tie (
+        T *tp,
+        PortableServer::POA_ptr poa,
+        CORBA::Boolean release = 1
+      );
     // ctor with T*, ownership flag and a POA
     ~ReplyHandler_tie (void);
     // dtor
@@ -61,7 +70,7 @@ TAO_NAMESPACE  POA_Messaging
     // return the underlying object
     void _tied_object (T &obj);
     // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
+    void _tied_object (T *obj, CORBA::Boolean release = 1);
     // set the underlying object and the ownership flag
     CORBA::Boolean _is_owner (void);
     // do we own it
@@ -72,6 +81,7 @@ TAO_NAMESPACE  POA_Messaging
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
+  
   private:
     T *ptr_;
     PortableServer::POA_var poa_;
@@ -81,26 +91,21 @@ TAO_NAMESPACE  POA_Messaging
     ReplyHandler_tie (const ReplyHandler_tie &);
     void operator= (const ReplyHandler_tie &);
   };
-
 }
 TAO_NAMESPACE_CLOSE // module Messaging
 #endif /* ACE_HAS_USING_KEYWORD */
 
-
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:1135
-
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
 
 #if defined (__ACE_INLINE__)
 #include "MessagingS_T.i"
 #endif /* defined INLINE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "MessagingS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #pragma implementation ("MessagingS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
diff --git a/TAO/tao/Messaging/MessagingS_T.i b/TAO/tao/Messaging/MessagingS_T.i
index 0fdb7af7c12..078f6d0a495 100644
--- a/TAO/tao/Messaging/MessagingS_T.i
+++ b/TAO/tao/Messaging/MessagingS_T.i
@@ -19,14 +19,12 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/tie_si.cpp:95
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
 
 #if defined (ACE_HAS_USING_KEYWORD)
 
-// TAO_IDL - Generated from be/be_visitor_interface/tie_si.cpp:105
-
-
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t)
 	: ptr_ (&t),
@@ -58,7 +56,10 @@ POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, PortableServer::POA
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::~ReplyHandler_tie (void)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
 }
 
 template <class T> ACE_INLINE T *
@@ -70,7 +71,11 @@ POA_Messaging::ReplyHandler_tie<T>::_tied_object (void)
 template <class T> ACE_INLINE void
 POA_Messaging::ReplyHandler_tie<T>::_tied_object (T &obj)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -78,7 +83,11 @@ POA_Messaging::ReplyHandler_tie<T>::_tied_object (T &obj)
 template <class T> ACE_INLINE void
 POA_Messaging::ReplyHandler_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -99,8 +108,10 @@ template <class T> ACE_INLINE PortableServer::POA_ptr
 POA_Messaging::ReplyHandler_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
+    {
+      return PortableServer::POA::_duplicate (this->poa_.in ());
+    }
+  
   return this->ReplyHandler::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
diff --git a/TAO/tao/Messaging/Messaging_No_Impl.pidl b/TAO/tao/Messaging/Messaging_No_Impl.pidl
index 05396a51c7f..39abffcf345 100644
--- a/TAO/tao/Messaging/Messaging_No_Impl.pidl
+++ b/TAO/tao/Messaging/Messaging_No_Impl.pidl
@@ -12,8 +12,8 @@
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *   tao_idl
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
index e4cd44475ca..f5cba4923b3 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
@@ -19,12 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:315
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
-#include "Messaging_No_ImplC.h"
 
+#include "Messaging_No_ImplC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -35,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -43,13 +44,12 @@
 #include "Messaging_No_ImplC.i"
 #endif /* !defined INLINE */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_Priority[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   35,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -60,11 +60,11 @@ static const CORBA::Long _oc_Messaging_Priority[] =
   ACE_NTOHL (0x696f7269), 
   ACE_NTOHL (0x74793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
-  9,
+    9,
   ACE_NTOHL (0x5072696f), 
   ACE_NTOHL (0x72697479), 
   ACE_NTOHL (0x0),  // name = Priority
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -85,13 +85,12 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_RebindMode[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   37,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -103,11 +102,11 @@ static const CORBA::Long _oc_Messaging_RebindMode[] =
   ACE_NTOHL (0x4d6f6465), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RebindMode:1.0
-  11,
+    11,
   ACE_NTOHL (0x52656269), 
   ACE_NTOHL (0x6e644d6f), 
   ACE_NTOHL (0x64650000),  // name = RebindMode
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -128,13 +127,12 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_RoutingType[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   38,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -146,11 +144,11 @@ static const CORBA::Long _oc_Messaging_RoutingType[] =
   ACE_NTOHL (0x67547970), 
   ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
-  12,
+    12,
   ACE_NTOHL (0x526f7574), 
   ACE_NTOHL (0x696e6754), 
   ACE_NTOHL (0x79706500),  // name = RoutingType
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -171,13 +169,12 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_Ordering[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   35,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -188,11 +185,11 @@ static const CORBA::Long _oc_Messaging_Ordering[] =
   ACE_NTOHL (0x64657269), 
   ACE_NTOHL (0x6e673a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Ordering:1.0
-  9,
+    9,
   ACE_NTOHL (0x4f726465), 
   ACE_NTOHL (0x72696e67), 
   ACE_NTOHL (0x0),  // name = Ordering
-  CORBA::tk_ushort,
+    CORBA::tk_ushort,
 
 };
 
@@ -213,9 +210,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::RebindPolicy::_tao_class_id = 0;
 
@@ -262,13 +258,23 @@ tao_Messaging_RebindPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_RebindPolicy_marshal (
+    Messaging::RebindPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::RebindPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::RebindPolicy_var::RebindPolicy_var (void) // default constructor
+Messaging::RebindPolicy_var::RebindPolicy_var (void)
   : ptr_ (RebindPolicy::_nil ())
 {}
 
@@ -278,12 +284,12 @@ Messaging::RebindPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::RebindPolicy_var::RebindPolicy_var (const ::Messaging::RebindPolicy_var &p) // copy constructor
+Messaging::RebindPolicy_var::RebindPolicy_var (const ::Messaging::RebindPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (RebindPolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::RebindPolicy_var::~RebindPolicy_var (void) // destructor
+Messaging::RebindPolicy_var::~RebindPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -387,10 +393,11 @@ Messaging::RebindPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::RebindPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_ptr &p)
@@ -399,14 +406,14 @@ Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_ptr &p)
   this->ptr_ = ::Messaging::RebindPolicy::_nil ();
 }
 
-Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_var &p) // constructor from _var
+Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::RebindPolicy::_nil ();
 }
 
-Messaging::RebindPolicy_out::RebindPolicy_out (const ::Messaging::RebindPolicy_out &p) // copy constructor
+Messaging::RebindPolicy_out::RebindPolicy_out (const ::Messaging::RebindPolicy_out &p)
   : ptr_ (ACE_const_cast (RebindPolicy_out &, p).ptr_)
 {}
 
@@ -437,7 +444,7 @@ Messaging::RebindPolicy_out::operator ::Messaging::RebindPolicy_ptr &() // cast
 }
 
 ::Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_out::ptr (void) // ptr
+Messaging::RebindPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -448,10 +455,8 @@ Messaging::RebindPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::RebindPolicy::RebindPolicy (void)
 {}
@@ -459,6 +464,13 @@ Messaging::RebindPolicy::RebindPolicy (void)
 Messaging::RebindPolicy::~RebindPolicy (void)
 {}
 
+void 
+Messaging::RebindPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RebindPolicy *tmp = ACE_static_cast (RebindPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::RebindPolicy_ptr
 Messaging::RebindPolicy::_narrow (
     CORBA::Object_ptr obj
@@ -552,13 +564,12 @@ const char* Messaging::RebindPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/RebindPolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_RebindPolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   39,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -570,12 +581,12 @@ static const CORBA::Long _oc_Messaging_RebindPolicy[] =
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RebindPolicy:1.0
-  13,
+    13,
   ACE_NTOHL (0x52656269), 
   ACE_NTOHL (0x6e64506f), 
   ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x0),  // name = RebindPolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindPolicy (
     CORBA::tk_objref,
@@ -594,13 +605,12 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_PriorityRange[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   40,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -612,15 +622,15 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] =
   ACE_NTOHL (0x74795261), 
   ACE_NTOHL (0x6e67653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/PriorityRange:1.0
-  14,
+    14,
   ACE_NTOHL (0x5072696f), 
   ACE_NTOHL (0x72697479), 
   ACE_NTOHL (0x52616e67), 
   ACE_NTOHL (0x65000000),  // name = PriorityRange
   2, // member count
-  4,
+    4,
   ACE_NTOHL (0x6d696e00),  // name = min
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
@@ -633,16 +643,16 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] =
     ACE_NTOHL (0x696f7269), 
     ACE_NTOHL (0x74793a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
-    9,
+        9,
     ACE_NTOHL (0x5072696f), 
     ACE_NTOHL (0x72697479), 
     ACE_NTOHL (0x0),  // name = Priority
-    CORBA::tk_short,
+        CORBA::tk_short,
 
 
   4,
   ACE_NTOHL (0x6d617800),  // name = max
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffffac, // negative offset (-84)
 };
 
@@ -663,15 +673,17 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void Messaging::PriorityRange::_tao_any_destructor (void *_tao_void_pointer)
 {
   PriorityRange *tmp = ACE_static_cast (PriorityRange*, _tao_void_pointer);
   delete tmp;
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::RequestPriorityPolicy::_tao_class_id = 0;
 
@@ -718,13 +730,23 @@ tao_Messaging_RequestPriorityPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_RequestPriorityPolicy_marshal (
+    Messaging::RequestPriorityPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::RequestPriorityPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (void) // default constructor
+Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (void)
   : ptr_ (RequestPriorityPolicy::_nil ())
 {}
 
@@ -734,12 +756,12 @@ Messaging::RequestPriorityPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (const ::Messaging::RequestPriorityPolicy_var &p) // copy constructor
+Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (const ::Messaging::RequestPriorityPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (RequestPriorityPolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::RequestPriorityPolicy_var::~RequestPriorityPolicy_var (void) // destructor
+Messaging::RequestPriorityPolicy_var::~RequestPriorityPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -843,10 +865,11 @@ Messaging::RequestPriorityPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::RequestPriorityPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriorityPolicy_ptr &p)
@@ -855,14 +878,14 @@ Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriority
   this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
 }
 
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriorityPolicy_var &p) // constructor from _var
+Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriorityPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
 }
 
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (const ::Messaging::RequestPriorityPolicy_out &p) // copy constructor
+Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (const ::Messaging::RequestPriorityPolicy_out &p)
   : ptr_ (ACE_const_cast (RequestPriorityPolicy_out &, p).ptr_)
 {}
 
@@ -893,7 +916,7 @@ Messaging::RequestPriorityPolicy_out::operator ::Messaging::RequestPriorityPolic
 }
 
 ::Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_out::ptr (void) // ptr
+Messaging::RequestPriorityPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -904,10 +927,8 @@ Messaging::RequestPriorityPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void)
 {}
@@ -915,6 +936,13 @@ Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void)
 Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void)
 {}
 
+void 
+Messaging::RequestPriorityPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RequestPriorityPolicy *tmp = ACE_static_cast (RequestPriorityPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::RequestPriorityPolicy_ptr
 Messaging::RequestPriorityPolicy::_narrow (
     CORBA::Object_ptr obj
@@ -1008,13 +1036,12 @@ const char* Messaging::RequestPriorityPolicy::_interface_repository_id (void) co
   return "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_RequestPriorityPolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   48,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -1028,14 +1055,14 @@ static const CORBA::Long _oc_Messaging_RequestPriorityPolicy[] =
   ACE_NTOHL (0x79506f6c), 
   ACE_NTOHL (0x6963793a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/RequestPriorityPolicy:1.0
-  22,
+    22,
   ACE_NTOHL (0x52657175), 
   ACE_NTOHL (0x65737450), 
   ACE_NTOHL (0x72696f72), 
   ACE_NTOHL (0x69747950), 
   ACE_NTOHL (0x6f6c6963), 
   ACE_NTOHL (0x79000000),  // name = RequestPriorityPolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestPriorityPolicy (
     CORBA::tk_objref,
@@ -1054,9 +1081,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::ReplyPriorityPolicy::_tao_class_id = 0;
 
@@ -1103,13 +1129,23 @@ tao_Messaging_ReplyPriorityPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_ReplyPriorityPolicy_marshal (
+    Messaging::ReplyPriorityPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::ReplyPriorityPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (void) // default constructor
+Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (void)
   : ptr_ (ReplyPriorityPolicy::_nil ())
 {}
 
@@ -1119,12 +1155,12 @@ Messaging::ReplyPriorityPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (const ::Messaging::ReplyPriorityPolicy_var &p) // copy constructor
+Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (const ::Messaging::ReplyPriorityPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ReplyPriorityPolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::ReplyPriorityPolicy_var::~ReplyPriorityPolicy_var (void) // destructor
+Messaging::ReplyPriorityPolicy_var::~ReplyPriorityPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1228,10 +1264,11 @@ Messaging::ReplyPriorityPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::ReplyPriorityPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy_ptr &p)
@@ -1240,14 +1277,14 @@ Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy
   this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
 }
 
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy_var &p) // constructor from _var
+Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
 }
 
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (const ::Messaging::ReplyPriorityPolicy_out &p) // copy constructor
+Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (const ::Messaging::ReplyPriorityPolicy_out &p)
   : ptr_ (ACE_const_cast (ReplyPriorityPolicy_out &, p).ptr_)
 {}
 
@@ -1278,7 +1315,7 @@ Messaging::ReplyPriorityPolicy_out::operator ::Messaging::ReplyPriorityPolicy_pt
 }
 
 ::Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_out::ptr (void) // ptr
+Messaging::ReplyPriorityPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1289,10 +1326,8 @@ Messaging::ReplyPriorityPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void)
 {}
@@ -1300,6 +1335,13 @@ Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void)
 Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void)
 {}
 
+void 
+Messaging::ReplyPriorityPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ReplyPriorityPolicy *tmp = ACE_static_cast (ReplyPriorityPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::ReplyPriorityPolicy_ptr
 Messaging::ReplyPriorityPolicy::_narrow (
     CORBA::Object_ptr obj
@@ -1393,13 +1435,12 @@ const char* Messaging::ReplyPriorityPolicy::_interface_repository_id (void) cons
   return "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_ReplyPriorityPolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   46,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -1413,13 +1454,13 @@ static const CORBA::Long _oc_Messaging_ReplyPriorityPolicy[] =
   ACE_NTOHL (0x6f6c6963), 
   ACE_NTOHL (0x793a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0
-  20,
+    20,
   ACE_NTOHL (0x5265706c), 
   ACE_NTOHL (0x79507269), 
   ACE_NTOHL (0x6f726974), 
   ACE_NTOHL (0x79506f6c), 
   ACE_NTOHL (0x69637900),  // name = ReplyPriorityPolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyPriorityPolicy (
     CORBA::tk_objref,
@@ -1438,9 +1479,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::RequestStartTimePolicy::_tao_class_id = 0;
 
@@ -1487,13 +1527,23 @@ tao_Messaging_RequestStartTimePolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_RequestStartTimePolicy_marshal (
+    Messaging::RequestStartTimePolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::RequestStartTimePolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (void) // default constructor
+Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (void)
   : ptr_ (RequestStartTimePolicy::_nil ())
 {}
 
@@ -1503,12 +1553,12 @@ Messaging::RequestStartTimePolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (const ::Messaging::RequestStartTimePolicy_var &p) // copy constructor
+Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (const ::Messaging::RequestStartTimePolicy_var &p)
   : TAO_Base_var (),
     ptr_ (RequestStartTimePolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::RequestStartTimePolicy_var::~RequestStartTimePolicy_var (void) // destructor
+Messaging::RequestStartTimePolicy_var::~RequestStartTimePolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1612,10 +1662,11 @@ Messaging::RequestStartTimePolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::RequestStartTimePolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartTimePolicy_ptr &p)
@@ -1624,14 +1675,14 @@ Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartT
   this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
 }
 
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartTimePolicy_var &p) // constructor from _var
+Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartTimePolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
 }
 
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (const ::Messaging::RequestStartTimePolicy_out &p) // copy constructor
+Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (const ::Messaging::RequestStartTimePolicy_out &p)
   : ptr_ (ACE_const_cast (RequestStartTimePolicy_out &, p).ptr_)
 {}
 
@@ -1662,7 +1713,7 @@ Messaging::RequestStartTimePolicy_out::operator ::Messaging::RequestStartTimePol
 }
 
 ::Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_out::ptr (void) // ptr
+Messaging::RequestStartTimePolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1673,10 +1724,8 @@ Messaging::RequestStartTimePolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void)
 {}
@@ -1684,6 +1733,13 @@ Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void)
 Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void)
 {}
 
+void 
+Messaging::RequestStartTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RequestStartTimePolicy *tmp = ACE_static_cast (RequestStartTimePolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::RequestStartTimePolicy_ptr
 Messaging::RequestStartTimePolicy::_narrow (
     CORBA::Object_ptr obj
@@ -1777,13 +1833,12 @@ const char* Messaging::RequestStartTimePolicy::_interface_repository_id (void) c
   return "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_RequestStartTimePolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   49,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -1798,14 +1853,14 @@ static const CORBA::Long _oc_Messaging_RequestStartTimePolicy[] =
   ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RequestStartTimePolicy:1.0
-  23,
+    23,
   ACE_NTOHL (0x52657175), 
   ACE_NTOHL (0x65737453), 
   ACE_NTOHL (0x74617274), 
   ACE_NTOHL (0x54696d65), 
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = RequestStartTimePolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestStartTimePolicy (
     CORBA::tk_objref,
@@ -1824,9 +1879,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::RequestEndTimePolicy::_tao_class_id = 0;
 
@@ -1873,13 +1927,23 @@ tao_Messaging_RequestEndTimePolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_RequestEndTimePolicy_marshal (
+    Messaging::RequestEndTimePolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::RequestEndTimePolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (void) // default constructor
+Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (void)
   : ptr_ (RequestEndTimePolicy::_nil ())
 {}
 
@@ -1889,12 +1953,12 @@ Messaging::RequestEndTimePolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (const ::Messaging::RequestEndTimePolicy_var &p) // copy constructor
+Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (const ::Messaging::RequestEndTimePolicy_var &p)
   : TAO_Base_var (),
     ptr_ (RequestEndTimePolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::RequestEndTimePolicy_var::~RequestEndTimePolicy_var (void) // destructor
+Messaging::RequestEndTimePolicy_var::~RequestEndTimePolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1998,10 +2062,11 @@ Messaging::RequestEndTimePolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::RequestEndTimePolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePolicy_ptr &p)
@@ -2010,14 +2075,14 @@ Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePol
   this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
 }
 
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePolicy_var &p) // constructor from _var
+Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
 }
 
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (const ::Messaging::RequestEndTimePolicy_out &p) // copy constructor
+Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (const ::Messaging::RequestEndTimePolicy_out &p)
   : ptr_ (ACE_const_cast (RequestEndTimePolicy_out &, p).ptr_)
 {}
 
@@ -2048,7 +2113,7 @@ Messaging::RequestEndTimePolicy_out::operator ::Messaging::RequestEndTimePolicy_
 }
 
 ::Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_out::ptr (void) // ptr
+Messaging::RequestEndTimePolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2059,10 +2124,8 @@ Messaging::RequestEndTimePolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void)
 {}
@@ -2070,6 +2133,13 @@ Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void)
 Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void)
 {}
 
+void 
+Messaging::RequestEndTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RequestEndTimePolicy *tmp = ACE_static_cast (RequestEndTimePolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::RequestEndTimePolicy_ptr
 Messaging::RequestEndTimePolicy::_narrow (
     CORBA::Object_ptr obj
@@ -2163,13 +2233,12 @@ const char* Messaging::RequestEndTimePolicy::_interface_repository_id (void) con
   return "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_RequestEndTimePolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   47,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -2183,14 +2252,14 @@ static const CORBA::Long _oc_Messaging_RequestEndTimePolicy[] =
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RequestEndTimePolicy:1.0
-  21,
+    21,
   ACE_NTOHL (0x52657175), 
   ACE_NTOHL (0x65737445), 
   ACE_NTOHL (0x6e645469), 
   ACE_NTOHL (0x6d65506f), 
   ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x0),  // name = RequestEndTimePolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestEndTimePolicy (
     CORBA::tk_objref,
@@ -2209,9 +2278,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::ReplyStartTimePolicy::_tao_class_id = 0;
 
@@ -2258,13 +2326,23 @@ tao_Messaging_ReplyStartTimePolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_ReplyStartTimePolicy_marshal (
+    Messaging::ReplyStartTimePolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::ReplyStartTimePolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (void) // default constructor
+Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (void)
   : ptr_ (ReplyStartTimePolicy::_nil ())
 {}
 
@@ -2274,12 +2352,12 @@ Messaging::ReplyStartTimePolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (const ::Messaging::ReplyStartTimePolicy_var &p) // copy constructor
+Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (const ::Messaging::ReplyStartTimePolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ReplyStartTimePolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::ReplyStartTimePolicy_var::~ReplyStartTimePolicy_var (void) // destructor
+Messaging::ReplyStartTimePolicy_var::~ReplyStartTimePolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2383,10 +2461,11 @@ Messaging::ReplyStartTimePolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::ReplyStartTimePolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePolicy_ptr &p)
@@ -2395,14 +2474,14 @@ Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePol
   this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
 }
 
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePolicy_var &p) // constructor from _var
+Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
 }
 
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (const ::Messaging::ReplyStartTimePolicy_out &p) // copy constructor
+Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (const ::Messaging::ReplyStartTimePolicy_out &p)
   : ptr_ (ACE_const_cast (ReplyStartTimePolicy_out &, p).ptr_)
 {}
 
@@ -2433,7 +2512,7 @@ Messaging::ReplyStartTimePolicy_out::operator ::Messaging::ReplyStartTimePolicy_
 }
 
 ::Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_out::ptr (void) // ptr
+Messaging::ReplyStartTimePolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2444,10 +2523,8 @@ Messaging::ReplyStartTimePolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void)
 {}
@@ -2455,6 +2532,13 @@ Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void)
 Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void)
 {}
 
+void 
+Messaging::ReplyStartTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ReplyStartTimePolicy *tmp = ACE_static_cast (ReplyStartTimePolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::ReplyStartTimePolicy_ptr
 Messaging::ReplyStartTimePolicy::_narrow (
     CORBA::Object_ptr obj
@@ -2548,13 +2632,12 @@ const char* Messaging::ReplyStartTimePolicy::_interface_repository_id (void) con
   return "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_ReplyStartTimePolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   47,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -2568,14 +2651,14 @@ static const CORBA::Long _oc_Messaging_ReplyStartTimePolicy[] =
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0
-  21,
+    21,
   ACE_NTOHL (0x5265706c), 
   ACE_NTOHL (0x79537461), 
   ACE_NTOHL (0x72745469), 
   ACE_NTOHL (0x6d65506f), 
   ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x0),  // name = ReplyStartTimePolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyStartTimePolicy (
     CORBA::tk_objref,
@@ -2594,9 +2677,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::ReplyEndTimePolicy::_tao_class_id = 0;
 
@@ -2643,13 +2725,23 @@ tao_Messaging_ReplyEndTimePolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_ReplyEndTimePolicy_marshal (
+    Messaging::ReplyEndTimePolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::ReplyEndTimePolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (void) // default constructor
+Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (void)
   : ptr_ (ReplyEndTimePolicy::_nil ())
 {}
 
@@ -2659,12 +2751,12 @@ Messaging::ReplyEndTimePolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (const ::Messaging::ReplyEndTimePolicy_var &p) // copy constructor
+Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (const ::Messaging::ReplyEndTimePolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ReplyEndTimePolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::ReplyEndTimePolicy_var::~ReplyEndTimePolicy_var (void) // destructor
+Messaging::ReplyEndTimePolicy_var::~ReplyEndTimePolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2768,10 +2860,11 @@ Messaging::ReplyEndTimePolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::ReplyEndTimePolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_ptr &p)
@@ -2780,14 +2873,14 @@ Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_pt
   this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
 }
 
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_var &p) // constructor from _var
+Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
 }
 
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (const ::Messaging::ReplyEndTimePolicy_out &p) // copy constructor
+Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (const ::Messaging::ReplyEndTimePolicy_out &p)
   : ptr_ (ACE_const_cast (ReplyEndTimePolicy_out &, p).ptr_)
 {}
 
@@ -2818,7 +2911,7 @@ Messaging::ReplyEndTimePolicy_out::operator ::Messaging::ReplyEndTimePolicy_ptr
 }
 
 ::Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_out::ptr (void) // ptr
+Messaging::ReplyEndTimePolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2829,10 +2922,8 @@ Messaging::ReplyEndTimePolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void)
 {}
@@ -2840,6 +2931,13 @@ Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void)
 Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void)
 {}
 
+void 
+Messaging::ReplyEndTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ReplyEndTimePolicy *tmp = ACE_static_cast (ReplyEndTimePolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::ReplyEndTimePolicy_ptr
 Messaging::ReplyEndTimePolicy::_narrow (
     CORBA::Object_ptr obj
@@ -2933,13 +3031,12 @@ const char* Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_ReplyEndTimePolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   45,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -2953,13 +3050,13 @@ static const CORBA::Long _oc_Messaging_ReplyEndTimePolicy[] =
   ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0
-  19,
+    19,
   ACE_NTOHL (0x5265706c), 
   ACE_NTOHL (0x79456e64), 
   ACE_NTOHL (0x54696d65), 
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = ReplyEndTimePolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyEndTimePolicy (
     CORBA::tk_objref,
@@ -2978,9 +3075,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::RelativeRequestTimeoutPolicy::_tao_class_id = 0;
 
@@ -3027,13 +3123,23 @@ tao_Messaging_RelativeRequestTimeoutPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_RelativeRequestTimeoutPolicy_marshal (
+    Messaging::RelativeRequestTimeoutPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::RelativeRequestTimeoutPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (void) // default constructor
+Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (void)
   : ptr_ (RelativeRequestTimeoutPolicy::_nil ())
 {}
 
@@ -3043,12 +3149,12 @@ Messaging::RelativeRequestTimeoutPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (const ::Messaging::RelativeRequestTimeoutPolicy_var &p) // copy constructor
+Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (const ::Messaging::RelativeRequestTimeoutPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::RelativeRequestTimeoutPolicy_var::~RelativeRequestTimeoutPolicy_var (void) // destructor
+Messaging::RelativeRequestTimeoutPolicy_var::~RelativeRequestTimeoutPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3152,10 +3258,11 @@ Messaging::RelativeRequestTimeoutPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::RelativeRequestTimeoutPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_ptr &p)
@@ -3164,14 +3271,14 @@ Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (R
   this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
 }
 
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_var &p) // constructor from _var
+Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
 }
 
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (const ::Messaging::RelativeRequestTimeoutPolicy_out &p) // copy constructor
+Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (const ::Messaging::RelativeRequestTimeoutPolicy_out &p)
   : ptr_ (ACE_const_cast (RelativeRequestTimeoutPolicy_out &, p).ptr_)
 {}
 
@@ -3202,7 +3309,7 @@ Messaging::RelativeRequestTimeoutPolicy_out::operator ::Messaging::RelativeReque
 }
 
 ::Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_out::ptr (void) // ptr
+Messaging::RelativeRequestTimeoutPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3213,10 +3320,8 @@ Messaging::RelativeRequestTimeoutPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void)
 {}
@@ -3224,6 +3329,13 @@ Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void)
 Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void)
 {}
 
+void 
+Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RelativeRequestTimeoutPolicy *tmp = ACE_static_cast (RelativeRequestTimeoutPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::RelativeRequestTimeoutPolicy_ptr
 Messaging::RelativeRequestTimeoutPolicy::_narrow (
     CORBA::Object_ptr obj
@@ -3317,13 +3429,12 @@ const char* Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (v
   return "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   55,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -3339,7 +3450,7 @@ static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] =
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0
-  29,
+    29,
   ACE_NTOHL (0x52656c61), 
   ACE_NTOHL (0x74697665), 
   ACE_NTOHL (0x52657175), 
@@ -3348,7 +3459,7 @@ static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] =
   ACE_NTOHL (0x7574506f), 
   ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x0),  // name = RelativeRequestTimeoutPolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy (
     CORBA::tk_objref,
@@ -3367,13 +3478,12 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   43,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -3386,16 +3496,16 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
   ACE_NTOHL (0x6552616e), 
   ACE_NTOHL (0x67653a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RoutingTypeRange:1.0
-  17,
+    17,
   ACE_NTOHL (0x526f7574), 
   ACE_NTOHL (0x696e6754), 
   ACE_NTOHL (0x79706552), 
   ACE_NTOHL (0x616e6765), 
   ACE_NTOHL (0x0),  // name = RoutingTypeRange
   2, // member count
-  4,
+    4,
   ACE_NTOHL (0x6d696e00),  // name = min
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
@@ -3409,16 +3519,16 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
     ACE_NTOHL (0x67547970), 
     ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
-    12,
+        12,
     ACE_NTOHL (0x526f7574), 
     ACE_NTOHL (0x696e6754), 
     ACE_NTOHL (0x79706500),  // name = RoutingType
-    CORBA::tk_short,
+        CORBA::tk_short,
 
 
   4,
   ACE_NTOHL (0x6d617800),  // name = max
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffffa8, // negative offset (-88)
 };
 
@@ -3439,15 +3549,17 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void Messaging::RoutingTypeRange::_tao_any_destructor (void *_tao_void_pointer)
 {
   RoutingTypeRange *tmp = ACE_static_cast (RoutingTypeRange*, _tao_void_pointer);
   delete tmp;
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::RoutingPolicy::_tao_class_id = 0;
 
@@ -3494,13 +3606,23 @@ tao_Messaging_RoutingPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_RoutingPolicy_marshal (
+    Messaging::RoutingPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::RoutingPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::RoutingPolicy_var::RoutingPolicy_var (void) // default constructor
+Messaging::RoutingPolicy_var::RoutingPolicy_var (void)
   : ptr_ (RoutingPolicy::_nil ())
 {}
 
@@ -3510,12 +3632,12 @@ Messaging::RoutingPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::RoutingPolicy_var::RoutingPolicy_var (const ::Messaging::RoutingPolicy_var &p) // copy constructor
+Messaging::RoutingPolicy_var::RoutingPolicy_var (const ::Messaging::RoutingPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (RoutingPolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::RoutingPolicy_var::~RoutingPolicy_var (void) // destructor
+Messaging::RoutingPolicy_var::~RoutingPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3619,10 +3741,11 @@ Messaging::RoutingPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::RoutingPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_ptr &p)
@@ -3631,14 +3754,14 @@ Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_ptr &p)
   this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
 }
 
-Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_var &p) // constructor from _var
+Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
 }
 
-Messaging::RoutingPolicy_out::RoutingPolicy_out (const ::Messaging::RoutingPolicy_out &p) // copy constructor
+Messaging::RoutingPolicy_out::RoutingPolicy_out (const ::Messaging::RoutingPolicy_out &p)
   : ptr_ (ACE_const_cast (RoutingPolicy_out &, p).ptr_)
 {}
 
@@ -3669,7 +3792,7 @@ Messaging::RoutingPolicy_out::operator ::Messaging::RoutingPolicy_ptr &() // cas
 }
 
 ::Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_out::ptr (void) // ptr
+Messaging::RoutingPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3680,10 +3803,8 @@ Messaging::RoutingPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::RoutingPolicy::RoutingPolicy (void)
 {}
@@ -3691,6 +3812,13 @@ Messaging::RoutingPolicy::RoutingPolicy (void)
 Messaging::RoutingPolicy::~RoutingPolicy (void)
 {}
 
+void 
+Messaging::RoutingPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RoutingPolicy *tmp = ACE_static_cast (RoutingPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::RoutingPolicy_ptr
 Messaging::RoutingPolicy::_narrow (
     CORBA::Object_ptr obj
@@ -3784,13 +3912,12 @@ const char* Messaging::RoutingPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/RoutingPolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_RoutingPolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   40,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -3802,12 +3929,12 @@ static const CORBA::Long _oc_Messaging_RoutingPolicy[] =
   ACE_NTOHL (0x67506f6c), 
   ACE_NTOHL (0x6963793a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/RoutingPolicy:1.0
-  14,
+    14,
   ACE_NTOHL (0x526f7574), 
   ACE_NTOHL (0x696e6750), 
   ACE_NTOHL (0x6f6c6963), 
   ACE_NTOHL (0x79000000),  // name = RoutingPolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingPolicy (
     CORBA::tk_objref,
@@ -3826,9 +3953,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::MaxHopsPolicy::_tao_class_id = 0;
 
@@ -3875,13 +4001,23 @@ tao_Messaging_MaxHopsPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_MaxHopsPolicy_marshal (
+    Messaging::MaxHopsPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::MaxHopsPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (void) // default constructor
+Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (void)
   : ptr_ (MaxHopsPolicy::_nil ())
 {}
 
@@ -3891,12 +4027,12 @@ Messaging::MaxHopsPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (const ::Messaging::MaxHopsPolicy_var &p) // copy constructor
+Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (const ::Messaging::MaxHopsPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (MaxHopsPolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::MaxHopsPolicy_var::~MaxHopsPolicy_var (void) // destructor
+Messaging::MaxHopsPolicy_var::~MaxHopsPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4000,10 +4136,11 @@ Messaging::MaxHopsPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::MaxHopsPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_ptr &p)
@@ -4012,14 +4149,14 @@ Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_ptr &p)
   this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
 }
 
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_var &p) // constructor from _var
+Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
 }
 
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (const ::Messaging::MaxHopsPolicy_out &p) // copy constructor
+Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (const ::Messaging::MaxHopsPolicy_out &p)
   : ptr_ (ACE_const_cast (MaxHopsPolicy_out &, p).ptr_)
 {}
 
@@ -4050,7 +4187,7 @@ Messaging::MaxHopsPolicy_out::operator ::Messaging::MaxHopsPolicy_ptr &() // cas
 }
 
 ::Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_out::ptr (void) // ptr
+Messaging::MaxHopsPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4061,10 +4198,8 @@ Messaging::MaxHopsPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::MaxHopsPolicy::MaxHopsPolicy (void)
 {}
@@ -4072,6 +4207,13 @@ Messaging::MaxHopsPolicy::MaxHopsPolicy (void)
 Messaging::MaxHopsPolicy::~MaxHopsPolicy (void)
 {}
 
+void 
+Messaging::MaxHopsPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  MaxHopsPolicy *tmp = ACE_static_cast (MaxHopsPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::MaxHopsPolicy_ptr
 Messaging::MaxHopsPolicy::_narrow (
     CORBA::Object_ptr obj
@@ -4165,13 +4307,12 @@ const char* Messaging::MaxHopsPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/MaxHopsPolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_MaxHopsPolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   40,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -4183,12 +4324,12 @@ static const CORBA::Long _oc_Messaging_MaxHopsPolicy[] =
   ACE_NTOHL (0x73506f6c), 
   ACE_NTOHL (0x6963793a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/MaxHopsPolicy:1.0
-  14,
+    14,
   ACE_NTOHL (0x4d617848), 
   ACE_NTOHL (0x6f707350), 
   ACE_NTOHL (0x6f6c6963), 
   ACE_NTOHL (0x79000000),  // name = MaxHopsPolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_MaxHopsPolicy (
     CORBA::tk_objref,
@@ -4207,9 +4348,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::QueueOrderPolicy::_tao_class_id = 0;
 
@@ -4256,13 +4396,23 @@ tao_Messaging_QueueOrderPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_QueueOrderPolicy_marshal (
+    Messaging::QueueOrderPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::QueueOrderPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (void) // default constructor
+Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (void)
   : ptr_ (QueueOrderPolicy::_nil ())
 {}
 
@@ -4272,12 +4422,12 @@ Messaging::QueueOrderPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (const ::Messaging::QueueOrderPolicy_var &p) // copy constructor
+Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (const ::Messaging::QueueOrderPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (QueueOrderPolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::QueueOrderPolicy_var::~QueueOrderPolicy_var (void) // destructor
+Messaging::QueueOrderPolicy_var::~QueueOrderPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4381,10 +4531,11 @@ Messaging::QueueOrderPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::QueueOrderPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_ptr &p)
@@ -4393,14 +4544,14 @@ Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_ptr &p)
   this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
 }
 
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_var &p) // constructor from _var
+Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
 }
 
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (const ::Messaging::QueueOrderPolicy_out &p) // copy constructor
+Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (const ::Messaging::QueueOrderPolicy_out &p)
   : ptr_ (ACE_const_cast (QueueOrderPolicy_out &, p).ptr_)
 {}
 
@@ -4431,7 +4582,7 @@ Messaging::QueueOrderPolicy_out::operator ::Messaging::QueueOrderPolicy_ptr &()
 }
 
 ::Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_out::ptr (void) // ptr
+Messaging::QueueOrderPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4442,10 +4593,8 @@ Messaging::QueueOrderPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::QueueOrderPolicy::QueueOrderPolicy (void)
 {}
@@ -4453,6 +4602,13 @@ Messaging::QueueOrderPolicy::QueueOrderPolicy (void)
 Messaging::QueueOrderPolicy::~QueueOrderPolicy (void)
 {}
 
+void 
+Messaging::QueueOrderPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  QueueOrderPolicy *tmp = ACE_static_cast (QueueOrderPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::QueueOrderPolicy_ptr
 Messaging::QueueOrderPolicy::_narrow (
     CORBA::Object_ptr obj
@@ -4546,13 +4702,12 @@ const char* Messaging::QueueOrderPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/QueueOrderPolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_QueueOrderPolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   43,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -4565,13 +4720,13 @@ static const CORBA::Long _oc_Messaging_QueueOrderPolicy[] =
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/QueueOrderPolicy:1.0
-  17,
+    17,
   ACE_NTOHL (0x51756575), 
   ACE_NTOHL (0x654f7264), 
   ACE_NTOHL (0x6572506f), 
   ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x0),  // name = QueueOrderPolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_QueueOrderPolicy (
     CORBA::tk_objref,
@@ -4590,42 +4745,34 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RebindPolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_RebindPolicy,
-      1,
-      Messaging::RebindPolicy::_duplicate (_tao_elem),
-      Messaging::RebindPolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::RebindPolicy_ptr _tao_objptr =
+    Messaging::RebindPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RebindPolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::RebindPolicy>::insert (
+      _tao_any,
+      Messaging::RebindPolicy::_tao_any_destructor,
       Messaging::_tc_RebindPolicy,
-      1,
-      *_tao_elem,
-      Messaging::RebindPolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -4634,50 +4781,35 @@ operator>>= (
     Messaging::RebindPolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::RebindPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_RebindPolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::RebindPolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::RebindPolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::RebindPolicy>::extract (
+        _tao_any,
+        Messaging::RebindPolicy::_tao_any_destructor,
+        Messaging::_tc_RebindPolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RebindPolicy>::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<Messaging::RebindPolicy,Messaging::RebindPolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::RebindPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::RebindPolicy,Messaging::RebindPolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::RebindPolicy, Messaging::RebindPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::RebindPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -4685,16 +4817,12 @@ void operator<<= (
     const Messaging::PriorityRange &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_PriorityRange,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::insert_copy (
+      _tao_any,
+      Messaging::PriorityRange::_tao_any_destructor,
+      Messaging::_tc_PriorityRange,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -4703,19 +4831,12 @@ void operator<<= (
     Messaging::PriorityRange *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_PriorityRange,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Messaging::PriorityRange::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::insert (
+      _tao_any,
+      Messaging::PriorityRange::_tao_any_destructor,
+      Messaging::_tc_PriorityRange,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -4736,109 +4857,50 @@ CORBA::Boolean operator>>= (
     const Messaging::PriorityRange *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_PriorityRange
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const Messaging::PriorityRange*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Messaging::PriorityRange *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            Messaging::PriorityRange,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Messaging::_tc_PriorityRange,
-                1,
-                ACE_static_cast (void *, tmp),
-                Messaging::PriorityRange::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::extract (
+        _tao_any,
+        Messaging::PriorityRange::_tao_any_destructor,
+        Messaging::_tc_PriorityRange,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<Messaging::PriorityRange>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<Messaging::PriorityRange>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RequestPriorityPolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_RequestPriorityPolicy,
-      1,
-      Messaging::RequestPriorityPolicy::_duplicate (_tao_elem),
-      Messaging::RequestPriorityPolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::RequestPriorityPolicy_ptr _tao_objptr =
+    Messaging::RequestPriorityPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RequestPriorityPolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::insert (
+      _tao_any,
+      Messaging::RequestPriorityPolicy::_tao_any_destructor,
       Messaging::_tc_RequestPriorityPolicy,
-      1,
-      *_tao_elem,
-      Messaging::RequestPriorityPolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -4847,83 +4909,61 @@ operator>>= (
     Messaging::RequestPriorityPolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::RequestPriorityPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_RequestPriorityPolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::RequestPriorityPolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::RequestPriorityPolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::extract (
+        _tao_any,
+        Messaging::RequestPriorityPolicy::_tao_any_destructor,
+        Messaging::_tc_RequestPriorityPolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::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<Messaging::RequestPriorityPolicy,Messaging::RequestPriorityPolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::RequestPriorityPolicy,Messaging::RequestPriorityPolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::RequestPriorityPolicy, Messaging::RequestPriorityPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::ReplyPriorityPolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_ReplyPriorityPolicy,
-      1,
-      Messaging::ReplyPriorityPolicy::_duplicate (_tao_elem),
-      Messaging::ReplyPriorityPolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::ReplyPriorityPolicy_ptr _tao_objptr =
+    Messaging::ReplyPriorityPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::ReplyPriorityPolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::insert (
+      _tao_any,
+      Messaging::ReplyPriorityPolicy::_tao_any_destructor,
       Messaging::_tc_ReplyPriorityPolicy,
-      1,
-      *_tao_elem,
-      Messaging::ReplyPriorityPolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -4932,83 +4972,61 @@ operator>>= (
     Messaging::ReplyPriorityPolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::ReplyPriorityPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_ReplyPriorityPolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::ReplyPriorityPolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::ReplyPriorityPolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::extract (
+        _tao_any,
+        Messaging::ReplyPriorityPolicy::_tao_any_destructor,
+        Messaging::_tc_ReplyPriorityPolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::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<Messaging::ReplyPriorityPolicy,Messaging::ReplyPriorityPolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::ReplyPriorityPolicy,Messaging::ReplyPriorityPolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::ReplyPriorityPolicy, Messaging::ReplyPriorityPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RequestStartTimePolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_RequestStartTimePolicy,
-      1,
-      Messaging::RequestStartTimePolicy::_duplicate (_tao_elem),
-      Messaging::RequestStartTimePolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::RequestStartTimePolicy_ptr _tao_objptr =
+    Messaging::RequestStartTimePolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RequestStartTimePolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::insert (
+      _tao_any,
+      Messaging::RequestStartTimePolicy::_tao_any_destructor,
       Messaging::_tc_RequestStartTimePolicy,
-      1,
-      *_tao_elem,
-      Messaging::RequestStartTimePolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -5017,83 +5035,61 @@ operator>>= (
     Messaging::RequestStartTimePolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::RequestStartTimePolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_RequestStartTimePolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::RequestStartTimePolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::RequestStartTimePolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::extract (
+        _tao_any,
+        Messaging::RequestStartTimePolicy::_tao_any_destructor,
+        Messaging::_tc_RequestStartTimePolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::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<Messaging::RequestStartTimePolicy,Messaging::RequestStartTimePolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::RequestStartTimePolicy,Messaging::RequestStartTimePolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::RequestStartTimePolicy, Messaging::RequestStartTimePolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RequestEndTimePolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_RequestEndTimePolicy,
-      1,
-      Messaging::RequestEndTimePolicy::_duplicate (_tao_elem),
-      Messaging::RequestEndTimePolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::RequestEndTimePolicy_ptr _tao_objptr =
+    Messaging::RequestEndTimePolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RequestEndTimePolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::insert (
+      _tao_any,
+      Messaging::RequestEndTimePolicy::_tao_any_destructor,
       Messaging::_tc_RequestEndTimePolicy,
-      1,
-      *_tao_elem,
-      Messaging::RequestEndTimePolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -5102,83 +5098,61 @@ operator>>= (
     Messaging::RequestEndTimePolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::RequestEndTimePolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_RequestEndTimePolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::RequestEndTimePolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::RequestEndTimePolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::extract (
+        _tao_any,
+        Messaging::RequestEndTimePolicy::_tao_any_destructor,
+        Messaging::_tc_RequestEndTimePolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::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<Messaging::RequestEndTimePolicy,Messaging::RequestEndTimePolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::RequestEndTimePolicy,Messaging::RequestEndTimePolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::RequestEndTimePolicy, Messaging::RequestEndTimePolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::ReplyStartTimePolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_ReplyStartTimePolicy,
-      1,
-      Messaging::ReplyStartTimePolicy::_duplicate (_tao_elem),
-      Messaging::ReplyStartTimePolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::ReplyStartTimePolicy_ptr _tao_objptr =
+    Messaging::ReplyStartTimePolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::ReplyStartTimePolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::insert (
+      _tao_any,
+      Messaging::ReplyStartTimePolicy::_tao_any_destructor,
       Messaging::_tc_ReplyStartTimePolicy,
-      1,
-      *_tao_elem,
-      Messaging::ReplyStartTimePolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -5187,83 +5161,61 @@ operator>>= (
     Messaging::ReplyStartTimePolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::ReplyStartTimePolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_ReplyStartTimePolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::ReplyStartTimePolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::ReplyStartTimePolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::extract (
+        _tao_any,
+        Messaging::ReplyStartTimePolicy::_tao_any_destructor,
+        Messaging::_tc_ReplyStartTimePolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::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<Messaging::ReplyStartTimePolicy,Messaging::ReplyStartTimePolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::ReplyStartTimePolicy,Messaging::ReplyStartTimePolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::ReplyStartTimePolicy, Messaging::ReplyStartTimePolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::ReplyEndTimePolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_ReplyEndTimePolicy,
-      1,
-      Messaging::ReplyEndTimePolicy::_duplicate (_tao_elem),
-      Messaging::ReplyEndTimePolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::ReplyEndTimePolicy_ptr _tao_objptr =
+    Messaging::ReplyEndTimePolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::ReplyEndTimePolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::insert (
+      _tao_any,
+      Messaging::ReplyEndTimePolicy::_tao_any_destructor,
       Messaging::_tc_ReplyEndTimePolicy,
-      1,
-      *_tao_elem,
-      Messaging::ReplyEndTimePolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -5272,83 +5224,61 @@ operator>>= (
     Messaging::ReplyEndTimePolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::ReplyEndTimePolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_ReplyEndTimePolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::ReplyEndTimePolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::ReplyEndTimePolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::extract (
+        _tao_any,
+        Messaging::ReplyEndTimePolicy::_tao_any_destructor,
+        Messaging::_tc_ReplyEndTimePolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::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<Messaging::ReplyEndTimePolicy,Messaging::ReplyEndTimePolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::ReplyEndTimePolicy,Messaging::ReplyEndTimePolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::ReplyEndTimePolicy, Messaging::ReplyEndTimePolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RelativeRequestTimeoutPolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_RelativeRequestTimeoutPolicy,
-      1,
-      Messaging::RelativeRequestTimeoutPolicy::_duplicate (_tao_elem),
-      Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::RelativeRequestTimeoutPolicy_ptr _tao_objptr =
+    Messaging::RelativeRequestTimeoutPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RelativeRequestTimeoutPolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::insert (
+      _tao_any,
+      Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor,
       Messaging::_tc_RelativeRequestTimeoutPolicy,
-      1,
-      *_tao_elem,
-      Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -5357,50 +5287,35 @@ operator>>= (
     Messaging::RelativeRequestTimeoutPolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::RelativeRequestTimeoutPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_RelativeRequestTimeoutPolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::RelativeRequestTimeoutPolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::extract (
+        _tao_any,
+        Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor,
+        Messaging::_tc_RelativeRequestTimeoutPolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::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<Messaging::RelativeRequestTimeoutPolicy,Messaging::RelativeRequestTimeoutPolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::RelativeRequestTimeoutPolicy,Messaging::RelativeRequestTimeoutPolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::RelativeRequestTimeoutPolicy, Messaging::RelativeRequestTimeoutPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -5408,16 +5323,12 @@ void operator<<= (
     const Messaging::RoutingTypeRange &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_RoutingTypeRange,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::insert_copy (
+      _tao_any,
+      Messaging::RoutingTypeRange::_tao_any_destructor,
+      Messaging::_tc_RoutingTypeRange,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -5426,19 +5337,12 @@ void operator<<= (
     Messaging::RoutingTypeRange *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_RoutingTypeRange,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Messaging::RoutingTypeRange::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::insert (
+      _tao_any,
+      Messaging::RoutingTypeRange::_tao_any_destructor,
+      Messaging::_tc_RoutingTypeRange,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -5459,109 +5363,50 @@ CORBA::Boolean operator>>= (
     const Messaging::RoutingTypeRange *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_RoutingTypeRange
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const Messaging::RoutingTypeRange*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Messaging::RoutingTypeRange *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            Messaging::RoutingTypeRange,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Messaging::_tc_RoutingTypeRange,
-                1,
-                ACE_static_cast (void *, tmp),
-                Messaging::RoutingTypeRange::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::extract (
+        _tao_any,
+        Messaging::RoutingTypeRange::_tao_any_destructor,
+        Messaging::_tc_RoutingTypeRange,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RoutingPolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_RoutingPolicy,
-      1,
-      Messaging::RoutingPolicy::_duplicate (_tao_elem),
-      Messaging::RoutingPolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::RoutingPolicy_ptr _tao_objptr =
+    Messaging::RoutingPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RoutingPolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::RoutingPolicy>::insert (
+      _tao_any,
+      Messaging::RoutingPolicy::_tao_any_destructor,
       Messaging::_tc_RoutingPolicy,
-      1,
-      *_tao_elem,
-      Messaging::RoutingPolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -5570,83 +5415,61 @@ operator>>= (
     Messaging::RoutingPolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::RoutingPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_RoutingPolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::RoutingPolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::RoutingPolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::RoutingPolicy>::extract (
+        _tao_any,
+        Messaging::RoutingPolicy::_tao_any_destructor,
+        Messaging::_tc_RoutingPolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RoutingPolicy>::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<Messaging::RoutingPolicy,Messaging::RoutingPolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::RoutingPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::RoutingPolicy,Messaging::RoutingPolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::RoutingPolicy, Messaging::RoutingPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::RoutingPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::MaxHopsPolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_MaxHopsPolicy,
-      1,
-      Messaging::MaxHopsPolicy::_duplicate (_tao_elem),
-      Messaging::MaxHopsPolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::MaxHopsPolicy_ptr _tao_objptr =
+    Messaging::MaxHopsPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::MaxHopsPolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::insert (
+      _tao_any,
+      Messaging::MaxHopsPolicy::_tao_any_destructor,
       Messaging::_tc_MaxHopsPolicy,
-      1,
-      *_tao_elem,
-      Messaging::MaxHopsPolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -5655,83 +5478,61 @@ operator>>= (
     Messaging::MaxHopsPolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::MaxHopsPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_MaxHopsPolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::MaxHopsPolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::MaxHopsPolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::extract (
+        _tao_any,
+        Messaging::MaxHopsPolicy::_tao_any_destructor,
+        Messaging::_tc_MaxHopsPolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::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<Messaging::MaxHopsPolicy,Messaging::MaxHopsPolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::MaxHopsPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::MaxHopsPolicy,Messaging::MaxHopsPolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::MaxHopsPolicy, Messaging::MaxHopsPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::MaxHopsPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::QueueOrderPolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_QueueOrderPolicy,
-      1,
-      Messaging::QueueOrderPolicy::_duplicate (_tao_elem),
-      Messaging::QueueOrderPolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::QueueOrderPolicy_ptr _tao_objptr =
+    Messaging::QueueOrderPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::QueueOrderPolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::insert (
+      _tao_any,
+      Messaging::QueueOrderPolicy::_tao_any_destructor,
       Messaging::_tc_QueueOrderPolicy,
-      1,
-      *_tao_elem,
-      Messaging::QueueOrderPolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -5740,44 +5541,195 @@ operator>>= (
     Messaging::QueueOrderPolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::QueueOrderPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_QueueOrderPolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::QueueOrderPolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::QueueOrderPolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::extract (
+        _tao_any,
+        Messaging::QueueOrderPolicy::_tao_any_destructor,
+        Messaging::_tc_QueueOrderPolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::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<Messaging::QueueOrderPolicy,Messaging::QueueOrderPolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::QueueOrderPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::QueueOrderPolicy,Messaging::QueueOrderPolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::QueueOrderPolicy, Messaging::QueueOrderPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::QueueOrderPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RebindPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RebindPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RoutingPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RoutingPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h
index 75759671303..5f8e4f0d453 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.h
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.h
@@ -19,9 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_MESSAGING_NO_IMPLC_H_
 #define _TAO_IDL_ORIG_MESSAGING_NO_IMPLC_H_
@@ -66,134 +65,148 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:45
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  Messaging
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short Priority;
   typedef CORBA::Short_out Priority_out;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Priority;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short RebindMode;
   typedef CORBA::Short_out RebindMode_out;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RebindMode;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::Short TRANSPARENT = 0;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::Short NO_REBIND = 1;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::Short NO_RECONNECT = 2;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short RoutingType;
   typedef CORBA::Short_out RoutingType_out;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RoutingType;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::Short ROUTE_NONE = 0;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::Short ROUTE_FORWARD = 1;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::Short ROUTE_STORE_AND_FORWARD = 2;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::UShort Ordering;
   typedef CORBA::UShort_out Ordering_out;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Ordering;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::UShort ORDER_ANY = 1U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::UShort ORDER_TEMPORAL = 2U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::UShort ORDER_PRIORITY = 4U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::UShort ORDER_DEADLINE = 8U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong REBIND_POLICY_TYPE = 23U;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_REBINDPOLICY___PTR_CH_)
 #define _MESSAGING_REBINDPOLICY___PTR_CH_
-
+  
   class RebindPolicy;
   typedef RebindPolicy *RebindPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REBINDPOLICY___VAR_CH_)
 #define _MESSAGING_REBINDPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export RebindPolicy_var : public TAO_Base_var
   {
   public:
     RebindPolicy_var (void); // default constructor
-    RebindPolicy_var (RebindPolicy_ptr p) : ptr_ (p) {}
+    RebindPolicy_var (RebindPolicy_ptr p) : ptr_ (p) {} 
     RebindPolicy_var (const RebindPolicy_var &); // copy constructor
     ~RebindPolicy_var (void); // destructor
-
+    
     RebindPolicy_var &operator= (RebindPolicy_ptr);
     RebindPolicy_var &operator= (const RebindPolicy_var &);
     RebindPolicy_ptr operator-> (void) const;
-
+    
     operator const RebindPolicy_ptr &() const;
     operator RebindPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     RebindPolicy_ptr in (void) const;
     RebindPolicy_ptr &inout (void);
     RebindPolicy_ptr &out (void);
     RebindPolicy_ptr _retn (void);
     RebindPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static RebindPolicy_ptr tao_duplicate (RebindPolicy_ptr);
@@ -204,7 +217,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     RebindPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -212,17 +225,14 @@ TAO_NAMESPACE  Messaging
     RebindPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REBINDPOLICY___OUT_CH_)
 #define _MESSAGING_REBINDPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export RebindPolicy_out
   {
   public:
@@ -235,21 +245,19 @@ TAO_NAMESPACE  Messaging
     operator RebindPolicy_ptr &();
     RebindPolicy_ptr &ptr (void);
     RebindPolicy_ptr operator-> (void);
-
+  
   private:
     RebindPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_REBINDPOLICY_CH_)
 #define _MESSAGING_REBINDPOLICY_CH_
-
+  
   class TAO_Messaging_Export RebindPolicy
     : public virtual CORBA::Policy
   {
@@ -257,81 +265,87 @@ TAO_NAMESPACE  Messaging
     typedef RebindPolicy_ptr _ptr_type;
     typedef RebindPolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static RebindPolicy_ptr _duplicate (RebindPolicy_ptr obj);
-
+    
     static RebindPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RebindPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RebindPolicy_ptr _nil (void)
       {
         return (RebindPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual Messaging::RebindMode rebind_mode (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     RebindPolicy (void);
     virtual ~RebindPolicy (void);
-
+    
     friend class _TAO_RebindPolicy_Remote_Proxy_Impl;
     friend class _TAO_RebindPolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_RebindPolicy_Direct_Proxy_Impl;
-
+  
   private:
     RebindPolicy (const RebindPolicy &);
     void operator= (const RebindPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RebindPolicy;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong REQUEST_PRIORITY_POLICY_TYPE = 25U;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class PriorityRange_var;
-
+  
   struct TAO_Messaging_Export PriorityRange
   {
     typedef PriorityRange_var _var_type;
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
     Messaging::Priority min;
     Messaging::Priority max;
-
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Messaging_Export PriorityRange_var
   {
   public:
@@ -341,77 +355,79 @@ TAO_NAMESPACE  Messaging
     // Fixed-size types only.
     PriorityRange_var (const PriorityRange &);
     ~PriorityRange_var (void);
-
+    
     PriorityRange_var &operator= (PriorityRange *);
     PriorityRange_var &operator= (const PriorityRange_var &);
+    
     // Fixed-size types only.
     PriorityRange_var &operator= (const PriorityRange &);
+    
     PriorityRange *operator-> (void);
     const PriorityRange *operator-> (void) const;
-
+    
     operator const PriorityRange &() const;
     operator PriorityRange &();
     operator PriorityRange &() const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const PriorityRange &in (void) const;
     PriorityRange &inout (void);
     PriorityRange &out (void);
     PriorityRange _retn (void);
     PriorityRange *ptr (void) const;
-
+  
   private:
     PriorityRange *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
+  
   typedef PriorityRange &PriorityRange_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityRange;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___PTR_CH_)
 #define _MESSAGING_REQUESTPRIORITYPOLICY___PTR_CH_
-
+  
   class RequestPriorityPolicy;
   typedef RequestPriorityPolicy *RequestPriorityPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___VAR_CH_)
 #define _MESSAGING_REQUESTPRIORITYPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export RequestPriorityPolicy_var : public TAO_Base_var
   {
   public:
     RequestPriorityPolicy_var (void); // default constructor
-    RequestPriorityPolicy_var (RequestPriorityPolicy_ptr p) : ptr_ (p) {}
+    RequestPriorityPolicy_var (RequestPriorityPolicy_ptr p) : ptr_ (p) {} 
     RequestPriorityPolicy_var (const RequestPriorityPolicy_var &); // copy constructor
     ~RequestPriorityPolicy_var (void); // destructor
-
+    
     RequestPriorityPolicy_var &operator= (RequestPriorityPolicy_ptr);
     RequestPriorityPolicy_var &operator= (const RequestPriorityPolicy_var &);
     RequestPriorityPolicy_ptr operator-> (void) const;
-
+    
     operator const RequestPriorityPolicy_ptr &() const;
     operator RequestPriorityPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     RequestPriorityPolicy_ptr in (void) const;
     RequestPriorityPolicy_ptr &inout (void);
     RequestPriorityPolicy_ptr &out (void);
     RequestPriorityPolicy_ptr _retn (void);
     RequestPriorityPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static RequestPriorityPolicy_ptr tao_duplicate (RequestPriorityPolicy_ptr);
@@ -422,7 +438,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     RequestPriorityPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -430,17 +446,14 @@ TAO_NAMESPACE  Messaging
     RequestPriorityPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___OUT_CH_)
 #define _MESSAGING_REQUESTPRIORITYPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export RequestPriorityPolicy_out
   {
   public:
@@ -453,21 +466,19 @@ TAO_NAMESPACE  Messaging
     operator RequestPriorityPolicy_ptr &();
     RequestPriorityPolicy_ptr &ptr (void);
     RequestPriorityPolicy_ptr operator-> (void);
-
+  
   private:
     RequestPriorityPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_REQUESTPRIORITYPOLICY_CH_)
 #define _MESSAGING_REQUESTPRIORITYPOLICY_CH_
-
+  
   class TAO_Messaging_Export RequestPriorityPolicy
     : public virtual CORBA::Policy
   {
@@ -475,110 +486,108 @@ TAO_NAMESPACE  Messaging
     typedef RequestPriorityPolicy_ptr _ptr_type;
     typedef RequestPriorityPolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static RequestPriorityPolicy_ptr _duplicate (RequestPriorityPolicy_ptr obj);
-
+    
     static RequestPriorityPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestPriorityPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestPriorityPolicy_ptr _nil (void)
       {
         return (RequestPriorityPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::Messaging::PriorityRange priority_range (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     RequestPriorityPolicy (void);
     virtual ~RequestPriorityPolicy (void);
-
+    
     friend class _TAO_RequestPriorityPolicy_Remote_Proxy_Impl;
     friend class _TAO_RequestPriorityPolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_RequestPriorityPolicy_Direct_Proxy_Impl;
-
+  
   private:
     RequestPriorityPolicy (const RequestPriorityPolicy &);
     void operator= (const RequestPriorityPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestPriorityPolicy;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong REPLY_PRIORITY_POLICY_TYPE = 26U;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_REPLYPRIORITYPOLICY___PTR_CH_)
 #define _MESSAGING_REPLYPRIORITYPOLICY___PTR_CH_
-
+  
   class ReplyPriorityPolicy;
   typedef ReplyPriorityPolicy *ReplyPriorityPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REPLYPRIORITYPOLICY___VAR_CH_)
 #define _MESSAGING_REPLYPRIORITYPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export ReplyPriorityPolicy_var : public TAO_Base_var
   {
   public:
     ReplyPriorityPolicy_var (void); // default constructor
-    ReplyPriorityPolicy_var (ReplyPriorityPolicy_ptr p) : ptr_ (p) {}
+    ReplyPriorityPolicy_var (ReplyPriorityPolicy_ptr p) : ptr_ (p) {} 
     ReplyPriorityPolicy_var (const ReplyPriorityPolicy_var &); // copy constructor
     ~ReplyPriorityPolicy_var (void); // destructor
-
+    
     ReplyPriorityPolicy_var &operator= (ReplyPriorityPolicy_ptr);
     ReplyPriorityPolicy_var &operator= (const ReplyPriorityPolicy_var &);
     ReplyPriorityPolicy_ptr operator-> (void) const;
-
+    
     operator const ReplyPriorityPolicy_ptr &() const;
     operator ReplyPriorityPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ReplyPriorityPolicy_ptr in (void) const;
     ReplyPriorityPolicy_ptr &inout (void);
     ReplyPriorityPolicy_ptr &out (void);
     ReplyPriorityPolicy_ptr _retn (void);
     ReplyPriorityPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ReplyPriorityPolicy_ptr tao_duplicate (ReplyPriorityPolicy_ptr);
@@ -589,7 +598,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ReplyPriorityPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -597,17 +606,14 @@ TAO_NAMESPACE  Messaging
     ReplyPriorityPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REPLYPRIORITYPOLICY___OUT_CH_)
 #define _MESSAGING_REPLYPRIORITYPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export ReplyPriorityPolicy_out
   {
   public:
@@ -620,21 +626,19 @@ TAO_NAMESPACE  Messaging
     operator ReplyPriorityPolicy_ptr &();
     ReplyPriorityPolicy_ptr &ptr (void);
     ReplyPriorityPolicy_ptr operator-> (void);
-
+  
   private:
     ReplyPriorityPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_REPLYPRIORITYPOLICY_CH_)
 #define _MESSAGING_REPLYPRIORITYPOLICY_CH_
-
+  
   class TAO_Messaging_Export ReplyPriorityPolicy
     : public virtual CORBA::Policy
   {
@@ -642,110 +646,108 @@ TAO_NAMESPACE  Messaging
     typedef ReplyPriorityPolicy_ptr _ptr_type;
     typedef ReplyPriorityPolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static ReplyPriorityPolicy_ptr _duplicate (ReplyPriorityPolicy_ptr obj);
-
+    
     static ReplyPriorityPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ReplyPriorityPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ReplyPriorityPolicy_ptr _nil (void)
       {
         return (ReplyPriorityPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::Messaging::PriorityRange priority_range (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ReplyPriorityPolicy (void);
     virtual ~ReplyPriorityPolicy (void);
-
+    
     friend class _TAO_ReplyPriorityPolicy_Remote_Proxy_Impl;
     friend class _TAO_ReplyPriorityPolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_ReplyPriorityPolicy_Direct_Proxy_Impl;
-
+  
   private:
     ReplyPriorityPolicy (const ReplyPriorityPolicy &);
     void operator= (const ReplyPriorityPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyPriorityPolicy;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong REQUEST_START_TIME_POLICY_TYPE = 27U;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___PTR_CH_)
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY___PTR_CH_
-
+  
   class RequestStartTimePolicy;
   typedef RequestStartTimePolicy *RequestStartTimePolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___VAR_CH_)
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export RequestStartTimePolicy_var : public TAO_Base_var
   {
   public:
     RequestStartTimePolicy_var (void); // default constructor
-    RequestStartTimePolicy_var (RequestStartTimePolicy_ptr p) : ptr_ (p) {}
+    RequestStartTimePolicy_var (RequestStartTimePolicy_ptr p) : ptr_ (p) {} 
     RequestStartTimePolicy_var (const RequestStartTimePolicy_var &); // copy constructor
     ~RequestStartTimePolicy_var (void); // destructor
-
+    
     RequestStartTimePolicy_var &operator= (RequestStartTimePolicy_ptr);
     RequestStartTimePolicy_var &operator= (const RequestStartTimePolicy_var &);
     RequestStartTimePolicy_ptr operator-> (void) const;
-
+    
     operator const RequestStartTimePolicy_ptr &() const;
     operator RequestStartTimePolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     RequestStartTimePolicy_ptr in (void) const;
     RequestStartTimePolicy_ptr &inout (void);
     RequestStartTimePolicy_ptr &out (void);
     RequestStartTimePolicy_ptr _retn (void);
     RequestStartTimePolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static RequestStartTimePolicy_ptr tao_duplicate (RequestStartTimePolicy_ptr);
@@ -756,7 +758,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     RequestStartTimePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -764,17 +766,14 @@ TAO_NAMESPACE  Messaging
     RequestStartTimePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___OUT_CH_)
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export RequestStartTimePolicy_out
   {
   public:
@@ -787,21 +786,19 @@ TAO_NAMESPACE  Messaging
     operator RequestStartTimePolicy_ptr &();
     RequestStartTimePolicy_ptr &ptr (void);
     RequestStartTimePolicy_ptr operator-> (void);
-
+  
   private:
     RequestStartTimePolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY_CH_)
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY_CH_
-
+  
   class TAO_Messaging_Export RequestStartTimePolicy
     : public virtual CORBA::Policy
   {
@@ -809,110 +806,108 @@ TAO_NAMESPACE  Messaging
     typedef RequestStartTimePolicy_ptr _ptr_type;
     typedef RequestStartTimePolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static RequestStartTimePolicy_ptr _duplicate (RequestStartTimePolicy_ptr obj);
-
+    
     static RequestStartTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestStartTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestStartTimePolicy_ptr _nil (void)
       {
         return (RequestStartTimePolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::TimeBase::UtcT start_time (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     RequestStartTimePolicy (void);
     virtual ~RequestStartTimePolicy (void);
-
+    
     friend class _TAO_RequestStartTimePolicy_Remote_Proxy_Impl;
     friend class _TAO_RequestStartTimePolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_RequestStartTimePolicy_Direct_Proxy_Impl;
-
+  
   private:
     RequestStartTimePolicy (const RequestStartTimePolicy &);
     void operator= (const RequestStartTimePolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestStartTimePolicy;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong REQUEST_END_TIME_POLICY_TYPE = 28U;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___PTR_CH_)
 #define _MESSAGING_REQUESTENDTIMEPOLICY___PTR_CH_
-
+  
   class RequestEndTimePolicy;
   typedef RequestEndTimePolicy *RequestEndTimePolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___VAR_CH_)
 #define _MESSAGING_REQUESTENDTIMEPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export RequestEndTimePolicy_var : public TAO_Base_var
   {
   public:
     RequestEndTimePolicy_var (void); // default constructor
-    RequestEndTimePolicy_var (RequestEndTimePolicy_ptr p) : ptr_ (p) {}
+    RequestEndTimePolicy_var (RequestEndTimePolicy_ptr p) : ptr_ (p) {} 
     RequestEndTimePolicy_var (const RequestEndTimePolicy_var &); // copy constructor
     ~RequestEndTimePolicy_var (void); // destructor
-
+    
     RequestEndTimePolicy_var &operator= (RequestEndTimePolicy_ptr);
     RequestEndTimePolicy_var &operator= (const RequestEndTimePolicy_var &);
     RequestEndTimePolicy_ptr operator-> (void) const;
-
+    
     operator const RequestEndTimePolicy_ptr &() const;
     operator RequestEndTimePolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     RequestEndTimePolicy_ptr in (void) const;
     RequestEndTimePolicy_ptr &inout (void);
     RequestEndTimePolicy_ptr &out (void);
     RequestEndTimePolicy_ptr _retn (void);
     RequestEndTimePolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static RequestEndTimePolicy_ptr tao_duplicate (RequestEndTimePolicy_ptr);
@@ -923,7 +918,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     RequestEndTimePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -931,17 +926,14 @@ TAO_NAMESPACE  Messaging
     RequestEndTimePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___OUT_CH_)
 #define _MESSAGING_REQUESTENDTIMEPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export RequestEndTimePolicy_out
   {
   public:
@@ -954,21 +946,19 @@ TAO_NAMESPACE  Messaging
     operator RequestEndTimePolicy_ptr &();
     RequestEndTimePolicy_ptr &ptr (void);
     RequestEndTimePolicy_ptr operator-> (void);
-
+  
   private:
     RequestEndTimePolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY_CH_)
 #define _MESSAGING_REQUESTENDTIMEPOLICY_CH_
-
+  
   class TAO_Messaging_Export RequestEndTimePolicy
     : public virtual CORBA::Policy
   {
@@ -976,110 +966,108 @@ TAO_NAMESPACE  Messaging
     typedef RequestEndTimePolicy_ptr _ptr_type;
     typedef RequestEndTimePolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static RequestEndTimePolicy_ptr _duplicate (RequestEndTimePolicy_ptr obj);
-
+    
     static RequestEndTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestEndTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestEndTimePolicy_ptr _nil (void)
       {
         return (RequestEndTimePolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::TimeBase::UtcT end_time (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     RequestEndTimePolicy (void);
     virtual ~RequestEndTimePolicy (void);
-
+    
     friend class _TAO_RequestEndTimePolicy_Remote_Proxy_Impl;
     friend class _TAO_RequestEndTimePolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_RequestEndTimePolicy_Direct_Proxy_Impl;
-
+  
   private:
     RequestEndTimePolicy (const RequestEndTimePolicy &);
     void operator= (const RequestEndTimePolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestEndTimePolicy;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong REPLY_START_TIME_POLICY_TYPE = 29U;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___PTR_CH_)
 #define _MESSAGING_REPLYSTARTTIMEPOLICY___PTR_CH_
-
+  
   class ReplyStartTimePolicy;
   typedef ReplyStartTimePolicy *ReplyStartTimePolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___VAR_CH_)
 #define _MESSAGING_REPLYSTARTTIMEPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export ReplyStartTimePolicy_var : public TAO_Base_var
   {
   public:
     ReplyStartTimePolicy_var (void); // default constructor
-    ReplyStartTimePolicy_var (ReplyStartTimePolicy_ptr p) : ptr_ (p) {}
+    ReplyStartTimePolicy_var (ReplyStartTimePolicy_ptr p) : ptr_ (p) {} 
     ReplyStartTimePolicy_var (const ReplyStartTimePolicy_var &); // copy constructor
     ~ReplyStartTimePolicy_var (void); // destructor
-
+    
     ReplyStartTimePolicy_var &operator= (ReplyStartTimePolicy_ptr);
     ReplyStartTimePolicy_var &operator= (const ReplyStartTimePolicy_var &);
     ReplyStartTimePolicy_ptr operator-> (void) const;
-
+    
     operator const ReplyStartTimePolicy_ptr &() const;
     operator ReplyStartTimePolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ReplyStartTimePolicy_ptr in (void) const;
     ReplyStartTimePolicy_ptr &inout (void);
     ReplyStartTimePolicy_ptr &out (void);
     ReplyStartTimePolicy_ptr _retn (void);
     ReplyStartTimePolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ReplyStartTimePolicy_ptr tao_duplicate (ReplyStartTimePolicy_ptr);
@@ -1090,7 +1078,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ReplyStartTimePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1098,17 +1086,14 @@ TAO_NAMESPACE  Messaging
     ReplyStartTimePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___OUT_CH_)
 #define _MESSAGING_REPLYSTARTTIMEPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export ReplyStartTimePolicy_out
   {
   public:
@@ -1121,21 +1106,19 @@ TAO_NAMESPACE  Messaging
     operator ReplyStartTimePolicy_ptr &();
     ReplyStartTimePolicy_ptr &ptr (void);
     ReplyStartTimePolicy_ptr operator-> (void);
-
+  
   private:
     ReplyStartTimePolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY_CH_)
 #define _MESSAGING_REPLYSTARTTIMEPOLICY_CH_
-
+  
   class TAO_Messaging_Export ReplyStartTimePolicy
     : public virtual CORBA::Policy
   {
@@ -1143,110 +1126,108 @@ TAO_NAMESPACE  Messaging
     typedef ReplyStartTimePolicy_ptr _ptr_type;
     typedef ReplyStartTimePolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static ReplyStartTimePolicy_ptr _duplicate (ReplyStartTimePolicy_ptr obj);
-
+    
     static ReplyStartTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ReplyStartTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ReplyStartTimePolicy_ptr _nil (void)
       {
         return (ReplyStartTimePolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::TimeBase::UtcT start_time (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ReplyStartTimePolicy (void);
     virtual ~ReplyStartTimePolicy (void);
-
+    
     friend class _TAO_ReplyStartTimePolicy_Remote_Proxy_Impl;
     friend class _TAO_ReplyStartTimePolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_ReplyStartTimePolicy_Direct_Proxy_Impl;
-
+  
   private:
     ReplyStartTimePolicy (const ReplyStartTimePolicy &);
     void operator= (const ReplyStartTimePolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyStartTimePolicy;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong REPLY_END_TIME_POLICY_TYPE = 30U;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_REPLYENDTIMEPOLICY___PTR_CH_)
 #define _MESSAGING_REPLYENDTIMEPOLICY___PTR_CH_
-
+  
   class ReplyEndTimePolicy;
   typedef ReplyEndTimePolicy *ReplyEndTimePolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REPLYENDTIMEPOLICY___VAR_CH_)
 #define _MESSAGING_REPLYENDTIMEPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export ReplyEndTimePolicy_var : public TAO_Base_var
   {
   public:
     ReplyEndTimePolicy_var (void); // default constructor
-    ReplyEndTimePolicy_var (ReplyEndTimePolicy_ptr p) : ptr_ (p) {}
+    ReplyEndTimePolicy_var (ReplyEndTimePolicy_ptr p) : ptr_ (p) {} 
     ReplyEndTimePolicy_var (const ReplyEndTimePolicy_var &); // copy constructor
     ~ReplyEndTimePolicy_var (void); // destructor
-
+    
     ReplyEndTimePolicy_var &operator= (ReplyEndTimePolicy_ptr);
     ReplyEndTimePolicy_var &operator= (const ReplyEndTimePolicy_var &);
     ReplyEndTimePolicy_ptr operator-> (void) const;
-
+    
     operator const ReplyEndTimePolicy_ptr &() const;
     operator ReplyEndTimePolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ReplyEndTimePolicy_ptr in (void) const;
     ReplyEndTimePolicy_ptr &inout (void);
     ReplyEndTimePolicy_ptr &out (void);
     ReplyEndTimePolicy_ptr _retn (void);
     ReplyEndTimePolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ReplyEndTimePolicy_ptr tao_duplicate (ReplyEndTimePolicy_ptr);
@@ -1257,7 +1238,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ReplyEndTimePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1265,17 +1246,14 @@ TAO_NAMESPACE  Messaging
     ReplyEndTimePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_REPLYENDTIMEPOLICY___OUT_CH_)
 #define _MESSAGING_REPLYENDTIMEPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export ReplyEndTimePolicy_out
   {
   public:
@@ -1288,21 +1266,19 @@ TAO_NAMESPACE  Messaging
     operator ReplyEndTimePolicy_ptr &();
     ReplyEndTimePolicy_ptr &ptr (void);
     ReplyEndTimePolicy_ptr operator-> (void);
-
+  
   private:
     ReplyEndTimePolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_REPLYENDTIMEPOLICY_CH_)
 #define _MESSAGING_REPLYENDTIMEPOLICY_CH_
-
+  
   class TAO_Messaging_Export ReplyEndTimePolicy
     : public virtual CORBA::Policy
   {
@@ -1310,110 +1286,108 @@ TAO_NAMESPACE  Messaging
     typedef ReplyEndTimePolicy_ptr _ptr_type;
     typedef ReplyEndTimePolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static ReplyEndTimePolicy_ptr _duplicate (ReplyEndTimePolicy_ptr obj);
-
+    
     static ReplyEndTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ReplyEndTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ReplyEndTimePolicy_ptr _nil (void)
       {
         return (ReplyEndTimePolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::TimeBase::UtcT end_time (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ReplyEndTimePolicy (void);
     virtual ~ReplyEndTimePolicy (void);
-
+    
     friend class _TAO_ReplyEndTimePolicy_Remote_Proxy_Impl;
     friend class _TAO_ReplyEndTimePolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_ReplyEndTimePolicy_Direct_Proxy_Impl;
-
+  
   private:
     ReplyEndTimePolicy (const ReplyEndTimePolicy &);
     void operator= (const ReplyEndTimePolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyEndTimePolicy;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong RELATIVE_REQ_TIMEOUT_POLICY_TYPE = 31U;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___PTR_CH_)
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___PTR_CH_
-
+  
   class RelativeRequestTimeoutPolicy;
   typedef RelativeRequestTimeoutPolicy *RelativeRequestTimeoutPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___VAR_CH_)
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export RelativeRequestTimeoutPolicy_var : public TAO_Base_var
   {
   public:
     RelativeRequestTimeoutPolicy_var (void); // default constructor
-    RelativeRequestTimeoutPolicy_var (RelativeRequestTimeoutPolicy_ptr p) : ptr_ (p) {}
+    RelativeRequestTimeoutPolicy_var (RelativeRequestTimeoutPolicy_ptr p) : ptr_ (p) {} 
     RelativeRequestTimeoutPolicy_var (const RelativeRequestTimeoutPolicy_var &); // copy constructor
     ~RelativeRequestTimeoutPolicy_var (void); // destructor
-
+    
     RelativeRequestTimeoutPolicy_var &operator= (RelativeRequestTimeoutPolicy_ptr);
     RelativeRequestTimeoutPolicy_var &operator= (const RelativeRequestTimeoutPolicy_var &);
     RelativeRequestTimeoutPolicy_ptr operator-> (void) const;
-
+    
     operator const RelativeRequestTimeoutPolicy_ptr &() const;
     operator RelativeRequestTimeoutPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     RelativeRequestTimeoutPolicy_ptr in (void) const;
     RelativeRequestTimeoutPolicy_ptr &inout (void);
     RelativeRequestTimeoutPolicy_ptr &out (void);
     RelativeRequestTimeoutPolicy_ptr _retn (void);
     RelativeRequestTimeoutPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static RelativeRequestTimeoutPolicy_ptr tao_duplicate (RelativeRequestTimeoutPolicy_ptr);
@@ -1424,7 +1398,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     RelativeRequestTimeoutPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1432,17 +1406,14 @@ TAO_NAMESPACE  Messaging
     RelativeRequestTimeoutPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___OUT_CH_)
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export RelativeRequestTimeoutPolicy_out
   {
   public:
@@ -1455,21 +1426,19 @@ TAO_NAMESPACE  Messaging
     operator RelativeRequestTimeoutPolicy_ptr &();
     RelativeRequestTimeoutPolicy_ptr &ptr (void);
     RelativeRequestTimeoutPolicy_ptr operator-> (void);
-
+  
   private:
     RelativeRequestTimeoutPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_)
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_
-
+  
   class TAO_Messaging_Export RelativeRequestTimeoutPolicy
     : public virtual CORBA::Policy
   {
@@ -1477,81 +1446,87 @@ TAO_NAMESPACE  Messaging
     typedef RelativeRequestTimeoutPolicy_ptr _ptr_type;
     typedef RelativeRequestTimeoutPolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static RelativeRequestTimeoutPolicy_ptr _duplicate (RelativeRequestTimeoutPolicy_ptr obj);
-
+    
     static RelativeRequestTimeoutPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RelativeRequestTimeoutPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RelativeRequestTimeoutPolicy_ptr _nil (void)
       {
         return (RelativeRequestTimeoutPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual TimeBase::TimeT relative_expiry (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     RelativeRequestTimeoutPolicy (void);
     virtual ~RelativeRequestTimeoutPolicy (void);
-
+    
     friend class _TAO_RelativeRequestTimeoutPolicy_Remote_Proxy_Impl;
     friend class _TAO_RelativeRequestTimeoutPolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_RelativeRequestTimeoutPolicy_Direct_Proxy_Impl;
-
+  
   private:
     RelativeRequestTimeoutPolicy (const RelativeRequestTimeoutPolicy &);
     void operator= (const RelativeRequestTimeoutPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RelativeRequestTimeoutPolicy;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong ROUTING_POLICY_TYPE = 33U;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class RoutingTypeRange_var;
-
+  
   struct TAO_Messaging_Export RoutingTypeRange
   {
     typedef RoutingTypeRange_var _var_type;
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
     Messaging::RoutingType min;
     Messaging::RoutingType max;
-
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Messaging_Export RoutingTypeRange_var
   {
   public:
@@ -1561,77 +1536,79 @@ TAO_NAMESPACE  Messaging
     // Fixed-size types only.
     RoutingTypeRange_var (const RoutingTypeRange &);
     ~RoutingTypeRange_var (void);
-
+    
     RoutingTypeRange_var &operator= (RoutingTypeRange *);
     RoutingTypeRange_var &operator= (const RoutingTypeRange_var &);
+    
     // Fixed-size types only.
     RoutingTypeRange_var &operator= (const RoutingTypeRange &);
+    
     RoutingTypeRange *operator-> (void);
     const RoutingTypeRange *operator-> (void) const;
-
+    
     operator const RoutingTypeRange &() const;
     operator RoutingTypeRange &();
     operator RoutingTypeRange &() const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const RoutingTypeRange &in (void) const;
     RoutingTypeRange &inout (void);
     RoutingTypeRange &out (void);
     RoutingTypeRange _retn (void);
     RoutingTypeRange *ptr (void) const;
-
+  
   private:
     RoutingTypeRange *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
+  
   typedef RoutingTypeRange &RoutingTypeRange_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RoutingTypeRange;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_ROUTINGPOLICY___PTR_CH_)
 #define _MESSAGING_ROUTINGPOLICY___PTR_CH_
-
+  
   class RoutingPolicy;
   typedef RoutingPolicy *RoutingPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_ROUTINGPOLICY___VAR_CH_)
 #define _MESSAGING_ROUTINGPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export RoutingPolicy_var : public TAO_Base_var
   {
   public:
     RoutingPolicy_var (void); // default constructor
-    RoutingPolicy_var (RoutingPolicy_ptr p) : ptr_ (p) {}
+    RoutingPolicy_var (RoutingPolicy_ptr p) : ptr_ (p) {} 
     RoutingPolicy_var (const RoutingPolicy_var &); // copy constructor
     ~RoutingPolicy_var (void); // destructor
-
+    
     RoutingPolicy_var &operator= (RoutingPolicy_ptr);
     RoutingPolicy_var &operator= (const RoutingPolicy_var &);
     RoutingPolicy_ptr operator-> (void) const;
-
+    
     operator const RoutingPolicy_ptr &() const;
     operator RoutingPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     RoutingPolicy_ptr in (void) const;
     RoutingPolicy_ptr &inout (void);
     RoutingPolicy_ptr &out (void);
     RoutingPolicy_ptr _retn (void);
     RoutingPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static RoutingPolicy_ptr tao_duplicate (RoutingPolicy_ptr);
@@ -1642,7 +1619,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     RoutingPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1650,17 +1627,14 @@ TAO_NAMESPACE  Messaging
     RoutingPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_ROUTINGPOLICY___OUT_CH_)
 #define _MESSAGING_ROUTINGPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export RoutingPolicy_out
   {
   public:
@@ -1673,21 +1647,19 @@ TAO_NAMESPACE  Messaging
     operator RoutingPolicy_ptr &();
     RoutingPolicy_ptr &ptr (void);
     RoutingPolicy_ptr operator-> (void);
-
+  
   private:
     RoutingPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_ROUTINGPOLICY_CH_)
 #define _MESSAGING_ROUTINGPOLICY_CH_
-
+  
   class TAO_Messaging_Export RoutingPolicy
     : public virtual CORBA::Policy
   {
@@ -1695,110 +1667,108 @@ TAO_NAMESPACE  Messaging
     typedef RoutingPolicy_ptr _ptr_type;
     typedef RoutingPolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static RoutingPolicy_ptr _duplicate (RoutingPolicy_ptr obj);
-
+    
     static RoutingPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RoutingPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RoutingPolicy_ptr _nil (void)
       {
         return (RoutingPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::Messaging::RoutingTypeRange routing_range (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     RoutingPolicy (void);
     virtual ~RoutingPolicy (void);
-
+    
     friend class _TAO_RoutingPolicy_Remote_Proxy_Impl;
     friend class _TAO_RoutingPolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_RoutingPolicy_Direct_Proxy_Impl;
-
+  
   private:
     RoutingPolicy (const RoutingPolicy &);
     void operator= (const RoutingPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RoutingPolicy;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong MAX_HOPS_POLICY_TYPE = 34U;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_MAXHOPSPOLICY___PTR_CH_)
 #define _MESSAGING_MAXHOPSPOLICY___PTR_CH_
-
+  
   class MaxHopsPolicy;
   typedef MaxHopsPolicy *MaxHopsPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_MAXHOPSPOLICY___VAR_CH_)
 #define _MESSAGING_MAXHOPSPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export MaxHopsPolicy_var : public TAO_Base_var
   {
   public:
     MaxHopsPolicy_var (void); // default constructor
-    MaxHopsPolicy_var (MaxHopsPolicy_ptr p) : ptr_ (p) {}
+    MaxHopsPolicy_var (MaxHopsPolicy_ptr p) : ptr_ (p) {} 
     MaxHopsPolicy_var (const MaxHopsPolicy_var &); // copy constructor
     ~MaxHopsPolicy_var (void); // destructor
-
+    
     MaxHopsPolicy_var &operator= (MaxHopsPolicy_ptr);
     MaxHopsPolicy_var &operator= (const MaxHopsPolicy_var &);
     MaxHopsPolicy_ptr operator-> (void) const;
-
+    
     operator const MaxHopsPolicy_ptr &() const;
     operator MaxHopsPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     MaxHopsPolicy_ptr in (void) const;
     MaxHopsPolicy_ptr &inout (void);
     MaxHopsPolicy_ptr &out (void);
     MaxHopsPolicy_ptr _retn (void);
     MaxHopsPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static MaxHopsPolicy_ptr tao_duplicate (MaxHopsPolicy_ptr);
@@ -1809,7 +1779,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     MaxHopsPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1817,17 +1787,14 @@ TAO_NAMESPACE  Messaging
     MaxHopsPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_MAXHOPSPOLICY___OUT_CH_)
 #define _MESSAGING_MAXHOPSPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export MaxHopsPolicy_out
   {
   public:
@@ -1840,21 +1807,19 @@ TAO_NAMESPACE  Messaging
     operator MaxHopsPolicy_ptr &();
     MaxHopsPolicy_ptr &ptr (void);
     MaxHopsPolicy_ptr operator-> (void);
-
+  
   private:
     MaxHopsPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_MAXHOPSPOLICY_CH_)
 #define _MESSAGING_MAXHOPSPOLICY_CH_
-
+  
   class TAO_Messaging_Export MaxHopsPolicy
     : public virtual CORBA::Policy
   {
@@ -1862,110 +1827,108 @@ TAO_NAMESPACE  Messaging
     typedef MaxHopsPolicy_ptr _ptr_type;
     typedef MaxHopsPolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static MaxHopsPolicy_ptr _duplicate (MaxHopsPolicy_ptr obj);
-
+    
     static MaxHopsPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static MaxHopsPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static MaxHopsPolicy_ptr _nil (void)
       {
         return (MaxHopsPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::UShort max_hops (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     MaxHopsPolicy (void);
     virtual ~MaxHopsPolicy (void);
-
+    
     friend class _TAO_MaxHopsPolicy_Remote_Proxy_Impl;
     friend class _TAO_MaxHopsPolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_MaxHopsPolicy_Direct_Proxy_Impl;
-
+  
   private:
     MaxHopsPolicy (const MaxHopsPolicy &);
     void operator= (const MaxHopsPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MaxHopsPolicy;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong QUEUE_ORDER_POLICY_TYPE = 35U;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_QUEUEORDERPOLICY___PTR_CH_)
 #define _MESSAGING_QUEUEORDERPOLICY___PTR_CH_
-
+  
   class QueueOrderPolicy;
   typedef QueueOrderPolicy *QueueOrderPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_QUEUEORDERPOLICY___VAR_CH_)
 #define _MESSAGING_QUEUEORDERPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export QueueOrderPolicy_var : public TAO_Base_var
   {
   public:
     QueueOrderPolicy_var (void); // default constructor
-    QueueOrderPolicy_var (QueueOrderPolicy_ptr p) : ptr_ (p) {}
+    QueueOrderPolicy_var (QueueOrderPolicy_ptr p) : ptr_ (p) {} 
     QueueOrderPolicy_var (const QueueOrderPolicy_var &); // copy constructor
     ~QueueOrderPolicy_var (void); // destructor
-
+    
     QueueOrderPolicy_var &operator= (QueueOrderPolicy_ptr);
     QueueOrderPolicy_var &operator= (const QueueOrderPolicy_var &);
     QueueOrderPolicy_ptr operator-> (void) const;
-
+    
     operator const QueueOrderPolicy_ptr &() const;
     operator QueueOrderPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     QueueOrderPolicy_ptr in (void) const;
     QueueOrderPolicy_ptr &inout (void);
     QueueOrderPolicy_ptr &out (void);
     QueueOrderPolicy_ptr _retn (void);
     QueueOrderPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static QueueOrderPolicy_ptr tao_duplicate (QueueOrderPolicy_ptr);
@@ -1976,7 +1939,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     QueueOrderPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1984,17 +1947,14 @@ TAO_NAMESPACE  Messaging
     QueueOrderPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_QUEUEORDERPOLICY___OUT_CH_)
 #define _MESSAGING_QUEUEORDERPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export QueueOrderPolicy_out
   {
   public:
@@ -2007,21 +1967,19 @@ TAO_NAMESPACE  Messaging
     operator QueueOrderPolicy_ptr &();
     QueueOrderPolicy_ptr &ptr (void);
     QueueOrderPolicy_ptr operator-> (void);
-
+  
   private:
     QueueOrderPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_QUEUEORDERPOLICY_CH_)
 #define _MESSAGING_QUEUEORDERPOLICY_CH_
-
+  
   class TAO_Messaging_Export QueueOrderPolicy
     : public virtual CORBA::Policy
   {
@@ -2029,179 +1987,188 @@ TAO_NAMESPACE  Messaging
     typedef QueueOrderPolicy_ptr _ptr_type;
     typedef QueueOrderPolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static QueueOrderPolicy_ptr _duplicate (QueueOrderPolicy_ptr obj);
-
+    
     static QueueOrderPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static QueueOrderPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static QueueOrderPolicy_ptr _nil (void)
       {
         return (QueueOrderPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual Messaging::Ordering allowed_orders (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     QueueOrderPolicy (void);
     virtual ~QueueOrderPolicy (void);
-
+    
     friend class _TAO_QueueOrderPolicy_Remote_Proxy_Impl;
     friend class _TAO_QueueOrderPolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_QueueOrderPolicy_Direct_Proxy_Impl;
-
+  
   private:
     QueueOrderPolicy (const QueueOrderPolicy &);
     void operator= (const QueueOrderPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_QueueOrderPolicy;
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module Messaging
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::RebindPolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RebindPolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RebindPolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RebindPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Messaging_Export void operator<<= (CORBA::Any &, const Messaging::PriorityRange &); // copying version
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::PriorityRange*); // noncopying version
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PriorityRange *&); // deprecated
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PriorityRange *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::RequestPriorityPolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RequestPriorityPolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RequestPriorityPolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RequestPriorityPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::ReplyPriorityPolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyPriorityPolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyPriorityPolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyPriorityPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::RequestStartTimePolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RequestStartTimePolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RequestStartTimePolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RequestStartTimePolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::RequestEndTimePolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RequestEndTimePolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RequestEndTimePolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RequestEndTimePolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::ReplyStartTimePolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyStartTimePolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyStartTimePolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyStartTimePolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::ReplyEndTimePolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyEndTimePolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyEndTimePolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyEndTimePolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::RelativeRequestTimeoutPolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RelativeRequestTimeoutPolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RelativeRequestTimeoutPolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RelativeRequestTimeoutPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Messaging_Export void operator<<= (CORBA::Any &, const Messaging::RoutingTypeRange &); // copying version
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RoutingTypeRange*); // noncopying version
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RoutingTypeRange *&); // deprecated
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::RoutingTypeRange *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::RoutingPolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RoutingPolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RoutingPolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RoutingPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::MaxHopsPolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::MaxHopsPolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::MaxHopsPolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::MaxHopsPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::QueueOrderPolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::QueueOrderPolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::QueueOrderPolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::QueueOrderPolicy_ptr &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PriorityRange &);
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PriorityRange &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RoutingTypeRange &);
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RoutingTypeRange &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1002
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_No_ImplC.i"
@@ -2217,3 +2184,4 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Routi
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.i b/TAO/tao/Messaging/Messaging_No_ImplC.i
index e1b206a0035..590f50984a5 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.i
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.i
@@ -19,21 +19,31 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_REBINDPOLICY___CI_)
 #define _MESSAGING_REBINDPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::RebindPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class Messaging::PriorityRange_var
 // *************************************************************
 
 ACE_INLINE
-Messaging::PriorityRange_var::PriorityRange_var (void) // default constructor
+Messaging::PriorityRange_var::PriorityRange_var (void)
   : ptr_ (0)
 {}
 
@@ -43,15 +53,19 @@ Messaging::PriorityRange_var::PriorityRange_var (PriorityRange *p)
 {}
 
 ACE_INLINE
-Messaging::PriorityRange_var::PriorityRange_var (const ::Messaging::PriorityRange_var &p) // copy constructor
+Messaging::PriorityRange_var::PriorityRange_var (const ::Messaging::PriorityRange_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::Messaging::PriorityRange (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::Messaging::PriorityRange (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size types only
+// Fixed-size types only.
 ACE_INLINE
 Messaging::PriorityRange_var::PriorityRange_var (const ::Messaging::PriorityRange &p)
 {
@@ -59,12 +73,13 @@ Messaging::PriorityRange_var::PriorityRange_var (const ::Messaging::PriorityRang
 }
 
 ACE_INLINE
-Messaging::PriorityRange_var::~PriorityRange_var (void) // destructor
+Messaging::PriorityRange_var::~PriorityRange_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE Messaging::PriorityRange_var &
+ACE_INLINE
+Messaging::PriorityRange_var &
 Messaging::PriorityRange_var::operator= (PriorityRange *_tao_struct_var)
 {
   delete this->ptr_;
@@ -72,7 +87,8 @@ Messaging::PriorityRange_var::operator= (PriorityRange *_tao_struct_var)
   return *this;
 }
 
-ACE_INLINE ::Messaging::PriorityRange_var &
+ACE_INLINE
+::Messaging::PriorityRange_var &
 Messaging::PriorityRange_var::operator= (const ::Messaging::PriorityRange_var &_tao_struct_var)
 {
   if (this != &_tao_struct_var)
@@ -183,74 +199,119 @@ Messaging::PriorityRange_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___CI_)
 #define _MESSAGING_REQUESTPRIORITYPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::RequestPriorityPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_REPLYPRIORITYPOLICY___CI_)
 #define _MESSAGING_REPLYPRIORITYPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::ReplyPriorityPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___CI_)
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::RequestStartTimePolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___CI_)
 #define _MESSAGING_REQUESTENDTIMEPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::RequestEndTimePolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___CI_)
 #define _MESSAGING_REPLYSTARTTIMEPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::ReplyStartTimePolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_REPLYENDTIMEPOLICY___CI_)
 #define _MESSAGING_REPLYENDTIMEPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::ReplyEndTimePolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___CI_)
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::RelativeRequestTimeoutPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class Messaging::RoutingTypeRange_var
 // *************************************************************
 
 ACE_INLINE
-Messaging::RoutingTypeRange_var::RoutingTypeRange_var (void) // default constructor
+Messaging::RoutingTypeRange_var::RoutingTypeRange_var (void)
   : ptr_ (0)
 {}
 
@@ -260,15 +321,19 @@ Messaging::RoutingTypeRange_var::RoutingTypeRange_var (RoutingTypeRange *p)
 {}
 
 ACE_INLINE
-Messaging::RoutingTypeRange_var::RoutingTypeRange_var (const ::Messaging::RoutingTypeRange_var &p) // copy constructor
+Messaging::RoutingTypeRange_var::RoutingTypeRange_var (const ::Messaging::RoutingTypeRange_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::Messaging::RoutingTypeRange (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::Messaging::RoutingTypeRange (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size types only
+// Fixed-size types only.
 ACE_INLINE
 Messaging::RoutingTypeRange_var::RoutingTypeRange_var (const ::Messaging::RoutingTypeRange &p)
 {
@@ -276,12 +341,13 @@ Messaging::RoutingTypeRange_var::RoutingTypeRange_var (const ::Messaging::Routin
 }
 
 ACE_INLINE
-Messaging::RoutingTypeRange_var::~RoutingTypeRange_var (void) // destructor
+Messaging::RoutingTypeRange_var::~RoutingTypeRange_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE Messaging::RoutingTypeRange_var &
+ACE_INLINE
+Messaging::RoutingTypeRange_var &
 Messaging::RoutingTypeRange_var::operator= (RoutingTypeRange *_tao_struct_var)
 {
   delete this->ptr_;
@@ -289,7 +355,8 @@ Messaging::RoutingTypeRange_var::operator= (RoutingTypeRange *_tao_struct_var)
   return *this;
 }
 
-ACE_INLINE ::Messaging::RoutingTypeRange_var &
+ACE_INLINE
+::Messaging::RoutingTypeRange_var &
 Messaging::RoutingTypeRange_var::operator= (const ::Messaging::RoutingTypeRange_var &_tao_struct_var)
 {
   if (this != &_tao_struct_var)
@@ -400,34 +467,52 @@ Messaging::RoutingTypeRange_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_ROUTINGPOLICY___CI_)
 #define _MESSAGING_ROUTINGPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::RoutingPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_MAXHOPSPOLICY___CI_)
 #define _MESSAGING_MAXHOPSPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::MaxHopsPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_QUEUEORDERPOLICY___CI_)
 #define _MESSAGING_QUEUEORDERPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::QueueOrderPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -468,7 +553,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/Messaging/Messaging_RT_Policy.pidl b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
index 01520f144e3..6350ddc4a80 100644
--- a/TAO/tao/Messaging/Messaging_RT_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
@@ -11,9 +11,9 @@
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
- *        -Wb,export_macro=TAO_Messaging_RT_Policy_Export
+ *   tao_idl
+ *        -o orig -Gp -Gd -Ge 1
+ *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
index de167c715b4..7b84f670159 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
@@ -19,12 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:315
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
-#include "Messaging_RT_PolicyC.h"
 
+#include "Messaging_RT_PolicyC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -35,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -43,13 +44,12 @@
 #include "Messaging_RT_PolicyC.i"
 #endif /* !defined INLINE */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_Timeout[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   34,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -60,10 +60,10 @@ static const CORBA::Long _oc_Messaging_Timeout[] =
   ACE_NTOHL (0x6d656f75), 
   ACE_NTOHL (0x743a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/Timeout:1.0
-  8,
+    8,
   ACE_NTOHL (0x54696d65), 
   ACE_NTOHL (0x6f757400),  // name = Timeout
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
@@ -75,10 +75,10 @@ static const CORBA::Long _oc_Messaging_Timeout[] =
     ACE_NTOHL (0x2f54696d), 
     ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
+        6,
     ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
+        CORBA::tk_ulonglong,
 
 
 };
@@ -100,9 +100,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::RelativeRoundtripTimeoutPolicy::_tao_class_id = 0;
 
@@ -149,13 +148,23 @@ tao_Messaging_RelativeRoundtripTimeoutPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_RelativeRoundtripTimeoutPolicy_marshal (
+    Messaging::RelativeRoundtripTimeoutPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::RelativeRoundtripTimeoutPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (void) // default constructor
+Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (void)
   : ptr_ (RelativeRoundtripTimeoutPolicy::_nil ())
 {}
 
@@ -165,12 +174,12 @@ Messaging::RelativeRoundtripTimeoutPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p) // copy constructor
+Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::RelativeRoundtripTimeoutPolicy_var::~RelativeRoundtripTimeoutPolicy_var (void) // destructor
+Messaging::RelativeRoundtripTimeoutPolicy_var::~RelativeRoundtripTimeoutPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -274,10 +283,11 @@ Messaging::RelativeRoundtripTimeoutPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::RelativeRoundtripTimeoutPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_ptr &p)
@@ -286,14 +296,14 @@ Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_ou
   this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
 }
 
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_var &p) // constructor from _var
+Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
 }
 
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (const ::Messaging::RelativeRoundtripTimeoutPolicy_out &p) // copy constructor
+Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (const ::Messaging::RelativeRoundtripTimeoutPolicy_out &p)
   : ptr_ (ACE_const_cast (RelativeRoundtripTimeoutPolicy_out &, p).ptr_)
 {}
 
@@ -324,7 +334,7 @@ Messaging::RelativeRoundtripTimeoutPolicy_out::operator ::Messaging::RelativeRou
 }
 
 ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_out::ptr (void) // ptr
+Messaging::RelativeRoundtripTimeoutPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -335,10 +345,8 @@ Messaging::RelativeRoundtripTimeoutPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void)
 {}
@@ -346,6 +354,13 @@ Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void)
 Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void)
 {}
 
+void 
+Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RelativeRoundtripTimeoutPolicy *tmp = ACE_static_cast (RelativeRoundtripTimeoutPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::RelativeRoundtripTimeoutPolicy_ptr
 Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
     CORBA::Object_ptr obj
@@ -439,13 +454,12 @@ const char* Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id
   return "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   57,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -462,7 +476,7 @@ static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] =
   ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0
-  31,
+    31,
   ACE_NTOHL (0x52656c61), 
   ACE_NTOHL (0x74697665), 
   ACE_NTOHL (0x526f756e), 
@@ -471,7 +485,7 @@ static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] =
   ACE_NTOHL (0x656f7574), 
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = RelativeRoundtripTimeoutPolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy (
     CORBA::tk_objref,
@@ -490,42 +504,34 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RelativeRoundtripTimeoutPolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_RelativeRoundtripTimeoutPolicy,
-      1,
-      Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (_tao_elem),
-      Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::RelativeRoundtripTimeoutPolicy_ptr _tao_objptr =
+    Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::RelativeRoundtripTimeoutPolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::insert (
+      _tao_any,
+      Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor,
       Messaging::_tc_RelativeRoundtripTimeoutPolicy,
-      1,
-      *_tao_elem,
-      Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -534,44 +540,36 @@ operator>>= (
     Messaging::RelativeRoundtripTimeoutPolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_RelativeRoundtripTimeoutPolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::RelativeRoundtripTimeoutPolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::extract (
+        _tao_any,
+        Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor,
+        Messaging::_tc_RelativeRoundtripTimeoutPolicy,
+        _tao_elem
+      );
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<Messaging::RelativeRoundtripTimeoutPolicy,Messaging::RelativeRoundtripTimeoutPolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::RelativeRoundtripTimeoutPolicy,Messaging::RelativeRoundtripTimeoutPolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::RelativeRoundtripTimeoutPolicy, Messaging::RelativeRoundtripTimeoutPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
index 2c545737ae5..48cd2dfd990 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
@@ -19,9 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_MESSAGING_RT_POLICYC_H_
 #define _TAO_IDL_ORIG_MESSAGING_RT_POLICYC_H_
@@ -61,63 +60,65 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:45
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  Messaging
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef TimeBase::TimeT Timeout;
   typedef TimeBase::TimeT_out Timeout_out;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Timeout;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32U;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___PTR_CH_)
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___PTR_CH_
-
+  
   class RelativeRoundtripTimeoutPolicy;
   typedef RelativeRoundtripTimeoutPolicy *RelativeRoundtripTimeoutPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___VAR_CH_)
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export RelativeRoundtripTimeoutPolicy_var : public TAO_Base_var
   {
   public:
     RelativeRoundtripTimeoutPolicy_var (void); // default constructor
-    RelativeRoundtripTimeoutPolicy_var (RelativeRoundtripTimeoutPolicy_ptr p) : ptr_ (p) {}
+    RelativeRoundtripTimeoutPolicy_var (RelativeRoundtripTimeoutPolicy_ptr p) : ptr_ (p) {} 
     RelativeRoundtripTimeoutPolicy_var (const RelativeRoundtripTimeoutPolicy_var &); // copy constructor
     ~RelativeRoundtripTimeoutPolicy_var (void); // destructor
-
+    
     RelativeRoundtripTimeoutPolicy_var &operator= (RelativeRoundtripTimeoutPolicy_ptr);
     RelativeRoundtripTimeoutPolicy_var &operator= (const RelativeRoundtripTimeoutPolicy_var &);
     RelativeRoundtripTimeoutPolicy_ptr operator-> (void) const;
-
+    
     operator const RelativeRoundtripTimeoutPolicy_ptr &() const;
     operator RelativeRoundtripTimeoutPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     RelativeRoundtripTimeoutPolicy_ptr in (void) const;
     RelativeRoundtripTimeoutPolicy_ptr &inout (void);
     RelativeRoundtripTimeoutPolicy_ptr &out (void);
     RelativeRoundtripTimeoutPolicy_ptr _retn (void);
     RelativeRoundtripTimeoutPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static RelativeRoundtripTimeoutPolicy_ptr tao_duplicate (RelativeRoundtripTimeoutPolicy_ptr);
@@ -128,7 +129,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     RelativeRoundtripTimeoutPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -136,17 +137,14 @@ TAO_NAMESPACE  Messaging
     RelativeRoundtripTimeoutPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___OUT_CH_)
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export RelativeRoundtripTimeoutPolicy_out
   {
   public:
@@ -159,21 +157,19 @@ TAO_NAMESPACE  Messaging
     operator RelativeRoundtripTimeoutPolicy_ptr &();
     RelativeRoundtripTimeoutPolicy_ptr &ptr (void);
     RelativeRoundtripTimeoutPolicy_ptr operator-> (void);
-
+  
   private:
     RelativeRoundtripTimeoutPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_)
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_
-
+  
   class TAO_Messaging_Export RelativeRoundtripTimeoutPolicy
     : public virtual CORBA::Policy
   {
@@ -181,87 +177,90 @@ TAO_NAMESPACE  Messaging
     typedef RelativeRoundtripTimeoutPolicy_ptr _ptr_type;
     typedef RelativeRoundtripTimeoutPolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static RelativeRoundtripTimeoutPolicy_ptr _duplicate (RelativeRoundtripTimeoutPolicy_ptr obj);
-
+    
     static RelativeRoundtripTimeoutPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RelativeRoundtripTimeoutPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RelativeRoundtripTimeoutPolicy_ptr _nil (void)
       {
         return (RelativeRoundtripTimeoutPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual TimeBase::TimeT relative_expiry (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     RelativeRoundtripTimeoutPolicy (void);
     virtual ~RelativeRoundtripTimeoutPolicy (void);
-
+    
     friend class _TAO_RelativeRoundtripTimeoutPolicy_Remote_Proxy_Impl;
     friend class _TAO_RelativeRoundtripTimeoutPolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_RelativeRoundtripTimeoutPolicy_Direct_Proxy_Impl;
-
+  
   private:
     RelativeRoundtripTimeoutPolicy (const RelativeRoundtripTimeoutPolicy &);
     void operator= (const RelativeRoundtripTimeoutPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RelativeRoundtripTimeoutPolicy;
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module Messaging
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::RelativeRoundtripTimeoutPolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RelativeRoundtripTimeoutPolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RelativeRoundtripTimeoutPolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RelativeRoundtripTimeoutPolicy_ptr &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1002
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_RT_PolicyC.i"
@@ -277,3 +276,4 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.i b/TAO/tao/Messaging/Messaging_RT_PolicyC.i
index 842576ff414..22f3d738281 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.i
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.i
@@ -19,12 +19,19 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___CI_)
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::RelativeRoundtripTimeoutPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
index 80974b5dd85..27269cd862a 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
@@ -11,9 +11,9 @@
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
- *        -Wb,export_macro=TAO_Messaging_SyncScope_Policy_Export
+ *   tao_idl
+ *        -o orig -Gp -Gd -Ge 1
+ *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
index d5e01f88905..e7d9f43ca83 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
@@ -19,12 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:315
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
-#include "Messaging_SyncScope_PolicyC.h"
 
+#include "Messaging_SyncScope_PolicyC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -35,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -43,9 +44,8 @@
 #include "Messaging_SyncScope_PolicyC.i"
 #endif /* !defined INLINE */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::SyncScopePolicy::_tao_class_id = 0;
 
@@ -92,13 +92,23 @@ tao_Messaging_SyncScopePolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_Messaging_SyncScopePolicy_marshal (
+    Messaging::SyncScopePolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // Messaging::SyncScopePolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-Messaging::SyncScopePolicy_var::SyncScopePolicy_var (void) // default constructor
+Messaging::SyncScopePolicy_var::SyncScopePolicy_var (void)
   : ptr_ (SyncScopePolicy::_nil ())
 {}
 
@@ -108,12 +118,12 @@ Messaging::SyncScopePolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-Messaging::SyncScopePolicy_var::SyncScopePolicy_var (const ::Messaging::SyncScopePolicy_var &p) // copy constructor
+Messaging::SyncScopePolicy_var::SyncScopePolicy_var (const ::Messaging::SyncScopePolicy_var &p)
   : TAO_Base_var (),
     ptr_ (SyncScopePolicy::_duplicate (p.ptr ()))
 {}
 
-Messaging::SyncScopePolicy_var::~SyncScopePolicy_var (void) // destructor
+Messaging::SyncScopePolicy_var::~SyncScopePolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -217,10 +227,11 @@ Messaging::SyncScopePolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // Messaging::SyncScopePolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_ptr &p)
@@ -229,14 +240,14 @@ Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_ptr &p)
   this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
 }
 
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_var &p) // constructor from _var
+Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
 }
 
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (const ::Messaging::SyncScopePolicy_out &p) // copy constructor
+Messaging::SyncScopePolicy_out::SyncScopePolicy_out (const ::Messaging::SyncScopePolicy_out &p)
   : ptr_ (ACE_const_cast (SyncScopePolicy_out &, p).ptr_)
 {}
 
@@ -267,7 +278,7 @@ Messaging::SyncScopePolicy_out::operator ::Messaging::SyncScopePolicy_ptr &() //
 }
 
 ::Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_out::ptr (void) // ptr
+Messaging::SyncScopePolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -278,10 +289,8 @@ Messaging::SyncScopePolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:226
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 Messaging::SyncScopePolicy::SyncScopePolicy (void)
 {}
@@ -289,6 +298,13 @@ Messaging::SyncScopePolicy::SyncScopePolicy (void)
 Messaging::SyncScopePolicy::~SyncScopePolicy (void)
 {}
 
+void 
+Messaging::SyncScopePolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  SyncScopePolicy *tmp = ACE_static_cast (SyncScopePolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
 Messaging::SyncScopePolicy_ptr
 Messaging::SyncScopePolicy::_narrow (
     CORBA::Object_ptr obj
@@ -382,13 +398,12 @@ const char* Messaging::SyncScopePolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/SyncScopePolicy:1.0";
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_Messaging_SyncScopePolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   42,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -401,12 +416,12 @@ static const CORBA::Long _oc_Messaging_SyncScopePolicy[] =
   ACE_NTOHL (0x6f6c6963), 
   ACE_NTOHL (0x793a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/SyncScopePolicy:1.0
-  16,
+    16,
   ACE_NTOHL (0x53796e63), 
   ACE_NTOHL (0x53636f70), 
   ACE_NTOHL (0x65506f6c), 
   ACE_NTOHL (0x69637900),  // name = SyncScopePolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_Messaging_SyncScopePolicy (
     CORBA::tk_objref,
@@ -425,42 +440,34 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::SyncScopePolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      Messaging::_tc_SyncScopePolicy,
-      1,
-      Messaging::SyncScopePolicy::_duplicate (_tao_elem),
-      Messaging::SyncScopePolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  Messaging::SyncScopePolicy_ptr _tao_objptr =
+    Messaging::SyncScopePolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     Messaging::SyncScopePolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<Messaging::SyncScopePolicy>::insert (
+      _tao_any,
+      Messaging::SyncScopePolicy::_tao_any_destructor,
       Messaging::_tc_SyncScopePolicy,
-      1,
-      *_tao_elem,
-      Messaging::SyncScopePolicy::_tao_any_destructor
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -469,44 +476,45 @@ operator>>= (
     Messaging::SyncScopePolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::SyncScopePolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_SyncScopePolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          Messaging::SyncScopePolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-      
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = Messaging::SyncScopePolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<Messaging::SyncScopePolicy>::extract (
+        _tao_any,
+        Messaging::SyncScopePolicy::_tao_any_destructor,
+        Messaging::_tc_SyncScopePolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::SyncScopePolicy>::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<Messaging::SyncScopePolicy,Messaging::SyncScopePolicy_var>;
+  template class TAO::Any_Impl_T<Messaging::SyncScopePolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<Messaging::SyncScopePolicy,Messaging::SyncScopePolicy_var>
+# pragma instantiate TAO_Object_Manager<Messaging::SyncScopePolicy, Messaging::SyncScopePolicy_var>
+# pragma instantiate TAO::Any_Impl_T<Messaging::SyncScopePolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::SyncScopePolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<Messaging::SyncScopePolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
index 593accedb7c..9cd6c653e91 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
@@ -19,9 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_MESSAGING_SYNCSCOPE_POLICYC_H_
 #define _TAO_IDL_ORIG_MESSAGING_SYNCSCOPE_POLICYC_H_
@@ -61,56 +60,54 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:45
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  Messaging
 {
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ULong SYNC_SCOPE_POLICY_TYPE = 24U;
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_MESSAGING_SYNCSCOPEPOLICY___PTR_CH_)
 #define _MESSAGING_SYNCSCOPEPOLICY___PTR_CH_
-
+  
   class SyncScopePolicy;
   typedef SyncScopePolicy *SyncScopePolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_SYNCSCOPEPOLICY___VAR_CH_)
 #define _MESSAGING_SYNCSCOPEPOLICY___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export SyncScopePolicy_var : public TAO_Base_var
   {
   public:
     SyncScopePolicy_var (void); // default constructor
-    SyncScopePolicy_var (SyncScopePolicy_ptr p) : ptr_ (p) {}
+    SyncScopePolicy_var (SyncScopePolicy_ptr p) : ptr_ (p) {} 
     SyncScopePolicy_var (const SyncScopePolicy_var &); // copy constructor
     ~SyncScopePolicy_var (void); // destructor
-
+    
     SyncScopePolicy_var &operator= (SyncScopePolicy_ptr);
     SyncScopePolicy_var &operator= (const SyncScopePolicy_var &);
     SyncScopePolicy_ptr operator-> (void) const;
-
+    
     operator const SyncScopePolicy_ptr &() const;
     operator SyncScopePolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     SyncScopePolicy_ptr in (void) const;
     SyncScopePolicy_ptr &inout (void);
     SyncScopePolicy_ptr &out (void);
     SyncScopePolicy_ptr _retn (void);
     SyncScopePolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static SyncScopePolicy_ptr tao_duplicate (SyncScopePolicy_ptr);
@@ -121,7 +118,7 @@ TAO_NAMESPACE  Messaging
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     SyncScopePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -129,17 +126,14 @@ TAO_NAMESPACE  Messaging
     SyncScopePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_MESSAGING_SYNCSCOPEPOLICY___OUT_CH_)
 #define _MESSAGING_SYNCSCOPEPOLICY___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export SyncScopePolicy_out
   {
   public:
@@ -152,21 +146,19 @@ TAO_NAMESPACE  Messaging
     operator SyncScopePolicy_ptr &();
     SyncScopePolicy_ptr &ptr (void);
     SyncScopePolicy_ptr operator-> (void);
-
+  
   private:
     SyncScopePolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_MESSAGING_SYNCSCOPEPOLICY_CH_)
 #define _MESSAGING_SYNCSCOPEPOLICY_CH_
-
+  
   class TAO_Messaging_Export SyncScopePolicy
     : public virtual CORBA::Policy
   {
@@ -174,87 +166,90 @@ TAO_NAMESPACE  Messaging
     typedef SyncScopePolicy_ptr _ptr_type;
     typedef SyncScopePolicy_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static SyncScopePolicy_ptr _duplicate (SyncScopePolicy_ptr obj);
-
+    
     static SyncScopePolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static SyncScopePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static SyncScopePolicy_ptr _nil (void)
       {
         return (SyncScopePolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual Messaging::SyncScope synchronization (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     SyncScopePolicy (void);
     virtual ~SyncScopePolicy (void);
-
+    
     friend class _TAO_SyncScopePolicy_Remote_Proxy_Impl;
     friend class _TAO_SyncScopePolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_SyncScopePolicy_Direct_Proxy_Impl;
-
+  
   private:
     SyncScopePolicy (const SyncScopePolicy &);
     void operator= (const SyncScopePolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SyncScopePolicy;
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module Messaging
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface Messaging::SyncScopePolicy
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::SyncScopePolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::SyncScopePolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::SyncScopePolicy_ptr &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1002
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_SyncScope_PolicyC.i"
@@ -270,3 +265,4 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i
index 455d21100d2..99dc677053f 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i
@@ -19,12 +19,19 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_SYNCSCOPEPOLICY___CI_)
 #define _MESSAGING_SYNCSCOPEPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+Messaging::SyncScopePolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/Messaging/TAO_Ext.pidl b/TAO/tao/Messaging/TAO_Ext.pidl
index 69b84c777ea..4a4e2dbfa5a 100644
--- a/TAO/tao/Messaging/TAO_Ext.pidl
+++ b/TAO/tao/Messaging/TAO_Ext.pidl
@@ -15,7 +15,7 @@
  *   this is:
  *
  *   tao_idl
- *       -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *       -o orig -Gp -Gd -Ge 1
  *       -Wb,export_macro=TAO_Messaging_Export
  *       -Wb,pre_include="ace/pre.h"
  *       -Wb,post_include="ace/post.h"
@@ -57,6 +57,4 @@ module TAO
 
 };
 
-#pragma prefix ""
-
 #endif /* TAO_TAO_EXT_IDL */
diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp
index 499cd0228e5..90b0dc259d4 100644
--- a/TAO/tao/Messaging/TAO_ExtC.cpp
+++ b/TAO/tao/Messaging/TAO_ExtC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "TAO_ExtC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "TAO_ExtC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,13 +44,8 @@
 #include "TAO_ExtC.i"
 #endif /* !defined INLINE */
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, CONNECTION_TIMEOUT_POLICY_TYPE, 1413545992U)
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int TAO::ConnectionTimeoutPolicy::_tao_class_id = 0;
 
@@ -92,13 +92,23 @@ tao_TAO_ConnectionTimeoutPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_TAO_ConnectionTimeoutPolicy_marshal (
+    TAO::ConnectionTimeoutPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // TAO::ConnectionTimeoutPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-TAO::ConnectionTimeoutPolicy_var::ConnectionTimeoutPolicy_var (void) // default constructor
+TAO::ConnectionTimeoutPolicy_var::ConnectionTimeoutPolicy_var (void)
   : ptr_ (ConnectionTimeoutPolicy::_nil ())
 {}
 
@@ -108,12 +118,12 @@ TAO::ConnectionTimeoutPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-TAO::ConnectionTimeoutPolicy_var::ConnectionTimeoutPolicy_var (const ::TAO::ConnectionTimeoutPolicy_var &p) // copy constructor
+TAO::ConnectionTimeoutPolicy_var::ConnectionTimeoutPolicy_var (const ::TAO::ConnectionTimeoutPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ConnectionTimeoutPolicy::_duplicate (p.ptr ()))
 {}
 
-TAO::ConnectionTimeoutPolicy_var::~ConnectionTimeoutPolicy_var (void) // destructor
+TAO::ConnectionTimeoutPolicy_var::~ConnectionTimeoutPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -217,10 +227,11 @@ TAO::ConnectionTimeoutPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // TAO::ConnectionTimeoutPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 TAO::ConnectionTimeoutPolicy_out::ConnectionTimeoutPolicy_out (ConnectionTimeoutPolicy_ptr &p)
@@ -229,14 +240,14 @@ TAO::ConnectionTimeoutPolicy_out::ConnectionTimeoutPolicy_out (ConnectionTimeout
   this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_nil ();
 }
 
-TAO::ConnectionTimeoutPolicy_out::ConnectionTimeoutPolicy_out (ConnectionTimeoutPolicy_var &p) // constructor from _var
+TAO::ConnectionTimeoutPolicy_out::ConnectionTimeoutPolicy_out (ConnectionTimeoutPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_nil ();
 }
 
-TAO::ConnectionTimeoutPolicy_out::ConnectionTimeoutPolicy_out (const ::TAO::ConnectionTimeoutPolicy_out &p) // copy constructor
+TAO::ConnectionTimeoutPolicy_out::ConnectionTimeoutPolicy_out (const ::TAO::ConnectionTimeoutPolicy_out &p)
   : ptr_ (ACE_const_cast (ConnectionTimeoutPolicy_out &, p).ptr_)
 {}
 
@@ -267,7 +278,7 @@ TAO::ConnectionTimeoutPolicy_out::operator ::TAO::ConnectionTimeoutPolicy_ptr &(
 }
 
 ::TAO::ConnectionTimeoutPolicy_ptr &
-TAO::ConnectionTimeoutPolicy_out::ptr (void) // ptr
+TAO::ConnectionTimeoutPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -278,9 +289,8 @@ TAO::ConnectionTimeoutPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:198
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 TAO::ConnectionTimeoutPolicy::ConnectionTimeoutPolicy (void)
 {}
@@ -288,13 +298,15 @@ TAO::ConnectionTimeoutPolicy::ConnectionTimeoutPolicy (void)
 TAO::ConnectionTimeoutPolicy::~ConnectionTimeoutPolicy (void)
 {}
 
-void TAO::ConnectionTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
+void 
+TAO::ConnectionTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ConnectionTimeoutPolicy *tmp = ACE_static_cast (ConnectionTimeoutPolicy*, _tao_void_pointer);
+  ConnectionTimeoutPolicy *tmp = ACE_static_cast (ConnectionTimeoutPolicy *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-TAO::ConnectionTimeoutPolicy_ptr TAO::ConnectionTimeoutPolicy::_narrow (
+TAO::ConnectionTimeoutPolicy_ptr
+TAO::ConnectionTimeoutPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -309,55 +321,75 @@ TAO::ConnectionTimeoutPolicy::_unchecked_narrow (
   )
 {
   if (CORBA::is_nil (obj))
-    return ConnectionTimeoutPolicy::_nil ();
+    {
+      return ConnectionTimeoutPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ConnectionTimeoutPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ConnectionTimeoutPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ConnectionTimeoutPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 TAO::ConnectionTimeoutPolicy_ptr
 TAO::ConnectionTimeoutPolicy::_duplicate (ConnectionTimeoutPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *TAO::ConnectionTimeoutPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::TAO, ConnectionTimeoutPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-    
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::TAO, ConnectionTimeoutPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -366,9 +398,12 @@ const char* TAO::ConnectionTimeoutPolicy::_interface_repository_id (void) const
   return "IDL:tao/TAO/ConnectionTimeoutPolicy:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_ConnectionTimeoutPolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   40,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x74616f2f), 
@@ -380,14 +415,14 @@ static const CORBA::Long _oc_TAO_ConnectionTimeoutPolicy[] =
   ACE_NTOHL (0x74506f6c), 
   ACE_NTOHL (0x6963793a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/ConnectionTimeoutPolicy:1.0
-  24,
+    24,
   ACE_NTOHL (0x436f6e6e), 
   ACE_NTOHL (0x65637469), 
   ACE_NTOHL (0x6f6e5469), 
   ACE_NTOHL (0x6d656f75), 
   ACE_NTOHL (0x74506f6c), 
   ACE_NTOHL (0x69637900),  // name = ConnectionTimeoutPolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_ConnectionTimeoutPolicy (
     CORBA::tk_objref,
@@ -399,86 +434,88 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_ConnectionTimeoutPolicy (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ConnectionTimeoutPolicy, &_tc_TAO_tc_TAO_ConnectionTimeoutPolicy)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ConnectionTimeoutPolicy,
+    &_tc_TAO_tc_TAO_ConnectionTimeoutPolicy
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/any_op_cs.cpp:60
-
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     TAO::ConnectionTimeoutPolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      TAO::_tc_ConnectionTimeoutPolicy, 
-      1,
-      TAO::ConnectionTimeoutPolicy::_duplicate (_tao_elem),
-      TAO::ConnectionTimeoutPolicy::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  TAO::ConnectionTimeoutPolicy_ptr _tao_objptr =
+    TAO::ConnectionTimeoutPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     TAO::ConnectionTimeoutPolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
-      TAO::_tc_ConnectionTimeoutPolicy, 
-      1,
-      *_tao_elem,
-      TAO::ConnectionTimeoutPolicy::_tao_any_destructor
+  TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::insert (
+      _tao_any,
+      TAO::ConnectionTimeoutPolicy::_tao_any_destructor,
+      TAO::_tc_ConnectionTimeoutPolicy,
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     TAO::ConnectionTimeoutPolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = TAO::ConnectionTimeoutPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          TAO::_tc_ConnectionTimeoutPolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          TAO::ConnectionTimeoutPolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-    
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = TAO::ConnectionTimeoutPolicy::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::extract (
+        _tao_any,
+        TAO::ConnectionTimeoutPolicy::_tao_any_destructor,
+        TAO::_tc_ConnectionTimeoutPolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::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<TAO::ConnectionTimeoutPolicy,TAO::ConnectionTimeoutPolicy_var>;
+  template class TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Manager<TAO::ConnectionTimeoutPolicy,TAO::ConnectionTimeoutPolicy_var>
+# pragma instantiate TAO_Object_Manager<TAO::ConnectionTimeoutPolicy, TAO::ConnectionTimeoutPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h
index 9069fb4de07..cba366bc7e4 100644
--- a/TAO/tao/Messaging/TAO_ExtC.h
+++ b/TAO/tao/Messaging/TAO_ExtC.h
@@ -19,8 +19,12 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_TAO_EXTC_H_
 #define _TAO_IDL_ORIG_TAO_EXTC_H_
+
 #include "ace/pre.h"
 #include "tao/orbconf.h"
 
@@ -55,44 +59,55 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  TAO
 {
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong CONNECTION_TIMEOUT_POLICY_TYPE;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong CONNECTION_TIMEOUT_POLICY_TYPE = 1413545992U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_TAO_CONNECTIONTIMEOUTPOLICY___PTR_CH_)
 #define _TAO_CONNECTIONTIMEOUTPOLICY___PTR_CH_
-
+  
   class ConnectionTimeoutPolicy;
   typedef ConnectionTimeoutPolicy *ConnectionTimeoutPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_CONNECTIONTIMEOUTPOLICY___VAR_CH_)
 #define _TAO_CONNECTIONTIMEOUTPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Messaging_Export ConnectionTimeoutPolicy_var : public TAO_Base_var
   {
   public:
     ConnectionTimeoutPolicy_var (void); // default constructor
-    ConnectionTimeoutPolicy_var (ConnectionTimeoutPolicy_ptr p) : ptr_ (p) {}
+    ConnectionTimeoutPolicy_var (ConnectionTimeoutPolicy_ptr p) : ptr_ (p) {} 
     ConnectionTimeoutPolicy_var (const ConnectionTimeoutPolicy_var &); // copy constructor
     ~ConnectionTimeoutPolicy_var (void); // destructor
-
+    
     ConnectionTimeoutPolicy_var &operator= (ConnectionTimeoutPolicy_ptr);
     ConnectionTimeoutPolicy_var &operator= (const ConnectionTimeoutPolicy_var &);
     ConnectionTimeoutPolicy_ptr operator-> (void) const;
-
+    
     operator const ConnectionTimeoutPolicy_ptr &() const;
     operator ConnectionTimeoutPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ConnectionTimeoutPolicy_ptr in (void) const;
     ConnectionTimeoutPolicy_ptr &inout (void);
     ConnectionTimeoutPolicy_ptr &out (void);
     ConnectionTimeoutPolicy_ptr _retn (void);
     ConnectionTimeoutPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ConnectionTimeoutPolicy_ptr tao_duplicate (ConnectionTimeoutPolicy_ptr);
@@ -103,7 +118,7 @@ TAO_NAMESPACE  TAO
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ConnectionTimeoutPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -111,13 +126,14 @@ TAO_NAMESPACE  TAO
     ConnectionTimeoutPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_CONNECTIONTIMEOUTPOLICY___OUT_CH_)
 #define _TAO_CONNECTIONTIMEOUTPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Messaging_Export ConnectionTimeoutPolicy_out
   {
   public:
@@ -130,96 +146,110 @@ TAO_NAMESPACE  TAO
     operator ConnectionTimeoutPolicy_ptr &();
     ConnectionTimeoutPolicy_ptr &ptr (void);
     ConnectionTimeoutPolicy_ptr operator-> (void);
-
+  
   private:
     ConnectionTimeoutPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
-  // *************************************************************
-  // TAO::ConnectionTimeoutPolicy
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_TAO_CONNECTIONTIMEOUTPOLICY_CH_)
 #define _TAO_CONNECTIONTIMEOUTPOLICY_CH_
-
+  
   class TAO_Messaging_Export ConnectionTimeoutPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ConnectionTimeoutPolicy_ptr _ptr_type;
     typedef ConnectionTimeoutPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ConnectionTimeoutPolicy_ptr _duplicate (ConnectionTimeoutPolicy_ptr obj);
-
+    
     static ConnectionTimeoutPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ConnectionTimeoutPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ConnectionTimeoutPolicy_ptr _nil (void)
       {
         return (ConnectionTimeoutPolicy_ptr)0;
       }
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual TimeBase::TimeT relative_expiry (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ConnectionTimeoutPolicy (void);
-
     virtual ~ConnectionTimeoutPolicy (void);
-
+    
+    friend class _TAO_ConnectionTimeoutPolicy_Remote_Proxy_Impl;
+    friend class _TAO_ConnectionTimeoutPolicy_ThruPOA_Proxy_Impl;
+    friend class _TAO_ConnectionTimeoutPolicy_Direct_Proxy_Impl;
+  
   private:
     ConnectionTimeoutPolicy (const ConnectionTimeoutPolicy &);
     void operator= (const ConnectionTimeoutPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ConnectionTimeoutPolicy;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module TAO
 
-// Any operators for interface TAO::ConnectionTimeoutPolicy
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_Messaging_Export void operator<<= (CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr *); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "TAO_ExtC.i"
@@ -235,3 +265,4 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::Connec
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging/TAO_ExtC.i b/TAO/tao/Messaging/TAO_ExtC.i
index fb8249acfbf..cb0677651e5 100644
--- a/TAO/tao/Messaging/TAO_ExtC.i
+++ b/TAO/tao/Messaging/TAO_ExtC.i
@@ -20,9 +20,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
 #if !defined (_TAO_CONNECTIONTIMEOUTPOLICY___CI_)
 #define _TAO_CONNECTIONTIMEOUTPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+TAO::ConnectionTimeoutPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/Messaging/TAO_Messaging.dsp b/TAO/tao/Messaging/TAO_Messaging.dsp
index 53bfd249e78..2c17893d794 100644
--- a/TAO/tao/Messaging/TAO_Messaging.dsp
+++ b/TAO/tao/Messaging/TAO_Messaging.dsp
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Messaging_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_MESSAGING_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_MESSAGING_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -177,6 +177,7 @@ SOURCE=.\Messaging.cpp
 # Begin Source File

 

 SOURCE=.\Messaging_No_ImplC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -193,14 +194,17 @@ SOURCE=.\Messaging_PolicyFactory.cpp
 # Begin Source File

 

 SOURCE=.\Messaging_RT_PolicyC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

 SOURCE=.\Messaging_SyncScope_PolicyC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

 SOURCE=.\MessagingC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -209,6 +213,7 @@ SOURCE=.\MessagingS.cpp
 # Begin Source File

 

 SOURCE=.\TAO_ExtC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl
index 5a2262d45b3..aaa3b727093 100644
--- a/TAO/tao/Messaging_PolicyValue.pidl
+++ b/TAO/tao/Messaging_PolicyValue.pidl
@@ -9,9 +9,9 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
+ *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        Messaging_PolicyValue.pidl
@@ -50,6 +50,4 @@ module Messaging
   const IOP::ServiceId INVOCATION_POLICIES = 2;
 };
 
-#pragma prefix ""
-
 #endif /* TAO_MESSAGING_POLICYVALUE_PIDL */
diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp
index 4c555103fc7..08ae2f16e94 100644
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ b/TAO/tao/Messaging_PolicyValueC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Messaging_PolicyValueC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "Messaging_PolicyValueC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,9 +44,12 @@
 #include "Messaging_PolicyValueC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Messaging_PolicyValue[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   38,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -53,15 +61,15 @@ static const CORBA::Long _oc_Messaging_PolicyValue[] =
   ACE_NTOHL (0x56616c75), 
   ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
-  12,
+    12,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756500),  // name = PolicyValue
   2, // member count
-  6,
+    6,
   ACE_NTOHL (0x70747970), 
   ACE_NTOHL (0x65000000),  // name = ptype
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
@@ -74,17 +82,17 @@ static const CORBA::Long _oc_Messaging_PolicyValue[] =
     ACE_NTOHL (0x54797065), 
     ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-    11,
+        11,
     ACE_NTOHL (0x506f6c69), 
     ACE_NTOHL (0x63795479), 
     ACE_NTOHL (0x70650000),  // name = PolicyType
-    CORBA::tk_ulong,
+        CORBA::tk_ulong,
 
 
   7,
   ACE_NTOHL (0x7076616c), 
   ACE_NTOHL (0x75650000),  // name = pvalue
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
@@ -103,63 +111,89 @@ static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyValue, &_tc_TAO_tc_Messaging_PolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyValue,
+    &_tc_TAO_tc_Messaging_PolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void Messaging::PolicyValue::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyValue *tmp = ACE_static_cast (PolicyValue*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_)
 #define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // Messaging::PolicyValue::_tao_seq_Octet
 // *************************************************************
 
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
+
+Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
+
+Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Octet *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
+
+Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
 {}
+
 void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer)
 {
   _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// 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)
 
@@ -173,16 +207,21 @@ Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_allocate_buffer (C
   tmp = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (length);
   
   if (this->buffer_ != 0)
-  {
-    Messaging::PolicyValue *old = ACE_reinterpret_cast (Messaging::PolicyValue *,this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-    
-    if (this->release_)
-      _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (old);
-    
-  }
+    {
+      Messaging::PolicyValue *old =
+        ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -190,75 +229,96 @@ void
 Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-  
-  Messaging::PolicyValue *tmp = ACE_reinterpret_cast (Messaging::PolicyValue *,this->buffer_);
+    {
+      return;
+    }
   
+  Messaging::PolicyValue *tmp =
+    ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
   _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
   this->buffer_ = 0;
 } 
 
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void) // Dtor.
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_MESSAGING_POLICYVALUESEQ_CS_)
 #define _MESSAGING_POLICYVALUESEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // Messaging::PolicyValueSeq
 // *************************************************************
 
 Messaging::PolicyValueSeq::PolicyValueSeq (void)
 {}
-Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max) // uses max size
+
+Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<Messaging::PolicyValue>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max, CORBA::ULong length, Messaging::PolicyValue *buffer, CORBA::Boolean release)
+
+Messaging::PolicyValueSeq::PolicyValueSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    Messaging::PolicyValue *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<Messaging::PolicyValue>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq) // copy ctor
+
+Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<Messaging::PolicyValue>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 Messaging::PolicyValueSeq::~PolicyValueSeq (void) // dtor
 {}
+
 void Messaging::PolicyValueSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyValueSeq *tmp = ACE_static_cast (PolicyValueSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   41,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -271,12 +331,12 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
   ACE_NTOHL (0x65536571), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/PolicyValueSeq:1.0
-  15,
+    15,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756553), 
   ACE_NTOHL (0x65710000),  // name = PolicyValueSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
@@ -293,15 +353,15 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
       ACE_NTOHL (0x56616c75), 
       ACE_NTOHL (0x653a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
-      12,
+            12,
       ACE_NTOHL (0x506f6c69), 
       ACE_NTOHL (0x63795661), 
       ACE_NTOHL (0x6c756500),  // name = PolicyValue
       2, // member count
-      6,
+            6,
       ACE_NTOHL (0x70747970), 
       ACE_NTOHL (0x65000000),  // name = ptype
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
@@ -314,17 +374,17 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
         ACE_NTOHL (0x54797065), 
         ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-        11,
+                11,
         ACE_NTOHL (0x506f6c69), 
         ACE_NTOHL (0x63795479), 
         ACE_NTOHL (0x70650000),  // name = PolicyType
-        CORBA::tk_ulong,
+                CORBA::tk_ulong,
 
 
       7,
       ACE_NTOHL (0x7076616c), 
       ACE_NTOHL (0x75650000),  // name = pvalue
-      CORBA::tk_sequence, // typecode kind
+            CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_octet,
@@ -346,20 +406,15 @@ static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValueSeq (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyValueSeq, &_tc_TAO_tc_Messaging_PolicyValueSeq)
-TAO_NAMESPACE_END
-
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 2U)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyValueSeq,
+    &_tc_TAO_tc_Messaging_PolicyValueSeq
+  )
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:58
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -367,16 +422,12 @@ void operator<<= (
     const Messaging::PolicyValue &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_PolicyValue,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert_copy (
+      _tao_any,
+      Messaging::PolicyValue::_tao_any_destructor,
+      Messaging::_tc_PolicyValue,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -385,19 +436,12 @@ void operator<<= (
     Messaging::PolicyValue *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_PolicyValue,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Messaging::PolicyValue::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert (
+      _tao_any,
+      Messaging::PolicyValue::_tao_any_destructor,
+      Messaging::_tc_PolicyValue,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -418,76 +462,24 @@ CORBA::Boolean operator>>= (
     const Messaging::PolicyValue *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_PolicyValue
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const Messaging::PolicyValue*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Messaging::PolicyValue *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            Messaging::PolicyValue,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Messaging::_tc_PolicyValue,
-                1,
-                ACE_static_cast (void *, tmp),
-                Messaging::PolicyValue::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::extract (
+        _tao_any,
+        Messaging::PolicyValue::_tao_any_destructor,
+        Messaging::_tc_PolicyValue,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<Messaging::PolicyValue>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<Messaging::PolicyValue>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -495,16 +487,12 @@ void operator<<= (
     const Messaging::PolicyValueSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_PolicyValueSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert_copy (
+      _tao_any,
+      Messaging::PolicyValueSeq::_tao_any_destructor,
+      Messaging::_tc_PolicyValueSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -513,19 +501,12 @@ void operator<<= (
     Messaging::PolicyValueSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Messaging::_tc_PolicyValueSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Messaging::PolicyValueSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert (
+      _tao_any,
+      Messaging::PolicyValueSeq::_tao_any_destructor,
+      Messaging::_tc_PolicyValueSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -534,8 +515,8 @@ CORBA::Boolean operator>>= (
     Messaging::PolicyValueSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const Messaging::PolicyValueSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const Messaging::PolicyValueSeq *&,
       _tao_elem
     );
 }
@@ -546,73 +527,17 @@ CORBA::Boolean operator>>= (
     const Messaging::PolicyValueSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Messaging::_tc_PolicyValueSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const Messaging::PolicyValueSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Messaging::PolicyValueSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            Messaging::PolicyValueSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Messaging::_tc_PolicyValueSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                Messaging::PolicyValueSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::extract (
+        _tao_any,
+        Messaging::PolicyValueSeq::_tao_any_destructor,
+        Messaging::_tc_PolicyValueSeq,
+        _tao_elem
+      );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_
 #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_
@@ -622,26 +547,29 @@ CORBA::Boolean operator<< (
     const Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-    
+      // Encode all elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence);
+        if (oseq->mb ())
+          return strm.write_octet_array_mb (oseq->mb ());
+        else
+          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+      }
+      
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
+      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -650,64 +578,81 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),
-    ACE_Message_Block::DONT_DELETE))
     {
-      TAO_ORB_Core* orb_core = strm.orb_core ();
-      if (orb_core != 0 &&
-      strm.orb_core ()->resource_factory ()->
-      input_cdr_allocator_type_locked () == 1)
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      if (ACE_BIT_DISABLED (strm.start ()->flags (),
+      ACE_Message_Block::DONT_DELETE))
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-          ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-        oseq->replace (_tao_seq_len, strm.start ());
-        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-        strm.skip_bytes (_tao_seq_len);
-        return 1;
+        TAO_ORB_Core* orb_core = strm.orb_core ();
+        if (orb_core != 0 &&
+        strm.orb_core ()->resource_factory ()->
+        input_cdr_allocator_type_locked () == 1)
+        {
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+          oseq->replace (_tao_seq_len, strm.start ());
+          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+          strm.skip_bytes (_tao_seq_len);
+          return 1;
+        }
       }
-    }
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 #endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const Messaging::PolicyValueSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -716,26 +661,37 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h
index d00e33a7a3b..24af31cc50a 100644
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ b/TAO/tao/Messaging_PolicyValueC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_MESSAGING_POLICYVALUEC_H_
-#define _TAO_IDL_MESSAGING_POLICYVALUEC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
+#define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -56,51 +59,64 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  Messaging
 {
-  struct PolicyValue;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class PolicyValue_var;
   
   struct TAO_Export PolicyValue
   {
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyValue_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
     
+    static void _tao_any_destructor (void *);
     CORBA::PolicyType ptype;
     
+
 #if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CH_)
 #define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CH_
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
     class _tao_seq_Octet;
     
     // *************************************************************
-    // _tao_seq_Octet
+    // Messaging::PolicyValue::_tao_seq_Octet
     // *************************************************************
     
     class TAO_Export _tao_seq_Octet : 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<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
+      _tao_seq_Octet (void);
+      _tao_seq_Octet (CORBA::ULong max);
       _tao_seq_Octet (
           CORBA::ULong max, 
           CORBA::ULong length, 
           CORBA::Octet *buffer, 
           CORBA::Boolean release = 0
         );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
+      _tao_seq_Octet (const _tao_seq_Octet &);
       ~_tao_seq_Octet (void);
+      
       static void _tao_any_destructor (void*);
       
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       _tao_seq_Octet (
           CORBA::ULong length,
@@ -108,20 +124,20 @@ TAO_NAMESPACE  Messaging
         )
         : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-      
     };
-    
+
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
     
-#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_Octet _pvalue_seq;
-#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
-
     _tao_seq_Octet pvalue;
-    
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export PolicyValue_var
   {
   public:
@@ -138,6 +154,7 @@ TAO_NAMESPACE  Messaging
     operator const PolicyValue &() const;
     operator PolicyValue &();
     operator PolicyValue &() const;
+    
     // Variable-size types only.
     operator PolicyValue *&();
     
@@ -152,6 +169,9 @@ TAO_NAMESPACE  Messaging
     PolicyValue *ptr_;
   };
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_Export PolicyValue_out
   {
   public:
@@ -170,19 +190,23 @@ TAO_NAMESPACE  Messaging
     void operator= (const PolicyValue_var &);
   };
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValue;
+  // 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_PolicyValue;
   
+  // 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_MESSAGING_POLICYVALUESEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
+  class TAO_Export _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void);
     _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (
@@ -219,55 +243,61 @@ TAO_NAMESPACE  Messaging
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_MESSAGING_POLICYVALUESEQ_CH_)
 #define _MESSAGING_POLICYVALUESEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class PolicyValueSeq;
   class PolicyValueSeq_var;
   
   // *************************************************************
-  // PolicyValueSeq
+  // Messaging::PolicyValueSeq
   // *************************************************************
   
   class TAO_Export PolicyValueSeq : 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_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<PolicyValue>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    PolicyValueSeq (void); // default ctor
-    PolicyValueSeq (CORBA::ULong max); // uses max size
+    PolicyValueSeq (void);
+    PolicyValueSeq (CORBA::ULong max);
     PolicyValueSeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         PolicyValue *buffer, 
         CORBA::Boolean release = 0
       );
-    PolicyValueSeq (const PolicyValueSeq &); // copy ctor
+    PolicyValueSeq (const PolicyValueSeq &);
     ~PolicyValueSeq (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyValueSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_MESSAGING_POLICYVALUESEQ___VAR_CH_)
 #define _MESSAGING_POLICYVALUESEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class Messaging::PolicyValueSeq_var
   // *************************************************************
@@ -288,7 +318,9 @@ TAO_NAMESPACE  Messaging
     operator const PolicyValueSeq &() const;
     operator PolicyValueSeq &();
     operator PolicyValueSeq &() const;
-    operator PolicyValueSeq *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator PolicyValueSeq *&();
     
     PolicyValue & operator[] (CORBA::ULong index);
     const PolicyValue & operator[] (CORBA::ULong index) const;
@@ -303,14 +335,15 @@ TAO_NAMESPACE  Messaging
   private:
     PolicyValueSeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_MESSAGING_POLICYVALUESEQ___OUT_CH_)
 #define _MESSAGING_POLICYVALUESEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export PolicyValueSeq_out
   {
   public:
@@ -329,34 +362,60 @@ TAO_NAMESPACE  Messaging
     // Assignment from T_var not allowed.
     void operator= (const PolicyValueSeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // 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_PolicyValueSeq;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_POLICIES;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES;
+  const CORBA::ULong TAG_POLICIES = 2U;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
+  const CORBA::ULong INVOCATION_POLICIES = 2U;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module Messaging
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValue &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValue*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValue *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValue *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValueSeq *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValue &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_
 #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_
 
@@ -371,6 +430,8 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_H_
 #define _TAO_CDR_OP_Messaging_PolicyValueSeq_H_
@@ -386,9 +447,13 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_PolicyValueC.i"
@@ -404,3 +469,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging_PolicyValueC.i b/TAO/tao/Messaging_PolicyValueC.i
index 4a4514a8cc8..331ec91b760 100644
--- a/TAO/tao/Messaging_PolicyValueC.i
+++ b/TAO/tao/Messaging_PolicyValueC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class Messaging::PolicyValue_var
 // *************************************************************
 
 ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (void) // default constructor
+Messaging::PolicyValue_var::PolicyValue_var (void)
   : ptr_ (0)
 {}
 
@@ -34,42 +38,52 @@ Messaging::PolicyValue_var::PolicyValue_var (PolicyValue *p)
 {}
 
 ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (const ::Messaging::PolicyValue_var &p) // copy constructor
+Messaging::PolicyValue_var::PolicyValue_var (const ::Messaging::PolicyValue_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::Messaging::PolicyValue (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::Messaging::PolicyValue (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-Messaging::PolicyValue_var::~PolicyValue_var (void) // destructor
+Messaging::PolicyValue_var::~PolicyValue_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE Messaging::PolicyValue_var &
-Messaging::PolicyValue_var::operator= (PolicyValue *p)
+ACE_INLINE
+Messaging::PolicyValue_var &
+Messaging::PolicyValue_var::operator= (PolicyValue *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::Messaging::PolicyValue_var &
-Messaging::PolicyValue_var::operator= (const ::Messaging::PolicyValue_var &p)
+ACE_INLINE
+::Messaging::PolicyValue_var &
+Messaging::PolicyValue_var::operator= (const ::Messaging::PolicyValue_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
         {
-          PolicyValue *deep_copy =
-            new PolicyValue (*p.ptr_);
+          PolicyValue *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              PolicyValue (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -114,7 +128,7 @@ Messaging::PolicyValue_var::operator ::Messaging::PolicyValue &() const // cast
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 Messaging::PolicyValue_var::operator ::Messaging::PolicyValue *&() // cast 
 {
@@ -133,7 +147,7 @@ Messaging::PolicyValue_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::Messaging::PolicyValue *&
 Messaging::PolicyValue_var::out (void)
 {
@@ -156,6 +170,9 @@ Messaging::PolicyValue_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 Messaging::PolicyValue_out
 // *************************************************************
@@ -168,7 +185,7 @@ Messaging::PolicyValue_out::PolicyValue_out (::Messaging::PolicyValue *&p)
 }
 
 ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (PolicyValue_var &p) // constructor from _var
+Messaging::PolicyValue_out::PolicyValue_out (PolicyValue_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -176,21 +193,23 @@ Messaging::PolicyValue_out::PolicyValue_out (PolicyValue_var &p) // constructor
 }
 
 ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (const ::Messaging::PolicyValue_out &p) // copy constructor
+Messaging::PolicyValue_out::PolicyValue_out (const ::Messaging::PolicyValue_out &p)
   : ptr_ (ACE_const_cast (PolicyValue_out&, p).ptr_)
 {}
 
-ACE_INLINE Messaging::PolicyValue_out &
+ACE_INLINE
+Messaging::PolicyValue_out &
 Messaging::PolicyValue_out::operator= (const ::Messaging::PolicyValue_out &p)
 {
   this->ptr_ = ACE_const_cast (PolicyValue_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE Messaging::PolicyValue_out &
-Messaging::PolicyValue_out::operator= (PolicyValue *p)
+ACE_INLINE
+Messaging::PolicyValue_out &
+Messaging::PolicyValue_out::operator= (PolicyValue *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -212,192 +231,231 @@ Messaging::PolicyValue_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_MESSAGING_POLICYVALUESEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CI_
 
-// = Static operations.
-ACE_INLINE Messaging::PolicyValue *
+ACE_INLINE
+Messaging::PolicyValue *
 Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   Messaging::PolicyValue *retval = 0;
   ACE_NEW_RETURN (retval, Messaging::PolicyValue[size], 0);
   return retval;
 }
 
-ACE_INLINE void Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (Messaging::PolicyValue *buffer)
-// Free the sequence.
+ACE_INLINE
+void Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (Messaging::PolicyValue *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void) // Default constructor.
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void)
 {
 }
 
 ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  Messaging::PolicyValue *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    Messaging::PolicyValue *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs)
-// Copy constructor.
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (
+    const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    Messaging::PolicyValue *tmp1 = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->maximum_);
-    Messaging::PolicyValue * const tmp2 = ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      Messaging::PolicyValue *tmp1 =
+        _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->maximum_);
+      Messaging::PolicyValue * const tmp2 =
+        ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator= (const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs)
-// Assignment operator.
+ACE_INLINE
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator= (
+    const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      Messaging::PolicyValue *tmp = ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
-      _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          Messaging::PolicyValue *tmp =
+            ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  Messaging::PolicyValue *tmp1 = ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
-  Messaging::PolicyValue * const tmp2 = ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_);
+  Messaging::PolicyValue *tmp1 =
+    ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
+  Messaging::PolicyValue * const tmp2 =
+    ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE Messaging::PolicyValue &
+ACE_INLINE
+Messaging::PolicyValue &
 Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  Messaging::PolicyValue* tmp = ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_);
+  Messaging::PolicyValue* tmp =
+    ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const Messaging::PolicyValue &
+ACE_INLINE
+const Messaging::PolicyValue &
 Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  Messaging::PolicyValue * const tmp = ACE_reinterpret_cast (Messaging::PolicyValue* ACE_CAST_CONST, this->buffer_);
+  Messaging::PolicyValue * const tmp =
+    ACE_reinterpret_cast (Messaging::PolicyValue* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE Messaging::PolicyValue *
+ACE_INLINE
+Messaging::PolicyValue *
 Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::get_buffer (CORBA::Boolean orphan)
 {
   Messaging::PolicyValue *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const Messaging::PolicyValue *
+ACE_INLINE
+const Messaging::PolicyValue *
 Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const Messaging::PolicyValue * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const Messaging::PolicyValue * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::replace (CORBA::ULong max,
-CORBA::ULong length,
-Messaging::PolicyValue *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    Messaging::PolicyValue *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    Messaging::PolicyValue *tmp = ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_);
-    _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
-  }
+    {
+      Messaging::PolicyValue *tmp =
+        ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_);
+      _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_MESSAGING_POLICYVALUESEQ_CI_)
 #define _MESSAGING_POLICYVALUESEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class Messaging::PolicyValueSeq_var
 // *************************************************************
 
 ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (void) // default constructor
+Messaging::PolicyValueSeq_var::PolicyValueSeq_var (void)
   : ptr_ (0)
 {}
 
@@ -407,21 +465,26 @@ Messaging::PolicyValueSeq_var::PolicyValueSeq_var (PolicyValueSeq *p)
 {}
 
 ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (const ::Messaging::PolicyValueSeq_var &p) // copy constructor
+Messaging::PolicyValueSeq_var::PolicyValueSeq_var (const ::Messaging::PolicyValueSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::Messaging::PolicyValueSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::Messaging::PolicyValueSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-Messaging::PolicyValueSeq_var::~PolicyValueSeq_var (void) // destructor
+Messaging::PolicyValueSeq_var::~PolicyValueSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE Messaging::PolicyValueSeq_var &
+ACE_INLINE
+Messaging::PolicyValueSeq_var &
 Messaging::PolicyValueSeq_var::operator= (PolicyValueSeq *p)
 {
   delete this->ptr_;
@@ -429,7 +492,8 @@ Messaging::PolicyValueSeq_var::operator= (PolicyValueSeq *p)
   return *this;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq_var &
+ACE_INLINE
+::Messaging::PolicyValueSeq_var &
 Messaging::PolicyValueSeq_var::operator= (const ::Messaging::PolicyValueSeq_var &p)
 {
   if (this != &p)
@@ -441,8 +505,12 @@ Messaging::PolicyValueSeq_var::operator= (const ::Messaging::PolicyValueSeq_var
         }
       else
         {
-          PolicyValueSeq *deep_copy =
-            new PolicyValueSeq (*p.ptr_);
+          PolicyValueSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              PolicyValueSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -457,69 +525,75 @@ Messaging::PolicyValueSeq_var::operator= (const ::Messaging::PolicyValueSeq_var
   return *this;
 }
 
-ACE_INLINE const ::Messaging::PolicyValueSeq *
+ACE_INLINE
+const ::Messaging::PolicyValueSeq *
 Messaging::PolicyValueSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq *
+ACE_INLINE
+::Messaging::PolicyValueSeq *
 Messaging::PolicyValueSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Messaging::PolicyValueSeq_var::operator const ::Messaging::PolicyValueSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE Messaging::PolicyValue &
+ACE_INLINE
+Messaging::PolicyValue &
 Messaging::PolicyValueSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const Messaging::PolicyValue &
+ACE_INLINE
+const Messaging::PolicyValue &
 Messaging::PolicyValueSeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const Messaging::PolicyValue &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::Messaging::PolicyValueSeq &
+ACE_INLINE
+const ::Messaging::PolicyValueSeq &
 Messaging::PolicyValueSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq &
+ACE_INLINE
+::Messaging::PolicyValueSeq &
 Messaging::PolicyValueSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::Messaging::PolicyValueSeq *&
+ACE_INLINE
+::Messaging::PolicyValueSeq *&
 Messaging::PolicyValueSeq_var::out (void)
 {
   delete this->ptr_;
@@ -527,7 +601,8 @@ Messaging::PolicyValueSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq *
+ACE_INLINE
+::Messaging::PolicyValueSeq *
 Messaging::PolicyValueSeq_var::_retn (void)
 {
   ::Messaging::PolicyValueSeq *tmp = this->ptr_;
@@ -535,12 +610,16 @@ Messaging::PolicyValueSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq *
+ACE_INLINE
+::Messaging::PolicyValueSeq *
 Messaging::PolicyValueSeq_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 Messaging::PolicyValueSeq_out
 // *************************************************************
@@ -553,7 +632,7 @@ Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq *&p)
 }
 
 ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq_var &p) // constructor from _var
+Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -561,51 +640,57 @@ Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq_var &p) // con
 }
 
 ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (const ::Messaging::PolicyValueSeq_out &p) // copy constructor
+Messaging::PolicyValueSeq_out::PolicyValueSeq_out (const ::Messaging::PolicyValueSeq_out &p)
   : ptr_ (ACE_const_cast (PolicyValueSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::Messaging::PolicyValueSeq_out &
+ACE_INLINE
+::Messaging::PolicyValueSeq_out &
 Messaging::PolicyValueSeq_out::operator= (const ::Messaging::PolicyValueSeq_out &p)
 {
   this->ptr_ = ACE_const_cast (PolicyValueSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq_out &
+ACE_INLINE
+::Messaging::PolicyValueSeq_out &
 Messaging::PolicyValueSeq_out::operator= (PolicyValueSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 Messaging::PolicyValueSeq_out::operator ::Messaging::PolicyValueSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq *&
+ACE_INLINE
+::Messaging::PolicyValueSeq *&
 Messaging::PolicyValueSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::Messaging::PolicyValueSeq *
+ACE_INLINE
+::Messaging::PolicyValueSeq *
 Messaging::PolicyValueSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE Messaging::PolicyValue &
+ACE_INLINE
+Messaging::PolicyValue &
 Messaging::PolicyValueSeq_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/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_
 #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_
@@ -614,6 +699,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const Messaging::PolicyValue::_tao_seq_Octet &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     Messaging::PolicyValue::_tao_seq_Octet &
@@ -621,30 +707,49 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::PolicyValue &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const Messaging::PolicyValue &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.ptype) &&
     (strm << _tao_aggregate.pvalue)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValue &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    Messaging::PolicyValue &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.ptype) &&
     (strm >> _tao_aggregate.pvalue)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_I_
 #define _TAO_CDR_OP_Messaging_PolicyValueSeq_I_
@@ -653,6 +758,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const Messaging::PolicyValueSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     Messaging::PolicyValueSeq &
diff --git a/TAO/tao/Messaging_SyncScope.pidl b/TAO/tao/Messaging_SyncScope.pidl
index 5d22dddd296..d4abd8b816f 100644
--- a/TAO/tao/Messaging_SyncScope.pidl
+++ b/TAO/tao/Messaging_SyncScope.pidl
@@ -9,9 +9,9 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Gv
+ *        -o orig -Gp -Gd
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=corbafwd.h
+ *        -Wb,export_include=tao/corbafwd.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        Messaging_SyncScope.pidl
@@ -44,6 +44,4 @@ module Messaging
   const SyncScope SYNC_WITH_TARGET    = 3;
 };
 
-#pragma prefix ""
-
 #endif /* TAO_MESSAGING_SYNCSCOPE_PIDL */
diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp
index 3641e838993..119a8e51a86 100644
--- a/TAO/tao/Messaging_SyncScopeC.cpp
+++ b/TAO/tao/Messaging_SyncScopeC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Messaging_SyncScopeC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "Messaging_SyncScopeC.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -31,24 +34,27 @@
 #include "Messaging_SyncScopeC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_Messaging_SyncScope[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f5379),
-  ACE_NTOHL (0x6e635363),
-  ACE_NTOHL (0x6f70653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5379), 
+  ACE_NTOHL (0x6e635363), 
+  ACE_NTOHL (0x6f70653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/SyncScope:1.0
-  10,
-  ACE_NTOHL (0x53796e63),
-  ACE_NTOHL (0x53636f70),
+    10,
+  ACE_NTOHL (0x53796e63), 
+  ACE_NTOHL (0x53636f70), 
   ACE_NTOHL (0x65000000),  // name = SyncScope
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -62,22 +68,10 @@ static CORBA::TypeCode _tc_TAO_tc_Messaging_SyncScope (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_SyncScope, &_tc_TAO_tc_Messaging_SyncScope)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_SyncScope,
+    &_tc_TAO_tc_Messaging_SyncScope
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_NONE, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TRANSPORT, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_SERVER, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TARGET, 3)
-TAO_NAMESPACE_END
diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h
index a9f44b15b5e..2b4ed88e016 100644
--- a/TAO/tao/Messaging_SyncScopeC.h
+++ b/TAO/tao/Messaging_SyncScopeC.h
@@ -19,12 +19,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_MESSAGING_SYNCSCOPEC_H_
 #define _TAO_IDL_ORIG_MESSAGING_SYNCSCOPEC_H_
 
 #include "ace/pre.h"
 
-#include "corbafwd.h"
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -53,30 +56,61 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  Messaging
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short SyncScope;
   typedef CORBA::Short_out SyncScope_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_SyncScope;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_NONE;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TRANSPORT;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_SERVER;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SYNC_NONE = 0;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SYNC_WITH_TRANSPORT = 1;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SYNC_WITH_SERVER = 2;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SYNC_WITH_TARGET = 3;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module Messaging
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_SyncScopeC.i"
@@ -92,3 +126,4 @@ TAO_NAMESPACE_CLOSE // module Messaging
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging_SyncScopeC.i b/TAO/tao/Messaging_SyncScopeC.i
index 95f0b8ea192..e86a7e25a26 100644
--- a/TAO/tao/Messaging_SyncScopeC.i
+++ b/TAO/tao/Messaging_SyncScopeC.i
@@ -18,3 +18,5 @@
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index 303e51ea3b7..014f76d5eef 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -133,35 +133,28 @@ CORBA::NVList::add_value (const char *name,
                           CORBA::Flags flags
                           ACE_ENV_ARG_DECL)
 {
-  // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags
+  // Call the helper to allocate a NamedValue element.
+  CORBA::NamedValue_ptr nv = this->add_element (flags 
                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
+
   if (nv)
     {
-      // now initialize the fields
       nv->name_ = CORBA::string_dup (name);
-      if (ACE_BIT_ENABLED (flags, CORBA::IN_COPY_VALUE))
-        // IN_COPY_VALUE means that the parameter is not "borrowed" by
-        // the ORB, but rather that the ORB copies its value.
-        //
-        // Initialize the newly allocated memory using a copy
-        // constructor that places the new "Any" value at just the right
-        // place, and makes a "deep copy" of the data.
-        nv->any_ = value;
-      else
-        {
-          // The normal behaviour for parameters is that the ORB "borrows"
-          // their memory for the duration of calls.
-          //
-          nv->any_._tao_replace (value.type_.in (),
-                                 value.byte_order_,
-                                 value.cdr_);
-        }
+
+      // With the original Any implementation, we had alternate
+      // paths for the assignment based on the IN_COPY_VALUE flag.
+      // Now that the Any's contained Any_Impl is refcounted, the
+      // distinction between the ORB "copying" or "borrowing" the
+      // memory is irrelevant. The IN_COPY_VALUE flag was not
+      // checked anywhere else in the ORB anyway.
+      nv->any_ = value;
       return nv;
     }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
 // add an element and just initialize its flags and name
@@ -293,7 +286,7 @@ CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
     {
       this->_tao_decode (cdr,
                          flag
-                          ACE_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       return;
     }
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_);
@@ -309,11 +302,14 @@ CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
 
 void
 CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
-                            TAO_ORB_Core *orb_core,
+                            TAO_ORB_Core *,
                             int flag
                             ACE_ENV_ARG_DECL)
 {
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, 
+             ace_mon, 
+             this->refcount_lock_);
+
   if (this->incoming_ != 0)
     {
       if (this->max_ == 0)
@@ -338,20 +334,25 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
           CORBA::NamedValue_ptr nv = *item;
 
           if (ACE_BIT_DISABLED (nv->flags (), flag))
-            continue;
+            {
+              continue;
+            }
 
           if (TAO_debug_level > 3)
             {
               const char* arg = nv->name ();
+
               if (arg == 0)
-                arg = "(nil)";
+                {
+                  arg = "(nil)";
+                }
 
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("NVList::_tao_encode - parameter <%s>\n"),
                           arg));
             }
-          CORBA::TypeCode_var tc = nv->value ()->type ();
-          (void) TAO_Marshal_Object::perform_append (tc.in (),
+          CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode ();
+          (void) TAO_Marshal_Object::perform_append (tc,
                                                      this->incoming_,
                                                      &cdr
                                                      ACE_ENV_ARG_PARAMETER);
@@ -377,12 +378,11 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
       CORBA::NamedValue_ptr nv = *item;
 
       if (ACE_BIT_DISABLED (nv->flags (), flag))
-        continue;
+        {
+          continue;
+        }
 
-      nv->value ()->_tao_encode (cdr,
-                                 orb_core
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      nv->value ()->impl ()->marshal_value (cdr);
     }
 }
 
@@ -392,7 +392,10 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
                             ACE_ENV_ARG_DECL)
 {
   if (TAO_debug_level > 3)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG, 
+                  ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n")));
+    }
 
   // Then unmarshal each "in" and "inout" parameter.
   ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> i (this->values_);
@@ -409,16 +412,22 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
       //    a Server-side request, we could probably handle both
       //    cases with a flag, but there is no clear need for that.
       if (ACE_BIT_DISABLED (nv->flags (), flag))
-        continue;
+        {
+          continue;
+        }
 
       if (TAO_debug_level > 3)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"),
-                    nv->name ()?nv->name ():"(no name given)" ));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"),
+                      nv->name ()? nv->name () : "(no name given)" ));
+        }
 
       CORBA::Any_ptr any = nv->value ();
-      any->_tao_decode (incoming
-                        ACE_ENV_ARG_PARAMETER);
+
+      // We can be sure that the impl is a TAO::Unknown_IDL_Type.
+      any->impl ()->_tao_decode (incoming
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -426,10 +435,15 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
 ptr_arith_t
 CORBA::NVList::_tao_target_alignment (void)
 {
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                    ace_mon, 
+                    this->refcount_lock_,
                     ACE_CDR::MAX_ALIGNMENT);
+
   if (this->incoming_ == 0)
-    return ACE_CDR::MAX_ALIGNMENT;
+    {
+      return ACE_CDR::MAX_ALIGNMENT;
+    }
 
   const char* rd = this->incoming_->start ()->rd_ptr ();
   return ptr_arith_t(rd) % ACE_CDR::MAX_ALIGNMENT;
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 893fd4f9d64..fc9a8bee1a6 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1,3 +1,5 @@
+// "$Id$"
+
 #include "ORB.h"
 
 ACE_RCSID (tao,
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index f9b1e992ac7..7f80cd78514 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -25,8 +25,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Exception.h"
-#include "Services.h"
+#include "ServicesC.h"
 #include "CORBA_String.h"
+#include "ObjectIdListC.h"
 #include "objectid.h"
 
 // IRIX needs this for the throw specs
@@ -60,6 +61,11 @@ class TAO_ValueFactory_Map;
 
 namespace CORBA
 {
+  class EnumMemberSeq;
+  class StructMemberSeq;
+  class UnionMemberSeq;
+  class ValueMemberSeq;
+
   class ORB_ObjectIdList;
   class ORB_ObjectIdList_var;
   class ORB_ObjectIdList_out;
@@ -407,8 +413,9 @@ namespace CORBA
     void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::Object_ptr resolve_initial_references (
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        const char *name
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
 
     /**
      * This method acts as a mini-bootstrapping Naming Service, which is
@@ -498,11 +505,10 @@ namespace CORBA
     /// Factory method that creates an ORB.
     static CORBA::ORB_ptr _tao_make_ORB (TAO_ORB_Core * orb_core);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     // Useful for template programming.
     typedef ORB_ptr _ptr_type;
     typedef ORB_var _var_type;
-#endif /* __GNUC__ */
+
 
     /// Get the Timeout value
     ACE_Time_Value *get_timeout (void);
@@ -614,7 +620,6 @@ namespace CORBA
 
   private:
     CORBA::ORB_ptr ptr_;
-
   };
 
   /**
@@ -640,7 +645,6 @@ namespace CORBA
   private:
     CORBA::ORB_ptr &ptr_;
   };
-
 }  // End namespace CORBA
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index fe71e8837eb..13192f0871f 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -19,7 +19,7 @@
 
 #include "Object_Loader.h"
 
-#include "ObjectIDList.h"
+#include "ObjectIDListC.h"
 
 #include "Services_Activate.h"
 #include "Invocation.h"
@@ -2153,7 +2153,7 @@ TAO_ORB_Core::resolve_rir (const char *name
   return CORBA::Object::_nil ();
 }
 
-CORBA::ORB::ObjectIdList_ptr
+CORBA::ORB::ObjectIdList *
 TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Unsupported initial services should NOT be included in the below list!
@@ -2169,7 +2169,7 @@ TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL)
     + this->init_ref_map_.current_size ()
     + this->object_ref_table_.current_size ();
 
-  CORBA::ORB::ObjectIdList_ptr tmp = 0;
+  CORBA::ORB::ObjectIdList *tmp = 0;
 
   ACE_NEW_THROW_EX (tmp,
                     CORBA::ORB::ObjectIdList (total_size),
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 71b78d222f2..9819b009388 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -747,8 +747,9 @@ public:
   void portable_group_poa_hooks(TAO_POA_PortableGroup_Hooks *poa_hooks);
 
   /// List all the service known by the ORB
-  CORBA::ORB::ObjectIdList_ptr list_initial_references (
-    ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::ORB_ObjectIdList *list_initial_references (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+    );
 
   /// Reference counting...
   CORBA::ULong _incr_refcnt (void);
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 57865a54491..2b7a2cf7a2b 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -211,7 +211,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj
 
 // TAO's extensions
 
-TAO_ObjectKey *
+TAO::ObjectKey *
 CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->_stubobj () && this->_stubobj ()->profile_in_use ())
@@ -230,7 +230,7 @@ CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL)
                     0);
 }
 
-const TAO_ObjectKey &
+const TAO::ObjectKey &
 CORBA::Object::_object_key (void)
 {
   return this->_stubobj ()->profile_in_use ()->object_key ();
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 0c8fa95ede0..5c5dc1ad498 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -28,6 +28,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Policy_ForwardC.h"
+#include "tao/Object_KeyC.h"
 #include "ace/Synch.h"
 
 class TAO_Stub;
@@ -37,6 +38,9 @@ class TAO_ObjectKey;
 
 namespace CORBA
 {
+  class InterfaceDef;
+  typedef InterfaceDef *InterfaceDef_ptr;
+
   /**
    * @class Object
    *
@@ -100,20 +104,24 @@ namespace CORBA
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
     virtual CORBA::Boolean _non_existent (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
 
     /// This method is deprecated in the CORBA 2.2 spec, we just return 0
     /// every time.
     virtual CORBA::ImplementationDef_ptr _get_implementation (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
 
     /// Get info about the object from the Interface Repository.
-    virtual CORBA::InterfaceDef_ptr _get_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    virtual InterfaceDef_ptr _get_interface (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
 
     /// Get info about the object from the Interface Repository.
     virtual CORBA::Object_ptr _get_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
 
     // DII operations to create a request.
     //
@@ -195,24 +203,22 @@ namespace CORBA
 
     /// Return the object key as an out parameter.  Caller should release
     /// return value when finished with it.
-    virtual TAO_ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
+    virtual TAO::ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
 
     /**
      * Return a reference to the object key of profile in-use.
      * If there's no in-use profile, then the program will
      * probably crash.  This method does not create a new copy.
      */
-    virtual const TAO_ObjectKey &_object_key (void);
+    virtual const TAO::ObjectKey &_object_key (void);
 
     /// Downcasting this object pointer to some other derived class.
     /// This QueryInterface stuff only work for local object.
     virtual void * _tao_QueryInterface (ptr_arith_t type);
 
     // Useful for template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     typedef Object_ptr _ptr_type;
     typedef Object_var _var_type;
-#endif /* __GNUC__ */
 
     /**
      * @name Reference Count Managment
@@ -242,6 +248,9 @@ namespace CORBA
     /// Get the proxy broker.
     virtual TAO_Object_Proxy_Broker *_proxy_broker (void);
 
+    /// Allows us to forbid marshaling of local interfaces.
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+
   protected:
 
     /// Initializing a local object.
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index 4e0549d0209..72ca365f31a 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -86,6 +86,12 @@ CORBA::Object::_stubobj (void) const
   return this->protocol_proxy_;
 }
 
+ACE_INLINE CORBA::Boolean
+CORBA::Object::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // *************************************************************
 // Inline operations for class CORBA::Object_var
 // *************************************************************
diff --git a/TAO/tao/ObjectIdList.pidl b/TAO/tao/ObjectIdList.pidl
new file mode 100644
index 00000000000..487d8051700
--- /dev/null
+++ b/TAO/tao/ObjectIdList.pidl
@@ -0,0 +1,53 @@
+/**
+ * @file ObjectIdList.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the CORBA::ORB::ObjectIdList related
+ * types.
+ *
+ * This file is used to generate the code in ObjectIdListC.{h,i,cpp}.
+ *
+ *   The steps to regenerate the code are as follows:
+ *
+ *   1. Run the tao_idl compiler on the patched pidl file.  The
+ *   command used for this is:
+ *
+ *     tao_idl.exe
+ *        -o orig -Gp -Gd -Ge 1
+ *          -Wb,export_macro=TAO_Export
+ *          -Wb,export_include="tao/corbafwd.h"
+ *          -Wb,pre_include="ace/pre.h"
+ *          -Wb,post_include="ace/post.h"
+ *          ObjectIdList.pidl
+ *
+ *   2. Then patch the generated code. This patch (1) eliminates
+ *   unnecessary includes (2) replaces the flat names and ids in
+ *   the generated typecodes with the proper scoped names.
+ *
+ *   Apply patches using the following commands:
+ *
+ *   cp orig/ObjectIdListC.{h,i,cpp} .
+ *   patch < diffs/ObjectIdList.diff
+ *
+ *   Note: The diffs were generated with these commands:
+ *
+ *   for i in ObjectIdListC.{h,i,cpp}; do
+ *     diff -wBbu orig/$i $i;
+ *   done > diffs/ObjectIdList.diff
+ */
+
+#ifndef TAO_CORBA_ORB_OBJECTIDLIST_PIDL
+#define TAO_CORBA_ORB_OBJECTIDLIST_PIDL
+
+#pragma prefix "omg.org"
+
+module CORBA
+{
+  typedef string ORB_ObjectId;
+  typedef sequence<ORB_ObjectId> ORB_ObjectIdList;
+};
+
+#endif /* TAO_CORBA_ORB_OBJECTIDLIST_PIDL */
+
+
diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp
new file mode 100644
index 00000000000..cac871e2420
--- /dev/null
+++ b/TAO/tao/ObjectIdListC.cpp
@@ -0,0 +1,279 @@
+// -*- 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
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
+#include "ObjectIdListC.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 */
+
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "ObjectIdListC.i"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ORB_ObjectId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  35,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f52), 
+  ACE_NTOHL (0x422f4f62), 
+  ACE_NTOHL (0x6a656374), 
+  ACE_NTOHL (0x49643a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectId:1.0
+    9,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x0),  // name = ObjectId
+    CORBA::tk_string, 
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectId (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ORB_ObjectId),
+    (char *) &_oc_CORBA_ORB_ObjectId,
+    0,
+    sizeof (CORBA::ORB_ObjectId)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ORB_ObjectId,
+    &_tc_TAO_tc_CORBA_ORB_ObjectId
+  )
+TAO_NAMESPACE_END
+
+#if !defined (_CORBA_ORB_OBJECTIDLIST_CS_)
+#define _CORBA_ORB_OBJECTIDLIST_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
+
+// *************************************************************
+// CORBA::ORB_ObjectIdList
+// *************************************************************
+
+CORBA::ORB_ObjectIdList::ORB_ObjectIdList (void)
+{}
+
+CORBA::ORB_ObjectIdList::ORB_ObjectIdList (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+TAO_Unbounded_String_Sequence
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ORB_ObjectIdList::ORB_ObjectIdList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    char * *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+TAO_Unbounded_String_Sequence
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ORB_ObjectIdList::ORB_ObjectIdList (const ORB_ObjectIdList &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+TAO_Unbounded_String_Sequence
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ORB_ObjectIdList::~ORB_ObjectIdList (void) // dtor
+{}
+
+
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f52), 
+  ACE_NTOHL (0x422f4f62), 
+  ACE_NTOHL (0x6a656374), 
+  ACE_NTOHL (0x49644c69), 
+  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectIdList:1.0
+    13,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x0),  // name = ObjectIdList
+    CORBA::tk_sequence, // typecode kind
+  84, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_alias, // typecode kind for typedefs
+    68, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      35,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4f52), 
+      ACE_NTOHL (0x422f4f62), 
+      ACE_NTOHL (0x6a656374), 
+      ACE_NTOHL (0x49643a31), 
+      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectId:1.0
+            9,
+      ACE_NTOHL (0x4f626a65), 
+      ACE_NTOHL (0x63744964), 
+      ACE_NTOHL (0x0),  // name = ObjectId
+            CORBA::tk_string, 
+      0U, // string length
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectIdList (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ORB_ObjectIdList),
+    (char *) &_oc_CORBA_ORB_ObjectIdList,
+    0,
+    sizeof (CORBA::ORB_ObjectIdList)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ORB_ObjectIdList,
+    &_tc_TAO_tc_CORBA_ORB_ObjectIdList
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ORB_ObjectIdList &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ORB_ObjectIdList &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h
new file mode 100644
index 00000000000..1cee475691d
--- /dev/null
+++ b/TAO/tao/ObjectIdListC.h
@@ -0,0 +1,247 @@
+// -*- 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
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_OBJECTIDLISTC_H_
+#define _TAO_IDL_ORIG_OBJECTIDLISTC_H_
+
+#include "ace/pre.h"
+#include "tao/corbafwd.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Sequence.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
+TAO_NAMESPACE  CORBA
+{
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+  
+  typedef char * ORB_ObjectId;
+  typedef CORBA::String_var ORB_ObjectId_var;
+  typedef CORBA::String_out ORB_ObjectId_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_ORB_ObjectId;
+
+#if !defined (_CORBA_ORB_OBJECTIDLIST_CH_)
+#define _CORBA_ORB_OBJECTIDLIST_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ORB_ObjectIdList;
+  class ORB_ObjectIdList_var;
+  
+  // *************************************************************
+  // CORBA::ORB_ObjectIdList
+  // *************************************************************
+  
+  class TAO_Export ORB_ObjectIdList : 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_String_Sequence
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  {
+  public:
+    ORB_ObjectIdList (void);
+    ORB_ObjectIdList (CORBA::ULong max);
+    ORB_ObjectIdList (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        char * *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ORB_ObjectIdList (const ORB_ObjectIdList &);
+    ~ORB_ObjectIdList (void);
+    
+    typedef ORB_ObjectIdList_var _var_type;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_ORB_OBJECTIDLIST___VAR_CH_)
+#define _CORBA_ORB_OBJECTIDLIST___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
+  // *************************************************************
+  // class CORBA::ORB_ObjectIdList_var
+  // *************************************************************
+  
+  class TAO_Export ORB_ObjectIdList_var
+  {
+  public:
+    ORB_ObjectIdList_var (void);
+    ORB_ObjectIdList_var (ORB_ObjectIdList *);
+    ORB_ObjectIdList_var (const ORB_ObjectIdList_var &);
+    ~ORB_ObjectIdList_var (void);
+    
+    ORB_ObjectIdList_var &operator= (ORB_ObjectIdList *);
+    ORB_ObjectIdList_var &operator= (const ORB_ObjectIdList_var &);
+    ORB_ObjectIdList *operator-> (void);
+    const ORB_ObjectIdList *operator-> (void) const;
+    
+    operator const ORB_ObjectIdList &() const;
+    operator ORB_ObjectIdList &();
+    operator ORB_ObjectIdList &() const;
+    
+    // Variable-size base types only.
+    operator ORB_ObjectIdList *&();
+    
+    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+    
+    // in, inout, out, _retn 
+    const ORB_ObjectIdList &in (void) const;
+    ORB_ObjectIdList &inout (void);
+    ORB_ObjectIdList *&out (void);
+    ORB_ObjectIdList *_retn (void);
+    ORB_ObjectIdList *ptr (void) const;
+  
+  private:
+    ORB_ObjectIdList *ptr_;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_ORB_OBJECTIDLIST___OUT_CH_)
+#define _CORBA_ORB_OBJECTIDLIST___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_Export ORB_ObjectIdList_out
+  {
+  public:
+    ORB_ObjectIdList_out (ORB_ObjectIdList *&);
+    ORB_ObjectIdList_out (ORB_ObjectIdList_var &);
+    ORB_ObjectIdList_out (const ORB_ObjectIdList_out &);
+    ORB_ObjectIdList_out &operator= (const ORB_ObjectIdList_out &);
+    ORB_ObjectIdList_out &operator= (ORB_ObjectIdList *);
+    operator ORB_ObjectIdList *&();
+    ORB_ObjectIdList *&ptr (void);
+    ORB_ObjectIdList *operator-> (void);
+    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+  
+  private:
+    ORB_ObjectIdList *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ORB_ObjectIdList_var &);
+  };
+
+#endif /* end #if !defined */
+  
+  // 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_ORB_ObjectIdList;
+
+// 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_root/cdr_op.cpp:48
+
+#ifndef __ACE_INLINE__
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_
+#define _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ORB_ObjectIdList &
+  );
+TAO_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ORB_ObjectIdList &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
+#endif /* __ACE_INLINE__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
+
+#if defined (__ACE_INLINE__)
+#include "ObjectIdListC.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/ObjectIdListC.i b/TAO/tao/ObjectIdListC.i
new file mode 100644
index 00000000000..79872ac40be
--- /dev/null
+++ b/TAO/tao/ObjectIdListC.i
@@ -0,0 +1,278 @@
+// -*- 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
+
+
+#if !defined (_CORBA_ORB_OBJECTIDLIST_CI_)
+#define _CORBA_ORB_OBJECTIDLIST_CI_
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
+// *************************************************************
+// Inline operations for class CORBA::ORB_ObjectIdList_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (ORB_ObjectIdList *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (const ::CORBA::ORB_ObjectIdList_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ORB_ObjectIdList (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ORB_ObjectIdList_var::~ORB_ObjectIdList_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ORB_ObjectIdList_var &
+CORBA::ORB_ObjectIdList_var::operator= (ORB_ObjectIdList *p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ORB_ObjectIdList_var &
+CORBA::ORB_ObjectIdList_var::operator= (const ::CORBA::ORB_ObjectIdList_var &p)
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ORB_ObjectIdList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ORB_ObjectIdList (*p.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ORB_ObjectIdList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+const ::CORBA::ORB_ObjectIdList *
+CORBA::ORB_ObjectIdList_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ORB_ObjectIdList *
+CORBA::ORB_ObjectIdList_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ORB_ObjectIdList_var::operator const ::CORBA::ORB_ObjectIdList &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ORB_ObjectIdList_var::operator ::CORBA::ORB_ObjectIdList &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ORB_ObjectIdList_var::operator ::CORBA::ORB_ObjectIdList &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ORB_ObjectIdList_var::operator ::CORBA::ORB_ObjectIdList *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_SeqElem_String_Manager
+CORBA::ORB_ObjectIdList_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE
+const ::CORBA::ORB_ObjectIdList &
+CORBA::ORB_ObjectIdList_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ORB_ObjectIdList &
+CORBA::ORB_ObjectIdList_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ORB_ObjectIdList *&
+CORBA::ORB_ObjectIdList_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ORB_ObjectIdList *
+CORBA::ORB_ObjectIdList_var::_retn (void)
+{
+  ::CORBA::ORB_ObjectIdList *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE
+::CORBA::ORB_ObjectIdList *
+CORBA::ORB_ObjectIdList_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
+
+// *************************************************************
+// Inline operations for class CORBA::ORB_ObjectIdList_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (ORB_ObjectIdList *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (ORB_ObjectIdList_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (const ::CORBA::ORB_ObjectIdList_out &p)
+  : ptr_ (ACE_const_cast (ORB_ObjectIdList_out&, p).ptr_)
+{}
+
+ACE_INLINE
+::CORBA::ORB_ObjectIdList_out &
+CORBA::ORB_ObjectIdList_out::operator= (const ::CORBA::ORB_ObjectIdList_out &p)
+{
+  this->ptr_ = ACE_const_cast (ORB_ObjectIdList_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ORB_ObjectIdList_out &
+CORBA::ORB_ObjectIdList_out::operator= (ORB_ObjectIdList *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ORB_ObjectIdList_out::operator ::CORBA::ORB_ObjectIdList *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ORB_ObjectIdList *&
+CORBA::ORB_ObjectIdList_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA::ORB_ObjectIdList *
+CORBA::ORB_ObjectIdList_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_SeqElem_String_Manager
+CORBA::ORB_ObjectIdList_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/cdr_op_ci.cpp:84
+
+#if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_I_
+#define _TAO_CDR_OP_CORBA_ORB_ObjectIdList_I_
+
+CORBA::Boolean TAO_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ORB_ObjectIdList &
+  );
+
+CORBA::Boolean TAO_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ORB_ObjectIdList &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_I_ */
+
diff --git a/TAO/tao/ObjectReferenceTemplate.pidl b/TAO/tao/ObjectReferenceTemplate.pidl
index 70765a22e3b..037c785a0ea 100644
--- a/TAO/tao/ObjectReferenceTemplate.pidl
+++ b/TAO/tao/ObjectReferenceTemplate.pidl
@@ -11,9 +11,9 @@
  * using the following command:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
+ *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        ObjectReferenceTemplate.pidl
diff --git a/TAO/tao/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjectReferenceTemplateC.cpp
index 91009bc9cfc..6974a4678e6 100644
--- a/TAO/tao/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjectReferenceTemplateC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ObjectReferenceTemplateC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "ObjectReferenceTemplateC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -40,27 +43,30 @@
 #include "ObjectReferenceTemplateC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ServerId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724964),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724964), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerId:1.0
-  9,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724964),
+    9,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724964), 
   ACE_NTOHL (0x0),  // name = ServerId
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -74,28 +80,35 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServerId, &_tc_TAO_tc_PortableInterceptor_ServerId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServerId,
+    &_tc_TAO_tc_PortableInterceptor_ServerId
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ORBId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f524249),
-  ACE_NTOHL (0x643a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x643a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBId:1.0
-  6,
-  ACE_NTOHL (0x4f524249),
+    6,
+  ACE_NTOHL (0x4f524249), 
   ACE_NTOHL (0x64000000),  // name = ORBId
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -109,49 +122,56 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ORBId, &_tc_TAO_tc_PortableInterceptor_ORBId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ORBId,
+    &_tc_TAO_tc_PortableInterceptor_ORBId
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_AdapterName[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x7465724e),
-  ACE_NTOHL (0x616d653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724e), 
+  ACE_NTOHL (0x616d653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterName:1.0
-  12,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x7465724e),
+    12,
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724e), 
   ACE_NTOHL (0x616d6500),  // name = AdapterName
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5374),
-    ACE_NTOHL (0x72696e67),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5374), 
+    ACE_NTOHL (0x72696e67), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-    10,
-    ACE_NTOHL (0x53747269),
-    ACE_NTOHL (0x6e675365),
+        10,
+    ACE_NTOHL (0x53747269), 
+    ACE_NTOHL (0x6e675365), 
     ACE_NTOHL (0x71000000),  // name = StringSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_string,
+      CORBA::tk_string, 
       0U, // string length
       0U,
 
@@ -168,46 +188,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterName (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_AdapterName, &_tc_TAO_tc_PortableInterceptor_AdapterName)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_AdapterName,
+    &_tc_TAO_tc_PortableInterceptor_AdapterName
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ObjectId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744964),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectId:1.0
-  9,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744964),
+    9,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
   ACE_NTOHL (0x0),  // name = ObjectId
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f63),
-    ACE_NTOHL (0x74657453),
-    ACE_NTOHL (0x65713a31),
+    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),
+        9,
+    ACE_NTOHL (0x4f637465), 
+    ACE_NTOHL (0x74536571), 
     ACE_NTOHL (0x0),  // name = OctetSeq
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     12, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_octet,
@@ -227,40 +254,47 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableInterceptor_ObjectId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectId,
+    &_tc_TAO_tc_PortableInterceptor_ObjectId
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636546),
-  ACE_NTOHL (0x6163746f),
-  ACE_NTOHL (0x72793a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636546), 
+  ACE_NTOHL (0x6163746f), 
+  ACE_NTOHL (0x72793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0
-  23,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636546),
-  ACE_NTOHL (0x6163746f),
+    23,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636546), 
+  ACE_NTOHL (0x6163746f), 
   ACE_NTOHL (0x72790000),  // name = ObjectReferenceFactory
-  2, // value modifier
+    2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
 
-  0, // member count
-};
+0, // member count
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory (
     CORBA::tk_value,
@@ -272,9 +306,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectReferenceFactory, &_tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectReferenceFactory,
+    &_tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95
+
 void
 tao_PortableInterceptor_ObjectReferenceFactory_add_ref (
     PortableInterceptor::ObjectReferenceFactory *p
@@ -291,11 +332,14 @@ tao_PortableInterceptor_ObjectReferenceFactory_remove_ref (
   CORBA::remove_ref (p);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298
+
 // *************************************************************
 // Operations for class PortableInterceptor::ObjectReferenceFactory_var
 // *************************************************************
 
-PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (void) // default constructor
+PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (void)
   : ptr_ (0)
 {}
 
@@ -304,16 +348,16 @@ PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (Obj
 {}
 
 PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory* p)
-  : ptr_ (ACE_const_cast(ObjectReferenceFactory*, p))
+  : ptr_ (ACE_const_cast (ObjectReferenceFactory *, p))
 {}
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory *
 PortableInterceptor::ObjectReferenceFactory_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory_var &p) // copy constructor
+PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory_var &p)
 {
   CORBA::add_ref (p.ptr ());
   this->ptr_ = p.ptr ();
@@ -325,7 +369,7 @@ PortableInterceptor::ObjectReferenceFactory_var::~ObjectReferenceFactory_var (vo
 }
 
 PortableInterceptor::ObjectReferenceFactory_var &
-PortableInterceptor::ObjectReferenceFactory_var::operator= (ObjectReferenceFactory* p)
+PortableInterceptor::ObjectReferenceFactory_var::operator= (ObjectReferenceFactory *p)
 {
   CORBA::remove_ref (this->ptr_);
   this->ptr_ = p;
@@ -338,10 +382,11 @@ PortableInterceptor::ObjectReferenceFactory_var::operator= (const ObjectReferenc
   if (this != &p)
   {
     CORBA::remove_ref (this->ptr_);
-    ObjectReferenceFactory* tmp = p.ptr ();
+    ObjectReferenceFactory *tmp = p.ptr ();
     CORBA::add_ref (tmp);
     this->ptr_ = tmp;
   }
+  
   return *this;
 }
 
@@ -350,30 +395,30 @@ PortableInterceptor::ObjectReferenceFactory_var::operator const PortableIntercep
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory_var::operator PortableInterceptor::ObjectReferenceFactory* () // cast
+PortableInterceptor::ObjectReferenceFactory_var::operator PortableInterceptor::ObjectReferenceFactory*& () // cast 
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory *
 PortableInterceptor::ObjectReferenceFactory_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory *
 PortableInterceptor::ObjectReferenceFactory_var::in (void) const
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory* &
+PortableInterceptor::ObjectReferenceFactory *&
 PortableInterceptor::ObjectReferenceFactory_var::inout (void)
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory* &
+PortableInterceptor::ObjectReferenceFactory *&
 PortableInterceptor::ObjectReferenceFactory_var::out (void)
 {
   CORBA::remove_ref (this->ptr_);
@@ -381,7 +426,7 @@ PortableInterceptor::ObjectReferenceFactory_var::out (void)
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory *
 PortableInterceptor::ObjectReferenceFactory_var::_retn (void)
 {
   // yield ownership of managed obj reference
@@ -406,118 +451,125 @@ PortableInterceptor::ObjectReferenceFactory_var::tao_remove_ref (
   CORBA::remove_ref (p);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568
+
 // *************************************************************
 // Operations for class PortableInterceptor::ObjectReferenceFactory_out
 // *************************************************************
 
-PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory* &p)
+PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
-PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory_var &p) // constructor from _var
+PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory_var &p)
   : ptr_ (p.out ())
 {
   CORBA::remove_ref (this->ptr_);
   this->ptr_ = 0;
 }
 
-PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (const ObjectReferenceFactory_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ObjectReferenceFactory_out&,p).ptr_)
+PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (const ObjectReferenceFactory_out &p)
+  : ptr_ (ACE_const_cast (ObjectReferenceFactory_out&, p).ptr_)
 {}
 
 PortableInterceptor::ObjectReferenceFactory_out &
 PortableInterceptor::ObjectReferenceFactory_out::operator= (const ObjectReferenceFactory_out &p)
 {
-  this->ptr_ = ACE_const_cast (ObjectReferenceFactory_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (ObjectReferenceFactory_out&, p).ptr_;
   return *this;
 }
 
 PortableInterceptor::ObjectReferenceFactory_out &
 PortableInterceptor::ObjectReferenceFactory_out::operator= (const ObjectReferenceFactory_var &p)
 {
-  ObjectReferenceFactory* tmp = p.ptr ();
+  ObjectReferenceFactory *tmp = p.ptr ();
   CORBA::add_ref (tmp);
   this->ptr_ = tmp;
   return *this;
 }
 
 PortableInterceptor::ObjectReferenceFactory_out &
-PortableInterceptor::ObjectReferenceFactory_out::operator= (ObjectReferenceFactory* p)
+PortableInterceptor::ObjectReferenceFactory_out::operator= (ObjectReferenceFactory *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-PortableInterceptor::ObjectReferenceFactory_out::operator PortableInterceptor::ObjectReferenceFactory* &() // cast
+PortableInterceptor::ObjectReferenceFactory_out::operator PortableInterceptor::ObjectReferenceFactory*& () // cast
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory* &
+PortableInterceptor::ObjectReferenceFactory *&
 PortableInterceptor::ObjectReferenceFactory_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory*
+PortableInterceptor::ObjectReferenceFactory *
 PortableInterceptor::ObjectReferenceFactory_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceFactory* PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase* v)
+// *************************************************************
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138
+
+PortableInterceptor::ObjectReferenceFactory *
+PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v)
 {
   if (v == 0)
     {
       return 0;
     }
-
-  return (ObjectReferenceFactory* ) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
+  
+  return (ObjectReferenceFactory *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
 }
 
-const char* PortableInterceptor::ObjectReferenceFactory::_tao_obv_repository_id () const
+const char *
+PortableInterceptor::ObjectReferenceFactory::_tao_obv_repository_id (void) const
 {
   return this->_tao_obv_static_repository_id ();
 }
 
-#if defined (_MSC_VER)
 void *
-PortableInterceptor::ObjectReferenceFactory::PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (
-    ptr_arith_t type_id
-  )
-{
-  return this->_tao_obv_narrow (type_id);
-}
+#if defined (_MSC_VER)
+PortableInterceptor::ObjectReferenceFactory::PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (ptr_arith_t type_id)
+#else
+PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t type_id)
 #endif /* _MSC_VER */
-
-void* PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t type_id)
 {
   if (type_id == (ptr_arith_t) &_downcast)
     {
       return this;
     }
-
+  
   void *rval = 0;
-
+  
   return rval;
 }
 
-CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_marshal_v (TAO_OutputCDR &)
+#if defined (_MSC_VER)
+void *
+PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t type_id)
 {
-  return 0;
-}
-
-CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal_v (TAO_InputCDR &)
-{
-  return 0;
+  return this->PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (type_id);
 }
+#endif /* _MSC_VER */
 
 void
 PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ObjectReferenceFactory *tmp = ACE_static_cast (ObjectReferenceFactory*, _tao_void_pointer);
+  ObjectReferenceFactory *tmp =
+    ACE_static_cast (
+        ObjectReferenceFactory *,
+        _tao_void_pointer
+      );
   delete tmp;
 }
 
@@ -526,7 +578,7 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
     ObjectReferenceFactory *&new_object
   )
 {
-  CORBA::ValueBase *base;
+  CORBA::ValueBase *base = 0;
   CORBA::ValueFactory_var factory;
   CORBA::Boolean retval =
     CORBA::ValueBase::_tao_unmarshal_pre (
@@ -535,63 +587,69 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
         base,
         ObjectReferenceFactory::_tao_obv_static_repository_id ()
       );
-
-  if (retval == 0 || factory.in() == 0)
+  
+  if (retval == 0)
     {
       return 0;
     }
-
-  base = factory->create_for_unmarshal ();
-
-  if (base == 0)
-    {
-      return 0;  // %! except.?
-    }
-
-  retval = base->_tao_unmarshal_v (strm);
-
-  if (retval == 0)
+  
+  if (factory.in () != 0)
     {
-      return 0;
+      base = factory->create_for_unmarshal ();
+      
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
+      
+      retval = base->_tao_unmarshal_v (strm);
+      
+      if (retval == 0)
+        {
+          return 0;
+        }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceFactory::_downcast (base);
   return retval;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x6174653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x6174653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
-  24,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
+    24,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
   ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
-  2, // value modifier
+    2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
 
-  3, // member count
-};
+3, // member count
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate (
     CORBA::tk_value,
@@ -603,9 +661,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectReferenceTemplate, &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectReferenceTemplate,
+    &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95
+
 void
 tao_PortableInterceptor_ObjectReferenceTemplate_add_ref (
     PortableInterceptor::ObjectReferenceTemplate *p
@@ -622,11 +687,14 @@ tao_PortableInterceptor_ObjectReferenceTemplate_remove_ref (
   CORBA::remove_ref (p);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298
+
 // *************************************************************
 // Operations for class PortableInterceptor::ObjectReferenceTemplate_var
 // *************************************************************
 
-PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (void) // default constructor
+PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (void)
   : ptr_ (0)
 {}
 
@@ -635,16 +703,16 @@ PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (O
 {}
 
 PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate* p)
-  : ptr_ (ACE_const_cast(ObjectReferenceTemplate*, p))
+  : ptr_ (ACE_const_cast (ObjectReferenceTemplate *, p))
 {}
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate *
 PortableInterceptor::ObjectReferenceTemplate_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &p) // copy constructor
+PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &p)
 {
   CORBA::add_ref (p.ptr ());
   this->ptr_ = p.ptr ();
@@ -656,7 +724,7 @@ PortableInterceptor::ObjectReferenceTemplate_var::~ObjectReferenceTemplate_var (
 }
 
 PortableInterceptor::ObjectReferenceTemplate_var &
-PortableInterceptor::ObjectReferenceTemplate_var::operator= (ObjectReferenceTemplate* p)
+PortableInterceptor::ObjectReferenceTemplate_var::operator= (ObjectReferenceTemplate *p)
 {
   CORBA::remove_ref (this->ptr_);
   this->ptr_ = p;
@@ -669,10 +737,11 @@ PortableInterceptor::ObjectReferenceTemplate_var::operator= (const ObjectReferen
   if (this != &p)
   {
     CORBA::remove_ref (this->ptr_);
-    ObjectReferenceTemplate* tmp = p.ptr ();
+    ObjectReferenceTemplate *tmp = p.ptr ();
     CORBA::add_ref (tmp);
     this->ptr_ = tmp;
   }
+  
   return *this;
 }
 
@@ -681,30 +750,30 @@ PortableInterceptor::ObjectReferenceTemplate_var::operator const PortableInterce
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate_var::operator PortableInterceptor::ObjectReferenceTemplate* () // cast
+PortableInterceptor::ObjectReferenceTemplate_var::operator PortableInterceptor::ObjectReferenceTemplate*& () // cast 
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate *
 PortableInterceptor::ObjectReferenceTemplate_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate *
 PortableInterceptor::ObjectReferenceTemplate_var::in (void) const
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate* &
+PortableInterceptor::ObjectReferenceTemplate *&
 PortableInterceptor::ObjectReferenceTemplate_var::inout (void)
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate* &
+PortableInterceptor::ObjectReferenceTemplate *&
 PortableInterceptor::ObjectReferenceTemplate_var::out (void)
 {
   CORBA::remove_ref (this->ptr_);
@@ -712,7 +781,7 @@ PortableInterceptor::ObjectReferenceTemplate_var::out (void)
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate *
 PortableInterceptor::ObjectReferenceTemplate_var::_retn (void)
 {
   // yield ownership of managed obj reference
@@ -737,101 +806,106 @@ PortableInterceptor::ObjectReferenceTemplate_var::tao_remove_ref (
   CORBA::remove_ref (p);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568
+
 // *************************************************************
 // Operations for class PortableInterceptor::ObjectReferenceTemplate_out
 // *************************************************************
 
-PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate* &p)
+PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
-PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &p) // constructor from _var
+PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &p)
   : ptr_ (p.out ())
 {
   CORBA::remove_ref (this->ptr_);
   this->ptr_ = 0;
 }
 
-PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ObjectReferenceTemplate_out&,p).ptr_)
+PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &p)
+  : ptr_ (ACE_const_cast (ObjectReferenceTemplate_out&, p).ptr_)
 {}
 
 PortableInterceptor::ObjectReferenceTemplate_out &
 PortableInterceptor::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_out &p)
 {
-  this->ptr_ = ACE_const_cast (ObjectReferenceTemplate_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (ObjectReferenceTemplate_out&, p).ptr_;
   return *this;
 }
 
 PortableInterceptor::ObjectReferenceTemplate_out &
 PortableInterceptor::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_var &p)
 {
-  ObjectReferenceTemplate* tmp = p.ptr ();
+  ObjectReferenceTemplate *tmp = p.ptr ();
   CORBA::add_ref (tmp);
   this->ptr_ = tmp;
   return *this;
 }
 
 PortableInterceptor::ObjectReferenceTemplate_out &
-PortableInterceptor::ObjectReferenceTemplate_out::operator= (ObjectReferenceTemplate* p)
+PortableInterceptor::ObjectReferenceTemplate_out::operator= (ObjectReferenceTemplate *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-PortableInterceptor::ObjectReferenceTemplate_out::operator PortableInterceptor::ObjectReferenceTemplate* &() // cast
+PortableInterceptor::ObjectReferenceTemplate_out::operator PortableInterceptor::ObjectReferenceTemplate*& () // cast
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate* &
+PortableInterceptor::ObjectReferenceTemplate *&
 PortableInterceptor::ObjectReferenceTemplate_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate*
+PortableInterceptor::ObjectReferenceTemplate *
 PortableInterceptor::ObjectReferenceTemplate_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-PortableInterceptor::ObjectReferenceTemplate* PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase* v)
+// *************************************************************
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138
+
+PortableInterceptor::ObjectReferenceTemplate *
+PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
 {
   if (v == 0)
     {
       return 0;
     }
-
-  return (ObjectReferenceTemplate* ) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
+  
+  return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
 }
 
-const char* PortableInterceptor::ObjectReferenceTemplate::_tao_obv_repository_id () const
+const char *
+PortableInterceptor::ObjectReferenceTemplate::_tao_obv_repository_id (void) const
 {
   return this->_tao_obv_static_repository_id ();
 }
 
-#if defined (_MSC_VER)
 void *
-PortableInterceptor::ObjectReferenceTemplate::PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (
-    ptr_arith_t type_id
-  )
-{
-  return this->_tao_obv_narrow (type_id);
-}
+#if defined (_MSC_VER)
+PortableInterceptor::ObjectReferenceTemplate::PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t type_id)
+#else
+PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
 #endif /* _MSC_VER */
-
-void* PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
 {
   if (type_id == (ptr_arith_t) &_downcast)
     {
       return this;
     }
-
+  
   void *rval = 0;
-
+  
   if (rval == 0)
     {
 #if defined (_MSC_VER)
@@ -840,24 +914,26 @@ void* PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t
       rval = this->PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (type_id);
 #endif /* _MSC_VER */
     }
-
+  
   return rval;
 }
 
-CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal_v (TAO_InputCDR &)
+#if defined (_MSC_VER)
+void *
+PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
 {
-  return 0;
+  return this->PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (type_id);
 }
+#endif /* _MSC_VER */
 
 void
 PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ObjectReferenceTemplate *tmp = ACE_static_cast (ObjectReferenceTemplate*, _tao_void_pointer);
+  ObjectReferenceTemplate *tmp =
+    ACE_static_cast (
+        ObjectReferenceTemplate *,
+        _tao_void_pointer
+      );
   delete tmp;
 }
 
@@ -866,7 +942,7 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
     ObjectReferenceTemplate *&new_object
   )
 {
-  CORBA::ValueBase *base;
+  CORBA::ValueBase *base = 0;
   CORBA::ValueFactory_var factory;
   CORBA::Boolean retval =
     CORBA::ValueBase::_tao_unmarshal_pre (
@@ -875,32 +951,37 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-
-  if (retval == 0 || factory.in () == 0)
+  
+  if (retval == 0)
     {
       return 0;
     }
-
-  base = factory->create_for_unmarshal ();
-
-  if (base == 0)
-    {
-      return 0;  // %! except.?
-    }
-
-  retval = base->_tao_unmarshal_v (strm);
-
-  if (retval == 0)
+  
+  if (factory.in () != 0)
     {
-      return 0;
+      base = factory->create_for_unmarshal ();
+      
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
+      
+      retval = base->_tao_unmarshal_v (strm);
+      
+      if (retval == 0)
+        {
+          return 0;
+        }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
   return retval;
 }
 
+// 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)
 
@@ -913,29 +994,30 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec
 {
   PortableInterceptor::ObjectReferenceTemplate **tmp = 0;
   tmp = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    PortableInterceptor::ObjectReferenceTemplate **old = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        if (!this->release_)
-          {
-            if (old[i] != 0)
-              old[i]->_add_ref ();
-            tmp[i] = old[i];
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-      }
-
-    if (this->release_)
-      {
-        delete[] old;
-      }
-  }
+    {
+      PortableInterceptor::ObjectReferenceTemplate **old = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              CORBA::add_ref (old[i]);
+              tmp[i] = old[i];
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -943,16 +1025,18 @@ void
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      if (tmp[i] != 0)
-        tmp[i]->_remove_ref ();
+      CORBA::remove_ref (tmp[i]);
       tmp[i] = 0;
     }
-
+  
   _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -966,97 +1050,117 @@ void
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
-
+  
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      if (tmp[i] != 0)
-        tmp[i]->_remove_ref ();
+      CORBA::remove_ref (tmp[i]);
       tmp[i] = 0;
     }
 }
 
 
-#endif /* end #if !defined */
 
+#endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // PortableInterceptor::ObjectReferenceTemplateSeq
 // *************************************************************
 
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (void)
 {}
-PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max) // uses max size
-  :
+
+PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max, CORBA::ULong length, PortableInterceptor::ObjectReferenceTemplate_ptr *buffer, CORBA::Boolean release)
-  :
+
+PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    PortableInterceptor::ObjectReferenceTemplate_ptr *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &seq) // copy ctor
-  :
+
+PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 PortableInterceptor::ObjectReferenceTemplateSeq::~ObjectReferenceTemplateSeq (void) // dtor
 {}
+
 void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectReferenceTemplateSeq *tmp = ACE_static_cast (ObjectReferenceTemplateSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   63,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746553),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x61746553), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0
-  27,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746553),
+    27,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x61746553), 
   ACE_NTOHL (0x65710000),  // name = ObjectReferenceTemplateSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   124, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_value, // typecode kind
@@ -1078,18 +1182,18 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
       ACE_NTOHL (0x656d706c), 
       ACE_NTOHL (0x6174653a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
-      24,
+            24,
       ACE_NTOHL (0x4f626a65), 
       ACE_NTOHL (0x63745265), 
       ACE_NTOHL (0x66657265), 
       ACE_NTOHL (0x6e636554), 
       ACE_NTOHL (0x656d706c), 
       ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
-      2, // value modifier
+            2, // value modifier
       CORBA::tk_null, // no stateful base valuetype
 
-      3, // member count
-
+3, // member count
+      
     0U,
 
 };
@@ -1104,12 +1208,19 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplateSeq
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectReferenceTemplateSeq, &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplateSeq)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectReferenceTemplateSeq,
+    &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplateSeq
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   53,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -1125,13 +1236,13 @@ static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] =
   ACE_NTOHL (0x65724964), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0
-  17,
+    17,
   ACE_NTOHL (0x41646170), 
   ACE_NTOHL (0x7465724d), 
   ACE_NTOHL (0x616e6167), 
   ACE_NTOHL (0x65724964), 
   ACE_NTOHL (0x0),  // name = AdapterManagerId
-  CORBA::tk_long,
+    CORBA::tk_long,
 
 };
 
@@ -1145,12 +1256,19 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterManagerId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_AdapterManagerId, &_tc_TAO_tc_PortableInterceptor_AdapterManagerId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_AdapterManagerId,
+    &_tc_TAO_tc_PortableInterceptor_AdapterManagerId
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_AdapterState[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   49,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -1165,12 +1283,12 @@ static const CORBA::Long _oc_PortableInterceptor_AdapterState[] =
   ACE_NTOHL (0x74617465), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterState:1.0
-  13,
+    13,
   ACE_NTOHL (0x41646170), 
   ACE_NTOHL (0x74657253), 
   ACE_NTOHL (0x74617465), 
   ACE_NTOHL (0x0),  // name = AdapterState
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -1184,206 +1302,141 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterState (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_AdapterState, &_tc_TAO_tc_PortableInterceptor_AdapterState)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_AdapterState,
+    &_tc_TAO_tc_PortableInterceptor_AdapterState
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, HOLDING, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ACTIVE, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, DISCARDING, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, INACTIVE, 3)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, NON_EXISTENT, 4)
-TAO_NAMESPACE_END
-TAO_Export void
-operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory *value) // copying
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:56
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceFactory *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << value)
-  {
-    any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceFactory, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ());
-  }
+  CORBA::add_ref (_tao_elem);
+  _tao_any <<= &_tao_elem;
 }
 
-TAO_Export void
-operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory **value) // non-copying
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceFactory **_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << *value)
-  {
-    any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceFactory, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        *value,
-        PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor);
-  }
+  TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::insert (
+      _tao_any,
+      PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor,
+      PortableInterceptor::_tc_ObjectReferenceFactory,
+      *_tao_elem
+    );
 }
 
-TAO_Export CORBA::Boolean
-operator>>= (const CORBA::Any &any, PortableInterceptor::ObjectReferenceFactory *&value)
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceFactory *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    value = 0;
-    CORBA::TypeCode_var type = any.type ();
-    
-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceFactory ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    if (!result)
-    {
-      return 0; // not equivalent
-    }
-    if (any.any_owns_data ())
-    {
-      const PortableInterceptor::ObjectReferenceFactory *const_holder = ACE_static_cast (
-          const PortableInterceptor::ObjectReferenceFactory*,
-          any.value ());
-      value = ACE_const_cast (
-          PortableInterceptor::ObjectReferenceFactory*,
-          const_holder);
-      return 1;
-    }
-    else
-    {
-      PortableInterceptor::ObjectReferenceFactory *tmp;
-      TAO_InputCDR stream (
-          any._tao_get_cdr (),
-          any._tao_byte_order ());
-      if (stream >> tmp)
-      {
-        ((CORBA::Any *)&any)->_tao_replace (
-            PortableInterceptor::_tc_ObjectReferenceFactory,
-            1,
-            ACE_static_cast (void *, tmp),
-            PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor);
-        value = tmp;
-        return 1;
-      }
-      
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::extract (
+        _tao_any,
+        PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor,
+        PortableInterceptor::_tc_ObjectReferenceFactory,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::to_value (
+    CORBA::ValueBase *&_tao_elem
+  ) const
+{
+  CORBA::add_ref (this->value_);
+  _tao_elem = this->value_;
+  return 1;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var>
+  template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var>
+#  pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-TAO_Export void
-operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate *value) // copying
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:56
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceTemplate *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << value)
-  {
-    any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceTemplate, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ());
-  }
+  CORBA::add_ref (_tao_elem);
+  _tao_any <<= &_tao_elem;
 }
 
-TAO_Export void
-operator<<= (CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate **value) // non-copying
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceTemplate **_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << *value)
-  {
-    any._tao_replace (
-        PortableInterceptor::_tc_ObjectReferenceTemplate, 
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin (),
-        1,
-        *value,
-        PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor);
-  }
+  TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::insert (
+      _tao_any,
+      PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor,
+      PortableInterceptor::_tc_ObjectReferenceTemplate,
+      *_tao_elem
+    );
 }
 
-TAO_Export CORBA::Boolean
-operator>>= (const CORBA::Any &any, PortableInterceptor::ObjectReferenceTemplate *&value)
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ObjectReferenceTemplate *&_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    value = 0;
-    CORBA::TypeCode_var type = any.type ();
-    
-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceTemplate ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    if (!result)
-    {
-      return 0; // not equivalent
-    }
-    if (any.any_owns_data ())
-    {
-      const PortableInterceptor::ObjectReferenceTemplate *const_holder = ACE_static_cast (
-          const PortableInterceptor::ObjectReferenceTemplate*,
-          any.value ());
-      value = ACE_const_cast (
-          PortableInterceptor::ObjectReferenceTemplate*,
-          const_holder);
-      return 1;
-    }
-    else
-    {
-      PortableInterceptor::ObjectReferenceTemplate *tmp;
-      TAO_InputCDR stream (
-          any._tao_get_cdr (),
-          any._tao_byte_order ());
-      if (stream >> tmp)
-      {
-        ((CORBA::Any *)&any)->_tao_replace (
-            PortableInterceptor::_tc_ObjectReferenceTemplate,
-            1,
-            ACE_static_cast (void *, tmp),
-            PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor);
-        value = tmp;
-        return 1;
-      }
-      
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::extract (
+        _tao_any,
+        PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor,
+        PortableInterceptor::_tc_ObjectReferenceTemplate,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::to_value (
+    CORBA::ValueBase *&_tao_elem
+  ) const
+{
+  CORBA::add_ref (this->value_);
+  _tao_elem = this->value_;
+  return 1;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
+  template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
+#  pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -1391,16 +1444,12 @@ void operator<<= (
     const PortableInterceptor::ObjectReferenceTemplateSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::insert_copy (
+      _tao_any,
+      PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
+      PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -1409,19 +1458,12 @@ void operator<<= (
     PortableInterceptor::ObjectReferenceTemplateSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::insert (
+      _tao_any,
+      PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
+      PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -1430,8 +1472,8 @@ CORBA::Boolean operator>>= (
     PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableInterceptor::ObjectReferenceTemplateSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableInterceptor::ObjectReferenceTemplateSeq *&,
       _tao_elem
     );
 }
@@ -1442,157 +1484,143 @@ CORBA::Boolean operator>>= (
     const PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          PortableInterceptor::_tc_ObjectReferenceTemplateSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const PortableInterceptor::ObjectReferenceTemplateSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        PortableInterceptor::ObjectReferenceTemplateSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            PortableInterceptor::ObjectReferenceTemplateSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::extract (
+        _tao_any,
+        PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
+        PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
+        _tao_elem
+      );
 }
 
-//@@ Boris: begin experimental
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740
+
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceFactory * vt)
 {
   if (vt != 0)
-  {
-    vt->_add_ref ();
-  }
+    {
+      vt->_add_ref ();
+    }
 }
 
 void
 CORBA::remove_ref (PortableInterceptor::ObjectReferenceFactory * vt)
 {
   if (vt != 0)
-  {
-    vt->_remove_ref ();
-  }
+    {
+      vt->_remove_ref ();
+    }
 }
 
-//@@ Boris: end experimental
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73
+
 CORBA::Boolean
-operator<< (TAO_OutputCDR &strm, const PortableInterceptor::ObjectReferenceFactory *_tao_valuetype)
+operator<< (
+    TAO_OutputCDR &strm,
+    const PortableInterceptor::ObjectReferenceFactory *_tao_valuetype
+  )
 {
-  return CORBA::ValueBase::_tao_marshal (strm,
-    ACE_const_cast (PortableInterceptor::ObjectReferenceFactory*, _tao_valuetype),
-    (ptr_arith_t) &PortableInterceptor::ObjectReferenceFactory::_downcast);
+  return
+    CORBA::ValueBase::_tao_marshal (
+        strm,
+        ACE_const_cast (
+            PortableInterceptor::ObjectReferenceFactory *,
+            _tao_valuetype
+          ),
+        (ptr_arith_t) &PortableInterceptor::ObjectReferenceFactory::_downcast
+      );
 }
 
 CORBA::Boolean
-operator>> (TAO_InputCDR &strm, PortableInterceptor::ObjectReferenceFactory *&_tao_valuetype)
+operator>> (
+    TAO_InputCDR &strm,
+    PortableInterceptor::ObjectReferenceFactory *&_tao_valuetype
+  )
 {
   return PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (strm, _tao_valuetype);
 }
 
-//@@ Boris: begin experimental
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740
+
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
 {
   if (vt != 0)
-  {
-    vt->_add_ref ();
-  }
+    {
+      vt->_add_ref ();
+    }
 }
 
 void
 CORBA::remove_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
 {
   if (vt != 0)
-  {
-    vt->_remove_ref ();
-  }
+    {
+      vt->_remove_ref ();
+    }
 }
 
-//@@ Boris: end experimental
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73
+
 CORBA::Boolean
-operator<< (TAO_OutputCDR &strm, const PortableInterceptor::ObjectReferenceTemplate *_tao_valuetype)
+operator<< (
+    TAO_OutputCDR &strm,
+    const PortableInterceptor::ObjectReferenceTemplate *_tao_valuetype
+  )
 {
-  return CORBA::ValueBase::_tao_marshal (strm,
-    ACE_const_cast (PortableInterceptor::ObjectReferenceTemplate*, _tao_valuetype),
-    (ptr_arith_t) &PortableInterceptor::ObjectReferenceTemplate::_downcast);
+  return
+    CORBA::ValueBase::_tao_marshal (
+        strm,
+        ACE_const_cast (
+            PortableInterceptor::ObjectReferenceTemplate *,
+            _tao_valuetype
+          ),
+        (ptr_arith_t) &PortableInterceptor::ObjectReferenceTemplate::_downcast
+      );
 }
 
 CORBA::Boolean
-operator>> (TAO_InputCDR &strm, PortableInterceptor::ObjectReferenceTemplate *&_tao_valuetype)
+operator>> (
+    TAO_InputCDR &strm,
+    PortableInterceptor::ObjectReferenceTemplate *&_tao_valuetype
+  )
 {
   return PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (strm, _tao_valuetype);
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const PortableInterceptor::ObjectReferenceTemplateSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -1601,26 +1629,37 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
diff --git a/TAO/tao/ObjectReferenceTemplateC.h b/TAO/tao/ObjectReferenceTemplateC.h
index b4873049f0c..e2cd7e8691b 100644
--- a/TAO/tao/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjectReferenceTemplateC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_OBJECTREFERENCETEMPLATEC_H_
-#define _TAO_IDL_OBJECTREFERENCETEMPLATEC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
+#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -58,80 +61,117 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  PortableInterceptor
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
+  
   typedef char * ServerId;
   typedef CORBA::String_var ServerId_var;
   typedef CORBA::String_out ServerId_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_ServerId;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
+  
   typedef char * ORBId;
   typedef CORBA::String_var ORBId_var;
   typedef CORBA::String_out ORBId_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_ORBId;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
+  
   typedef CORBA::StringSeq AdapterName;
   typedef CORBA::StringSeq_var AdapterName_var;
   typedef CORBA::StringSeq_out AdapterName_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_AdapterName;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
+  
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
   typedef CORBA::OctetSeq_out ObjectId_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_ObjectId;
   
-  // Valuetype class
-  class ObjectReferenceFactory;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52
   
+  class ObjectReferenceFactory;
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___PTR_CH_
   
   typedef ObjectReferenceFactory *ObjectReferenceFactory_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181
+  
   class TAO_Export ObjectReferenceFactory_var
   {
   public:
-    ObjectReferenceFactory_var (void); // default constructor
+    ObjectReferenceFactory_var (void);
     ObjectReferenceFactory_var (ObjectReferenceFactory*);
     ObjectReferenceFactory_var (const ObjectReferenceFactory*); // (TAO extension)
-    ObjectReferenceFactory_var (const ObjectReferenceFactory_var &); // copy constructor
-    ~ObjectReferenceFactory_var (void); // destructor
+    ObjectReferenceFactory_var (const ObjectReferenceFactory_var &);
+    ~ObjectReferenceFactory_var (void);
     
     ObjectReferenceFactory_var &operator= (ObjectReferenceFactory*);
     ObjectReferenceFactory_var &operator= (const ObjectReferenceFactory_var &);
     ObjectReferenceFactory* operator-> (void) const;
     
     operator const ObjectReferenceFactory* () const;
-    operator ObjectReferenceFactory* ();
+    operator ObjectReferenceFactory*& ();
     // in, inout, out, _retn 
     ObjectReferenceFactory* in (void) const;
-    ObjectReferenceFactory* &inout (void);
-    ObjectReferenceFactory* &out (void);
+    ObjectReferenceFactory*& inout (void);
+    ObjectReferenceFactory*& out (void);
     ObjectReferenceFactory* _retn (void);
     ObjectReferenceFactory* ptr (void) const;
-  
+    
     // Hooks used by template sequence and valuetype manager classes
     // for non-defined forward declared valuetypes.
     static void tao_add_ref (ObjectReferenceFactory *);
     static void tao_remove_ref (ObjectReferenceFactory *);
-
+  
   private:
     ObjectReferenceFactory* ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
+  
   class TAO_Export ObjectReferenceFactory_out
   {
   public:
@@ -141,18 +181,19 @@ TAO_NAMESPACE  PortableInterceptor
     ObjectReferenceFactory_out &operator= (const ObjectReferenceFactory_out &);
     ObjectReferenceFactory_out &operator= (const ObjectReferenceFactory_var &);
     ObjectReferenceFactory_out &operator= (ObjectReferenceFactory*);
-    operator ObjectReferenceFactory* &();
-    ObjectReferenceFactory* &ptr (void);
+    operator ObjectReferenceFactory*& ();
+    ObjectReferenceFactory*& ptr (void);
     ObjectReferenceFactory* operator-> (void);
     
   private:
     ObjectReferenceFactory* &ptr_;
   };
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:96
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_
   
@@ -160,12 +201,7 @@ TAO_NAMESPACE  PortableInterceptor
     : public virtual CORBA::ValueBase
   {
   public:
-    
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef ObjectReferenceFactory* _ptr_type;
     typedef ObjectReferenceFactory_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
     static ObjectReferenceFactory* _downcast (CORBA::ValueBase* );
     // The address of static _downcast is implicit used as type id
 
@@ -174,399 +210,486 @@ TAO_NAMESPACE  PortableInterceptor
         TAO_InputCDR &,
         ObjectReferenceFactory *&
       );
-    virtual const char* _tao_obv_repository_id () const;
-    static const char* _tao_obv_static_repository_id ();
+    virtual const char* _tao_obv_repository_id (void) const;
+    static const char* _tao_obv_static_repository_id (void);
     
     static void _tao_any_destructor (void *);
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473
+    
     virtual CORBA::Object_ptr make_object (
         const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-protected:
-  ObjectReferenceFactory ();
-  virtual ~ObjectReferenceFactory ();
-
-  // TAO internals
-  virtual void *_tao_obv_narrow (ptr_arith_t);
+      ) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:315
+  
+  protected:
+    ObjectReferenceFactory (void);
+    virtual ~ObjectReferenceFactory (void);
+    
+    virtual void *_tao_obv_narrow (ptr_arith_t);
 #if defined (_MSC_VER)
-  virtual void *PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (
-      ptr_arith_t
-    );
+    virtual void *PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (ptr_arith_t);
 #endif /* _MSC_VER */
-  virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
-  virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-
-private:
-  ObjectReferenceFactory (const ObjectReferenceFactory &);
-  void operator= (const ObjectReferenceFactory &);
-  
-};
+    
+  private:
+    ObjectReferenceFactory (const ObjectReferenceFactory &);
+    void operator= (const ObjectReferenceFactory &);
+    
+  };
 
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory;
-
-// Valuetype class
-class ObjectReferenceTemplate;
+  
+  // 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_ObjectReferenceFactory;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52
+  
+  class ObjectReferenceTemplate;
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___PTR_CH_
-
-typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr;
+  
+  typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___VAR_CH_
-
-class TAO_Export ObjectReferenceTemplate_var
-{
-public:
-  ObjectReferenceTemplate_var (void); // default constructor
-  ObjectReferenceTemplate_var (ObjectReferenceTemplate*);
-  ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension)
-  ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &); // copy constructor
-  ~ObjectReferenceTemplate_var (void); // destructor
-  
-  ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*);
-  ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &);
-  ObjectReferenceTemplate* operator-> (void) const;
-  
-  operator const ObjectReferenceTemplate* () const;
-  operator ObjectReferenceTemplate* ();
-  // in, inout, out, _retn 
-  ObjectReferenceTemplate* in (void) const;
-  ObjectReferenceTemplate* &inout (void);
-  ObjectReferenceTemplate* &out (void);
-  ObjectReferenceTemplate* _retn (void);
-  ObjectReferenceTemplate* ptr (void) const;
-  
-  // Hooks used by template sequence and valuetype manager classes
-  // for non-defined forward declared valuetypes.
-  static void tao_add_ref (ObjectReferenceTemplate *);
-  static void tao_remove_ref (ObjectReferenceTemplate *);
-
-private:
-  ObjectReferenceTemplate* ptr_;
-};
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181
+  
+  class TAO_Export ObjectReferenceTemplate_var
+  {
+  public:
+    ObjectReferenceTemplate_var (void);
+    ObjectReferenceTemplate_var (ObjectReferenceTemplate*);
+    ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension)
+    ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &);
+    ~ObjectReferenceTemplate_var (void);
+    
+    ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*);
+    ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &);
+    ObjectReferenceTemplate* operator-> (void) const;
+    
+    operator const ObjectReferenceTemplate* () const;
+    operator ObjectReferenceTemplate*& ();
+    // in, inout, out, _retn 
+    ObjectReferenceTemplate* in (void) const;
+    ObjectReferenceTemplate*& inout (void);
+    ObjectReferenceTemplate*& out (void);
+    ObjectReferenceTemplate* _retn (void);
+    ObjectReferenceTemplate* ptr (void) const;
+    
+    // Hooks used by template sequence and valuetype manager classes
+    // for non-defined forward declared valuetypes.
+    static void tao_add_ref (ObjectReferenceTemplate *);
+    static void tao_remove_ref (ObjectReferenceTemplate *);
+  
+  private:
+    ObjectReferenceTemplate* ptr_;
+  };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___OUT_CH_
-
-class TAO_Export ObjectReferenceTemplate_out
-{
-public:
-  ObjectReferenceTemplate_out (ObjectReferenceTemplate* &);
-  ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &);
-  ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &);
-  ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &);
-  ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &);
-  ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*);
-  operator ObjectReferenceTemplate* &();
-  ObjectReferenceTemplate* &ptr (void);
-  ObjectReferenceTemplate* operator-> (void);
-  
-private:
-  ObjectReferenceTemplate* &ptr_;
-};
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
+  
+  class TAO_Export ObjectReferenceTemplate_out
+  {
+  public:
+    ObjectReferenceTemplate_out (ObjectReferenceTemplate* &);
+    ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &);
+    ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &);
+    ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &);
+    ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &);
+    ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*);
+    operator ObjectReferenceTemplate*& ();
+    ObjectReferenceTemplate*& ptr (void);
+    ObjectReferenceTemplate* operator-> (void);
+    
+  private:
+    ObjectReferenceTemplate* &ptr_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:96
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_
+  
+  class TAO_Export ObjectReferenceTemplate
+    : public virtual ObjectReferenceFactory
+  {
+  public:
+    typedef ObjectReferenceTemplate_var _var_type;
+    static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* );
+    // The address of static _downcast is implicit used as type id
 
-class TAO_Export ObjectReferenceTemplate
-  : public virtual ObjectReferenceFactory
-{
-public:
-  
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ObjectReferenceTemplate* _ptr_type;
-  typedef ObjectReferenceTemplate_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-  
-  static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* );
-  // The address of static _downcast is implicit used as type id
-
-  // (TAO extensions or internals)
-  static CORBA::Boolean _tao_unmarshal (
-      TAO_InputCDR &,
-      ObjectReferenceTemplate *&
-    );
-  virtual const char* _tao_obv_repository_id () const;
-  static const char* _tao_obv_static_repository_id ();
-  
-  static void _tao_any_destructor (void *);
-  
-  virtual char * server_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    ) = 0;
-virtual char * orb_id (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  ) = 0;
-virtual ::PortableInterceptor::AdapterName * adapter_name (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  ) = 0;
-
-protected:
-  ObjectReferenceTemplate ();
-  virtual ~ObjectReferenceTemplate ();
-
-  // TAO internals
-  virtual void *_tao_obv_narrow (ptr_arith_t);
+    // (TAO extensions or internals)
+    static CORBA::Boolean _tao_unmarshal (
+        TAO_InputCDR &,
+        ObjectReferenceTemplate *&
+      );
+    virtual const char* _tao_obv_repository_id (void) const;
+    static const char* _tao_obv_static_repository_id (void);
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473
+    
+    virtual char * server_id (
+         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473
+    
+    virtual char * orb_id (
+         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473
+    
+    virtual ::PortableInterceptor::AdapterName * adapter_name (
+         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:315
+  
+  protected:
+    ObjectReferenceTemplate (void);
+    virtual ~ObjectReferenceTemplate (void);
+    
+    virtual void *_tao_obv_narrow (ptr_arith_t);
 #if defined (_MSC_VER)
-  virtual void *PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (
-      ptr_arith_t
-    );
+    virtual void *PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t);
 #endif /* _MSC_VER */
-  virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
-  virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-
-private:
-  ObjectReferenceTemplate (const ObjectReferenceTemplate &);
-  void operator= (const ObjectReferenceTemplate &);
-  
-};
+    
+  private:
+    ObjectReferenceTemplate (const ObjectReferenceTemplate &);
+    void operator= (const ObjectReferenceTemplate &);
+    
+  };
 
 #endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
-
+  
+  // 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_ObjectReferenceTemplate;
+  
+  // 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_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
 #define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
-
-class TAO_EXPORT_MACRO _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
-  : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum);
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
-      CORBA::ULong maximum,
-      CORBA::ULong length,
-      ObjectReferenceTemplate* *value,
-      CORBA::Boolean release = 0
-    );
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
-      const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
-    );
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &operator= (
-      const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
-    );
-  virtual ~_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
-  
-  // = Accessors.
-  TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> operator[] (CORBA::ULong index) const;
-  
-  // = Static operations.
-  static ObjectReferenceTemplate **allocbuf (CORBA::ULong nelems);
-  static void freebuf (ObjectReferenceTemplate **buffer);
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  ObjectReferenceTemplate* *get_buffer (CORBA::Boolean orphan = 0);
-  const ObjectReferenceTemplate* *get_buffer (void) const;
-  virtual void _shrink_buffer (
-      CORBA::ULong nl,
-      CORBA::ULong ol
-    );
-  
-  
-};
+  
+  class TAO_Export _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
+    : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
+    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
+        CORBA::ULong maximum,
+        CORBA::ULong length,
+        ObjectReferenceTemplate* *value,
+        CORBA::Boolean release = 0
+      );
+    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
+        const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
+      );
+    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &operator= (
+        const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
+      );
+    virtual ~_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
+    
+    // = Accessors.
+    TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> operator[] (CORBA::ULong index) const;
+    
+    // = Static operations.
+    static ObjectReferenceTemplate **allocbuf (CORBA::ULong nelems);
+    static void freebuf (ObjectReferenceTemplate **buffer);
+    
+    // Implement the TAO_Base_Sequence methods (see Sequence.h)
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    ObjectReferenceTemplate* *get_buffer (CORBA::Boolean orphan = 0);
+    const ObjectReferenceTemplate* *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 (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ObjectReferenceTemplateSeq;
+  class ObjectReferenceTemplateSeq_var;
+  
+  // *************************************************************
+  // PortableInterceptor::ObjectReferenceTemplateSeq
+  // *************************************************************
+  
+  class TAO_Export ObjectReferenceTemplateSeq : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-class ObjectReferenceTemplateSeq;
-class ObjectReferenceTemplateSeq_var;
-
-// *************************************************************
-// ObjectReferenceTemplateSeq
-// *************************************************************
-
-class TAO_Export ObjectReferenceTemplateSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
+  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Valuetype_Sequence<ObjectReferenceTemplate,ObjectReferenceTemplate_var>
+  TAO_Unbounded_Valuetype_Sequence<ObjectReferenceTemplate,ObjectReferenceTemplate_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  ObjectReferenceTemplateSeq (void); // default ctor
-  ObjectReferenceTemplateSeq (CORBA::ULong max); // uses max size
-  ObjectReferenceTemplateSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      ObjectReferenceTemplate_ptr *buffer, 
-      CORBA::Boolean release = 0
-    );
-  ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &); // copy ctor
-  ~ObjectReferenceTemplateSeq (void);
-  static void _tao_any_destructor (void*);
-  
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ObjectReferenceTemplateSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-  
-  
-};
+  {
+  public:
+    ObjectReferenceTemplateSeq (void);
+    ObjectReferenceTemplateSeq (CORBA::ULong max);
+    ObjectReferenceTemplateSeq (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ObjectReferenceTemplate_ptr *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &);
+    ~ObjectReferenceTemplateSeq (void);
+    
+    static void _tao_any_destructor (void*);
+    
+    typedef ObjectReferenceTemplateSeq_var _var_type;
+  };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___VAR_CH_
-
-// *************************************************************
-// class PortableInterceptor::ObjectReferenceTemplateSeq_var
-// *************************************************************
-
-class TAO_Export ObjectReferenceTemplateSeq_var
-{
-public:
-  ObjectReferenceTemplateSeq_var (void);
-  ObjectReferenceTemplateSeq_var (ObjectReferenceTemplateSeq *);
-  ObjectReferenceTemplateSeq_var (const ObjectReferenceTemplateSeq_var &);
-  ~ObjectReferenceTemplateSeq_var (void);
   
-  ObjectReferenceTemplateSeq_var &operator= (ObjectReferenceTemplateSeq *);
-  ObjectReferenceTemplateSeq_var &operator= (const ObjectReferenceTemplateSeq_var &);
-  ObjectReferenceTemplateSeq *operator-> (void);
-  const ObjectReferenceTemplateSeq *operator-> (void) const;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
   
-  operator const ObjectReferenceTemplateSeq &() const;
-  operator ObjectReferenceTemplateSeq &();
-  operator ObjectReferenceTemplateSeq &() const;
-  operator ObjectReferenceTemplateSeq *&(); // variable-size base types only
+  // *************************************************************
+  // class PortableInterceptor::ObjectReferenceTemplateSeq_var
+  // *************************************************************
   
-  TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
+  class TAO_Export ObjectReferenceTemplateSeq_var
+  {
+  public:
+    ObjectReferenceTemplateSeq_var (void);
+    ObjectReferenceTemplateSeq_var (ObjectReferenceTemplateSeq *);
+    ObjectReferenceTemplateSeq_var (const ObjectReferenceTemplateSeq_var &);
+    ~ObjectReferenceTemplateSeq_var (void);
+    
+    ObjectReferenceTemplateSeq_var &operator= (ObjectReferenceTemplateSeq *);
+    ObjectReferenceTemplateSeq_var &operator= (const ObjectReferenceTemplateSeq_var &);
+    ObjectReferenceTemplateSeq *operator-> (void);
+    const ObjectReferenceTemplateSeq *operator-> (void) const;
+    
+    operator const ObjectReferenceTemplateSeq &() const;
+    operator ObjectReferenceTemplateSeq &();
+    operator ObjectReferenceTemplateSeq &() const;
+    
+    // Variable-size base types only.
+    operator ObjectReferenceTemplateSeq *&();
+    
+    TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
+    
+    // in, inout, out, _retn 
+    const ObjectReferenceTemplateSeq &in (void) const;
+    ObjectReferenceTemplateSeq &inout (void);
+    ObjectReferenceTemplateSeq *&out (void);
+    ObjectReferenceTemplateSeq *_retn (void);
+    ObjectReferenceTemplateSeq *ptr (void) const;
   
-  // in, inout, out, _retn 
-  const ObjectReferenceTemplateSeq &in (void) const;
-  ObjectReferenceTemplateSeq &inout (void);
-  ObjectReferenceTemplateSeq *&out (void);
-  ObjectReferenceTemplateSeq *_retn (void);
-  ObjectReferenceTemplateSeq *ptr (void) const;
-
-private:
-  ObjectReferenceTemplateSeq *ptr_;
-};
-
+  private:
+    ObjectReferenceTemplateSeq *ptr_;
+  };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___OUT_CH_
-
-class TAO_Export ObjectReferenceTemplateSeq_out
-{
-public:
-  ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq *&);
-  ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &);
-  ObjectReferenceTemplateSeq_out (const ObjectReferenceTemplateSeq_out &);
-  ObjectReferenceTemplateSeq_out &operator= (const ObjectReferenceTemplateSeq_out &);
-  ObjectReferenceTemplateSeq_out &operator= (ObjectReferenceTemplateSeq *);
-  operator ObjectReferenceTemplateSeq *&();
-  ObjectReferenceTemplateSeq *&ptr (void);
-  ObjectReferenceTemplateSeq *operator-> (void);
-  TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
-
-private:
-  ObjectReferenceTemplateSeq *&ptr_;
-  // Assignment from T_var not allowed.
-  void operator= (const ObjectReferenceTemplateSeq_var &);
-};
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_Export ObjectReferenceTemplateSeq_out
+  {
+  public:
+    ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq *&);
+    ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &);
+    ObjectReferenceTemplateSeq_out (const ObjectReferenceTemplateSeq_out &);
+    ObjectReferenceTemplateSeq_out &operator= (const ObjectReferenceTemplateSeq_out &);
+    ObjectReferenceTemplateSeq_out &operator= (ObjectReferenceTemplateSeq *);
+    operator ObjectReferenceTemplateSeq *&();
+    ObjectReferenceTemplateSeq *&ptr (void);
+    ObjectReferenceTemplateSeq *operator-> (void);
+    TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
+  
+  private:
+    ObjectReferenceTemplateSeq *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ObjectReferenceTemplateSeq_var &);
+  };
 
 #endif /* end #if !defined */
+  
+  // 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_ObjectReferenceTemplateSeq;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
+  typedef CORBA::Long AdapterManagerId;
+  typedef CORBA::Long_out AdapterManagerId_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_AdapterManagerId;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
+  typedef CORBA::Short AdapterState;
+  typedef CORBA::Short_out AdapterState_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_AdapterState;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short HOLDING = 0;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short ACTIVE = 1;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short DISCARDING = 2;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short INACTIVE = 3;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short NON_EXISTENT = 4;
 
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq;
-
-typedef CORBA::Long AdapterManagerId;
-typedef CORBA::Long_out AdapterManagerId_out;
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId;
-
-typedef CORBA::Short AdapterState;
-typedef CORBA::Short_out AdapterState_out;
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState;
-
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short HOLDING;
-
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ACTIVE;
-
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short DISCARDING;
-
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short INACTIVE;
-
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short NON_EXISTENT;
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module PortableInterceptor
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:55
+
 TAO_NAMESPACE  OBV_PortableInterceptor
 {
-}
-TAO_NAMESPACE_CLOSE
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:85
+
+}TAO_NAMESPACE_CLOSE
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
 
-// Any operators for valuetype PortableInterceptor::ObjectReferenceFactory
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory **); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *&);
-// Any operators for valuetype PortableInterceptor::ObjectReferenceTemplate
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
+
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate **); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
-//@@ Boris: begin experimental
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682
+
 TAO_NAMESPACE CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (PortableInterceptor::ObjectReferenceFactory *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (PortableInterceptor::ObjectReferenceFactory *);
 }
 TAO_NAMESPACE_CLOSE
-//@@ Boris: end experimental
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
-//@@ Boris: begin experimental
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682
+
 TAO_NAMESPACE CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (PortableInterceptor::ObjectReferenceTemplate *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (PortableInterceptor::ObjectReferenceTemplate *);
 }
 TAO_NAMESPACE_CLOSE
-//@@ Boris: end experimental
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
 #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
 
@@ -581,9 +704,13 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "ObjectReferenceTemplateC.i"
@@ -599,3 +726,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/ObjectReferenceTemplateC.i b/TAO/tao/ObjectReferenceTemplateC.i
index 2d6b01034f2..4593ce1a908 100644
--- a/TAO/tao/ObjectReferenceTemplateC.i
+++ b/TAO/tao/ObjectReferenceTemplateC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
+
 ACE_INLINE
-PortableInterceptor::ObjectReferenceFactory::ObjectReferenceFactory () // default constructor
+PortableInterceptor::ObjectReferenceFactory::ObjectReferenceFactory (void)
 {}
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory () // destructor
+PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory (void)
 {}
 
 ACE_INLINE const char* 
@@ -33,12 +37,15 @@ PortableInterceptor::ObjectReferenceFactory::_tao_obv_static_repository_id ()
   return "IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0";
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
+
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplate::ObjectReferenceTemplate () // default constructor
+PortableInterceptor::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
 {}
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplate::~ObjectReferenceTemplate () // destructor
+PortableInterceptor::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
 {}
 
 ACE_INLINE const char* 
@@ -47,13 +54,16 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
   return "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0";
 }
 
+// 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_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_)
 #define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_
 
-ACE_INLINE PortableInterceptor::ObjectReferenceTemplate **
+ACE_INLINE
+PortableInterceptor::ObjectReferenceTemplate **
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (CORBA::ULong nelems)
 {
   PortableInterceptor::ObjectReferenceTemplate **buf = 0;
@@ -68,11 +78,15 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec
   return buf;
 }
 
-ACE_INLINE void 
+ACE_INLINE
+void 
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (PortableInterceptor::ObjectReferenceTemplate **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -88,142 +102,178 @@ PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_Objec
 }
 
 ACE_INLINE
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  PortableInterceptor::ObjectReferenceTemplate* *value,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    PortableInterceptor::ObjectReferenceTemplate* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
 ACE_INLINE
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq(const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs)
+PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq(
+    const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    PortableInterceptor::ObjectReferenceTemplate **tmp1 = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (this->maximum_);
-    PortableInterceptor::ObjectReferenceTemplate ** const tmp2 = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        if (tmp2[i] != 0)
-          tmp2[i]->_add_ref ();
-        tmp1[i] = tmp2 [i];
-      }
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      PortableInterceptor::ObjectReferenceTemplate **tmp1 =
+        _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (this->maximum_);
+      PortableInterceptor::ObjectReferenceTemplate ** const tmp2 =
+        ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          if (tmp2[i] != 0)
+            {
+              tmp2[i]->_add_ref ();
+            }
+          
+          tmp1[i] = tmp2 [i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::operator= (const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs)
+ACE_INLINE
+PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &
+PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::operator= (
+    const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate **, this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      if (tmp[i] != 0)
-        tmp[i]->_remove_ref ();
-      tmp[i] = 0;
+      PortableInterceptor::ObjectReferenceTemplate **tmp =
+        ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (tmp[i] != 0)
+            {
+              tmp[i]->_remove_ref ();
+            }
+          
+          tmp[i] = 0;
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (rhs.maximum_);
+        }
     }
-    if (this->maximum_ < rhs.maximum_)
+  else
     {
-      _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (rhs.maximum_);
+      this->buffer_ =
+        _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (rhs.maximum_);
     }
-  }
-  else
-    this->buffer_ = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (rhs.maximum_);
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  PortableInterceptor::ObjectReferenceTemplate **tmp1 = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate **, this->buffer_);
-  PortableInterceptor::ObjectReferenceTemplate ** const tmp2 = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, rhs.buffer_);
+  PortableInterceptor::ObjectReferenceTemplate **tmp1 =
+    ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate **, this->buffer_);
+  
+  PortableInterceptor::ObjectReferenceTemplate ** const tmp2 =
+    ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
       if (tmp2[i] != 0)
-        tmp2[i]->_add_ref ();
+        {
+          tmp2[i]->_add_ref ();
+        }
+      
       tmp1[i] = tmp2 [i];
     }
   
   return *this;
 }
 
-ACE_INLINE TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
+ACE_INLINE
+TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  PortableInterceptor::ObjectReferenceTemplate ** const tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, this->buffer_);
+  PortableInterceptor::ObjectReferenceTemplate ** const tmp =
+    ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, this->buffer_);
   return TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> (tmp + index, this->release_);
 }
 
-ACE_INLINE PortableInterceptor::ObjectReferenceTemplate* *
+ACE_INLINE
+PortableInterceptor::ObjectReferenceTemplate* *
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::get_buffer (CORBA::Boolean orphan)
 {
   PortableInterceptor::ObjectReferenceTemplate **result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (this->maximum_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(PortableInterceptor::ObjectReferenceTemplate**,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(PortableInterceptor::ObjectReferenceTemplate**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const PortableInterceptor::ObjectReferenceTemplate* *
+ACE_INLINE
+const PortableInterceptor::ObjectReferenceTemplate* *
 PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, this->buffer_);
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class PortableInterceptor::ObjectReferenceTemplateSeq_var
 // *************************************************************
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (void) // default constructor
+PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (void)
   : ptr_ (0)
 {}
 
@@ -233,21 +283,26 @@ PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_
 {}
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (const ::PortableInterceptor::ObjectReferenceTemplateSeq_var &p) // copy constructor
+PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (const ::PortableInterceptor::ObjectReferenceTemplateSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::PortableInterceptor::ObjectReferenceTemplateSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::PortableInterceptor::ObjectReferenceTemplateSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::~ObjectReferenceTemplateSeq_var (void) // destructor
+PortableInterceptor::ObjectReferenceTemplateSeq_var::~ObjectReferenceTemplateSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE PortableInterceptor::ObjectReferenceTemplateSeq_var &
+ACE_INLINE
+PortableInterceptor::ObjectReferenceTemplateSeq_var &
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (ObjectReferenceTemplateSeq *p)
 {
   delete this->ptr_;
@@ -255,7 +310,8 @@ PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (ObjectReferenceT
   return *this;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq_var &
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq_var &
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (const ::PortableInterceptor::ObjectReferenceTemplateSeq_var &p)
 {
   if (this != &p)
@@ -267,8 +323,12 @@ PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (const ::Portable
         }
       else
         {
-          ObjectReferenceTemplateSeq *deep_copy =
-            new ObjectReferenceTemplateSeq (*p.ptr_);
+          ObjectReferenceTemplateSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ObjectReferenceTemplateSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -283,63 +343,68 @@ PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (const ::Portable
   return *this;
 }
 
-ACE_INLINE const ::PortableInterceptor::ObjectReferenceTemplateSeq *
+ACE_INLINE
+const ::PortableInterceptor::ObjectReferenceTemplateSeq *
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq *
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq *
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator const ::PortableInterceptor::ObjectReferenceTemplateSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator ::PortableInterceptor::ObjectReferenceTemplateSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator ::PortableInterceptor::ObjectReferenceTemplateSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator ::PortableInterceptor::ObjectReferenceTemplateSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
+ACE_INLINE
+TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
 PortableInterceptor::ObjectReferenceTemplateSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::PortableInterceptor::ObjectReferenceTemplateSeq &
+ACE_INLINE
+const ::PortableInterceptor::ObjectReferenceTemplateSeq &
 PortableInterceptor::ObjectReferenceTemplateSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq &
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq &
 PortableInterceptor::ObjectReferenceTemplateSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq *&
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq *&
 PortableInterceptor::ObjectReferenceTemplateSeq_var::out (void)
 {
   delete this->ptr_;
@@ -347,7 +412,8 @@ PortableInterceptor::ObjectReferenceTemplateSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq *
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq *
 PortableInterceptor::ObjectReferenceTemplateSeq_var::_retn (void)
 {
   ::PortableInterceptor::ObjectReferenceTemplateSeq *tmp = this->ptr_;
@@ -355,12 +421,16 @@ PortableInterceptor::ObjectReferenceTemplateSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq *
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq *
 PortableInterceptor::ObjectReferenceTemplateSeq_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 PortableInterceptor::ObjectReferenceTemplateSeq_out
 // *************************************************************
@@ -373,7 +443,7 @@ PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_
 }
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &p) // constructor from _var
+PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -381,76 +451,98 @@ PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_
 }
 
 ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (const ::PortableInterceptor::ObjectReferenceTemplateSeq_out &p) // copy constructor
+PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (const ::PortableInterceptor::ObjectReferenceTemplateSeq_out &p)
   : ptr_ (ACE_const_cast (ObjectReferenceTemplateSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq_out &
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq_out &
 PortableInterceptor::ObjectReferenceTemplateSeq_out::operator= (const ::PortableInterceptor::ObjectReferenceTemplateSeq_out &p)
 {
   this->ptr_ = ACE_const_cast (ObjectReferenceTemplateSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq_out &
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq_out &
 PortableInterceptor::ObjectReferenceTemplateSeq_out::operator= (ObjectReferenceTemplateSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplateSeq_out::operator ::PortableInterceptor::ObjectReferenceTemplateSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq *&
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq *&
 PortableInterceptor::ObjectReferenceTemplateSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableInterceptor::ObjectReferenceTemplateSeq *
+ACE_INLINE
+::PortableInterceptor::ObjectReferenceTemplateSeq *
 PortableInterceptor::ObjectReferenceTemplateSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
+ACE_INLINE
+TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
 PortableInterceptor::ObjectReferenceTemplateSeq_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_valuetype.cpp:712
+
 #if defined (__ACE_INLINE__)
-//@@ Boris: begin experimental
+
 TAO_NAMESPACE CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (PortableInterceptor::ObjectReferenceFactory *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (PortableInterceptor::ObjectReferenceFactory *);
 }
 TAO_NAMESPACE_CLOSE
-//@@ Boris: end experimental
+
 #endif /*__ACE_INLINE__*/
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ci.cpp:60
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:712
+
 #if defined (__ACE_INLINE__)
-//@@ Boris: begin experimental
+
 TAO_NAMESPACE CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (PortableInterceptor::ObjectReferenceTemplate *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (PortableInterceptor::ObjectReferenceTemplate *);
 }
 TAO_NAMESPACE_CLOSE
-//@@ Boris: end experimental
+
 #endif /*__ACE_INLINE__*/
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ci.cpp:60
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+
 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_I_
 #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_I_
 
@@ -458,6 +550,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const PortableInterceptor::ObjectReferenceTemplateSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     PortableInterceptor::ObjectReferenceTemplateSeq &
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 8d52f69c249..4e68b872b3c 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -1,56 +1,177 @@
+// -*- C++ -*-
+//
 // $Id$
 
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
+// ****  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 on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
-#include "tao/Object_KeyC.h"
+
+#include "Object_KeyC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/ORB_Core.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
 #include "Object_KeyC.i"
-#endif // !defined INLINE
+#endif /* !defined INLINE */
 
-ACE_RCSID(tao, Object_KeyC, "$Id$")
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-const CORBA::Long _oc_TAO__tao_seq_Octet[] =
+static const CORBA::Long _oc_TAO_ObjectKey[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
+  22,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744b65), 
+  ACE_NTOHL (0x793a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO/ObjectKey:1.0
+    10,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744b65), 
+  ACE_NTOHL (0x79000000),  // name = ObjectKey
+    CORBA::tk_sequence, // typecode kind
+  12, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
 
-  0,
+    0U,
+
 };
-CORBA::TypeCode _tc_TAO_tc_TAO__tao_seq_Octet (CORBA::tk_sequence, sizeof
-                                            (_oc_TAO__tao_seq_Octet), (char *)
-                                            &_oc_TAO__tao_seq_Octet, 0,
-                                            sizeof (TAO_ObjectKey));
-CORBA::TypeCode_ptr TAO_tc__tao_seq_Octet = &_tc_TAO_tc_TAO__tao_seq_Octet;
 
-const CORBA::Long _oc_TAO_ObjectKey[] =
+static CORBA::TypeCode _tc_TAO_tc_TAO_ObjectKey (
+    CORBA::tk_alias,
+    sizeof (_oc_TAO_ObjectKey),
+    (char *) &_oc_TAO_ObjectKey,
+    0,
+    sizeof (TAO::ObjectKey)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (TAO)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectKey,
+    &_tc_TAO_tc_TAO_ObjectKey
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TAO::ObjectKey &_tao_sequence
+  )
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  22, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744b65), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:TAO/ObjectKey:1.0
-  10, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744b65), ACE_NTOHL (0x7900fdfd),  // name = ObjectKey
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (TAO::ObjectKey *)&_tao_sequence);
+        if (oseq->mb ())
+          return strm.write_octet_array_mb (oseq->mb ());
+        else
+          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+      }
+      
+#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+    }
+  
+  return 0;
+}
 
-  0,
-};
-CORBA::TypeCode _tc_TAO_tc_TAO_ObjectKey (CORBA::tk_alias, sizeof
-                                       (_oc_TAO_ObjectKey), (char *)
-                                       &_oc_TAO_ObjectKey, 0,
-                                       sizeof (TAO_ObjectKey));
-CORBA::TypeCode_ptr TAO_tc_ObjectKey = &_tc_TAO_tc_TAO_ObjectKey;
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    TAO::ObjectKey &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      if (ACE_BIT_DISABLED (strm.start ()->flags (),
+      ACE_Message_Block::DONT_DELETE))
+      {
+        TAO_ORB_Core* orb_core = strm.orb_core ();
+        if (orb_core != 0 &&
+        strm.orb_core ()->resource_factory ()->
+        input_cdr_allocator_type_locked () == 1)
+        {
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+          oseq->replace (_tao_seq_len, strm.start ());
+          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+          strm.skip_bytes (_tao_seq_len);
+          return 1;
+        }
+      }
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
+#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+    }
+  
+  return 0;
+}
 
+// ****************************************************************
 
 void
-TAO_ObjectKey::encode_sequence_to_string (char * &str,
-                                          const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
+TAO::ObjectKey::encode_sequence_to_string (char * &str,
+                                           const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
 {
   // We must allocate a buffer which is (gag) 3 times the length
   // of the sequence, which is the length required in the worst-case
@@ -89,8 +210,8 @@ TAO_ObjectKey::encode_sequence_to_string (char * &str,
 }
 
 void
-TAO_ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                          const char *str)
+TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
+                                           const char *str)
 {
   if (str == 0)
     {
@@ -131,3 +252,4 @@ TAO_ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &
 }
 
 // ****************************************************************
+
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index b434e6c601d..fb1c2043991 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -1,17 +1,31 @@
 // -*- c++ -*-
 // $Id$
 //
-// Hand-modified by Chris Cleeland.
-//
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington
-// University Computer Science's Distributed Object Computing Group.
+// $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 on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_OBJECT_KEYC_H_
+#define _TAO_IDL_ORIG_OBJECT_KEYC_H_
 
-#ifndef TAO_IDL_OBJECT_KEYC_H
-#define TAO_IDL_OBJECT_KEYC_H
 #include "ace/pre.h"
 
 #include "tao/corbafwd.h"
@@ -22,88 +36,199 @@
 
 #include "tao/Sequence.h"
 
-class TAO_ObjectKey_var;
-
-class TAO_Export TAO_ObjectKey : public TAO_Unbounded_Sequence<CORBA::Octet>
-{
-  // = TITLE
-  //   TAO class used to represent Object Keys
-  //
-  // = DESCRIPTION
-  //   The object is basically a sequence of octets, but we derive
-  //   from it to create a unique type; this is useful for
-  //   overloading.
-  //
-public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef TAO_ObjectKey_var _var_type;
-  #endif /* __GNUC__ */
-
-  TAO_ObjectKey (void);
-  TAO_ObjectKey (CORBA::ULong max);
-  TAO_ObjectKey (CORBA::ULong max,
-                  CORBA::ULong length,
-                  CORBA::Octet *data,
-                  CORBA::Boolean release = 0);
-  TAO_ObjectKey (const TAO_ObjectKey &);
-  TAO_ObjectKey& operator= (const TAO_ObjectKey &);
-
-  static void encode_sequence_to_string (char * &str,
-                                         const TAO_Unbounded_Sequence<CORBA::Octet> &seq);
-  static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                         const char *str);
-};
-
-class TAO_Export TAO_ObjectKey_var
-{
-public:
-  TAO_ObjectKey_var (void); // default constructor
-  TAO_ObjectKey_var (TAO_ObjectKey *);
-  TAO_ObjectKey_var (const TAO_ObjectKey_var &); // copy constructor
-  ~TAO_ObjectKey_var (void); // destructor
-
-  TAO_ObjectKey_var &operator= (TAO_ObjectKey *);
-  TAO_ObjectKey_var &operator= (const TAO_ObjectKey_var &);
-  TAO_ObjectKey *operator-> (void);
-  const TAO_ObjectKey *operator-> (void) const;
-
-  operator const TAO_ObjectKey &() const;
-  operator TAO_ObjectKey &();
-  operator TAO_ObjectKey &() const;
-  CORBA::Octet &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn
-  const TAO_ObjectKey &in (void) const;
-  TAO_ObjectKey &inout (void);
-  TAO_ObjectKey *&out (void);
-  TAO_ObjectKey *_retn (void);
-  TAO_ObjectKey *ptr (void) const;
-
-private:
-  TAO_ObjectKey *ptr_;
-};
-
-class TAO_Export TAO_ObjectKey_out
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+namespace TAO
 {
-public:
-  TAO_ObjectKey_out (TAO_ObjectKey *&);
-  TAO_ObjectKey_out (TAO_ObjectKey_var &);
-  TAO_ObjectKey_out (TAO_ObjectKey_out &);
-  TAO_ObjectKey_out &operator= (TAO_ObjectKey_out &);
-  TAO_ObjectKey_out &operator= (TAO_ObjectKey *);
-  operator TAO_ObjectKey *&();
-  TAO_ObjectKey *&ptr (void);
-  TAO_ObjectKey *operator-> (void);
-  CORBA::Octet &operator[] (CORBA::ULong index);
-
-private:
-  TAO_ObjectKey *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const TAO_ObjectKey_var &);
-};
 
-#if defined (__ACE_INLINE__)
-#include "tao/Object_KeyC.i"
+#if !defined (_TAO_OBJECTKEY_CH_)
+#define _TAO_OBJECTKEY_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
+  class ObjectKey;
+  class ObjectKey_var;
+  
+  // *************************************************************
+  // TAO::ObjectKey
+  // *************************************************************
+  
+  class TAO_Export ObjectKey : 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<CORBA::Octet>
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Sequence<CORBA::Octet>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  {
+  public:
+    ObjectKey (void);
+    ObjectKey (CORBA::ULong max);
+    ObjectKey (
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        CORBA::Octet *buffer, 
+        CORBA::Boolean release = 0
+      );
+    ObjectKey (const ObjectKey &);
+    ObjectKey& operator= (const ObjectKey &);
+
+    static void encode_sequence_to_string (char * &str,
+                                           const TAO_Unbounded_Sequence<CORBA::Octet> &seq);
+    static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
+                                           const char *str);
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_TAO_OBJECTKEY___VAR_CH_)
+#define _TAO_OBJECTKEY___VAR_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
+  // *************************************************************
+  // class TAO::ObjectKey_var
+  // *************************************************************
+  
+  class TAO_Export ObjectKey_var
+  {
+  public:
+    ObjectKey_var (void);
+    ObjectKey_var (ObjectKey *);
+    ObjectKey_var (const ObjectKey_var &);
+    
+    // Fixed-size base types only.
+    ObjectKey_var (const ObjectKey &);
+    
+    ~ObjectKey_var (void);
+    
+    ObjectKey_var &operator= (ObjectKey *);
+    ObjectKey_var &operator= (const ObjectKey_var &);
+    
+    // Fixed-size base types only.
+    ObjectKey_var &operator= (const ObjectKey &);
+    
+    ObjectKey *operator-> (void);
+    const ObjectKey *operator-> (void) const;
+    
+    operator const ObjectKey &() const;
+    operator ObjectKey &();
+    operator ObjectKey &() const;
+    CORBA::Octet & operator[] (CORBA::ULong index);
+    const CORBA::Octet & operator[] (CORBA::ULong index) const;
+    
+    // in, inout, out, _retn 
+    const ObjectKey &in (void) const;
+    ObjectKey &inout (void);
+    ObjectKey *&out (void);
+    ObjectKey *_retn (void);
+    ObjectKey *ptr (void) const;
+  
+  private:
+    ObjectKey *ptr_;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_TAO_OBJECTKEY___OUT_CH_)
+#define _TAO_OBJECTKEY___OUT_CH_
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
+  class TAO_Export ObjectKey_out
+  {
+  public:
+    ObjectKey_out (ObjectKey *&);
+    ObjectKey_out (ObjectKey_var &);
+    ObjectKey_out (const ObjectKey_out &);
+    ObjectKey_out &operator= (const ObjectKey_out &);
+    ObjectKey_out &operator= (ObjectKey *);
+    operator ObjectKey *&();
+    ObjectKey *&ptr (void);
+    ObjectKey *operator-> (void);
+    CORBA::Octet & operator[] (CORBA::ULong index);
+  
+  private:
+    ObjectKey *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ObjectKey_var &);
+  };
+
+#endif /* end #if !defined */
+  
+}
+TAO_NAMESPACE_CLOSE // module TAO
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
+#ifndef __ACE_INLINE__
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_TAO_ObjectKey_H_
+#define _TAO_CDR_OP_TAO_ObjectKey_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const TAO::ObjectKey &
+  );
+TAO_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    TAO::ObjectKey &
+  );
+
+#endif /* _TAO_CDR_OP_TAO_ObjectKey_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+
+#if defined (__ACE_INLINE__)
+#include "Object_KeyC.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
-#endif /* TAO_IDL_OBJECT_KEYC_H */
+#endif /* ifndef */
+
diff --git a/TAO/tao/Object_KeyC.i b/TAO/tao/Object_KeyC.i
index 4f26c346930..31710a4403b 100644
--- a/TAO/tao/Object_KeyC.i
+++ b/TAO/tao/Object_KeyC.i
@@ -1,92 +1,125 @@
+// -*- C++ -*-
+//
 // $Id$
 
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
+// ****  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 on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
 
 // *************************************************************
-// Inline operations for class TAO_ObjectKey
+// Inline operations for class TAO::ObjectKey
 // *************************************************************
 
 ACE_INLINE
-TAO_ObjectKey::TAO_ObjectKey (void)
+TAO::ObjectKey::ObjectKey (void)
 {
 }
 
 ACE_INLINE
-TAO_ObjectKey::TAO_ObjectKey (CORBA::ULong max)
+TAO::ObjectKey::ObjectKey (CORBA::ULong max)
   :  TAO_Unbounded_Sequence<CORBA::Octet> (max)
 {
 }
 
 ACE_INLINE
-TAO_ObjectKey::TAO_ObjectKey (CORBA::ULong max,
-                                CORBA::ULong length,
-                                CORBA::Octet *data,
-                                CORBA::Boolean release)
+TAO::ObjectKey::ObjectKey (CORBA::ULong max,
+                           CORBA::ULong length,
+                           CORBA::Octet *data,
+                           CORBA::Boolean release)
   :  TAO_Unbounded_Sequence<CORBA::Octet> (max, length, data, release)
 {
 }
 
 ACE_INLINE
-TAO_ObjectKey::TAO_ObjectKey (const TAO_ObjectKey &rhs)
+TAO::ObjectKey::ObjectKey (const TAO::ObjectKey &rhs)
   :  TAO_Unbounded_Sequence<CORBA::Octet> (rhs)
 {
 }
 
-ACE_INLINE TAO_ObjectKey&
-TAO_ObjectKey::operator= (const TAO_ObjectKey &rhs)
+ACE_INLINE TAO::ObjectKey &
+TAO::ObjectKey::operator= (const TAO::ObjectKey &rhs)
 {
   if (this == &rhs)
-    return *this;
+    {
+        return *this;
+    }
 
   TAO_Unbounded_Sequence<CORBA::Octet>::operator= (rhs);
   return *this;
 }
 
+#if !defined (_TAO_OBJECTKEY_CI_)
+#define _TAO_OBJECTKEY_CI_
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
-// Inline operations for class TAO_ObjectKey_var
+// Inline operations for class TAO::ObjectKey_var
 // *************************************************************
 
 ACE_INLINE
-TAO_ObjectKey_var::TAO_ObjectKey_var (void) // default constructor
-	: ptr_ (0)
+TAO::ObjectKey_var::ObjectKey_var (void)
+  : ptr_ (0)
 {}
 
 ACE_INLINE
-TAO_ObjectKey_var::TAO_ObjectKey_var (TAO_ObjectKey *p)
-	: ptr_ (p)
+TAO::ObjectKey_var::ObjectKey_var (ObjectKey *p)
+  : ptr_ (p)
 {}
 
 ACE_INLINE
-TAO_ObjectKey_var::TAO_ObjectKey_var (const TAO_ObjectKey_var &p) // copy constructor
+TAO::ObjectKey_var::ObjectKey_var (const ::TAO::ObjectKey_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, 
-             TAO_ObjectKey(*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::TAO::ObjectKey (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
+}
+
+// Fixed-size base types only.
+ACE_INLINE
+TAO::ObjectKey_var::ObjectKey_var (const ::TAO::ObjectKey &p)
+{
+  ACE_NEW (this->ptr_, ::TAO::ObjectKey (p));
 }
 
 ACE_INLINE
-TAO_ObjectKey_var::~TAO_ObjectKey_var (void) // destructor
+TAO::ObjectKey_var::~ObjectKey_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE TAO_ObjectKey_var &
-TAO_ObjectKey_var::operator= (TAO_ObjectKey *p)
+ACE_INLINE
+TAO::ObjectKey_var &
+TAO::ObjectKey_var::operator= (ObjectKey *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE TAO_ObjectKey_var &
-TAO_ObjectKey_var::operator= (const TAO_ObjectKey_var &p) // deep copy
+ACE_INLINE
+::TAO::ObjectKey_var &
+TAO::ObjectKey_var::operator= (const ::TAO::ObjectKey_var &p)
 {
   if (this != &p)
     {
@@ -97,12 +130,16 @@ TAO_ObjectKey_var::operator= (const TAO_ObjectKey_var &p) // deep copy
         }
       else
         {
-          TAO_ObjectKey *deep_copy = 
-            new TAO_ObjectKey (*p.ptr_);
+          ObjectKey *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ObjectKey (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              TAO_ObjectKey *tmp = deep_copy;
+              ObjectKey *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -113,136 +150,174 @@ TAO_ObjectKey_var::operator= (const TAO_ObjectKey_var &p) // deep copy
   return *this;
 }
 
-ACE_INLINE const TAO_ObjectKey *
-TAO_ObjectKey_var::operator-> (void) const
+// Fixed-size types only.
+ACE_INLINE
+::TAO::ObjectKey_var &
+TAO::ObjectKey_var::operator= (const ::TAO::ObjectKey &p)
+{
+  if (this->ptr_ != &p)
+    {
+      delete this->ptr_;
+      ACE_NEW_RETURN (this->ptr_, ::TAO::ObjectKey (p), *this);
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+const ::TAO::ObjectKey *
+TAO::ObjectKey_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_ObjectKey *
-TAO_ObjectKey_var::operator-> (void)
+ACE_INLINE
+::TAO::ObjectKey *
+TAO::ObjectKey_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-TAO_ObjectKey_var::operator const TAO_ObjectKey &() const // cast
+ACE_INLINE
+TAO::ObjectKey_var::operator const ::TAO::ObjectKey &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-TAO_ObjectKey_var::operator TAO_ObjectKey &() // cast 
+ACE_INLINE
+TAO::ObjectKey_var::operator ::TAO::ObjectKey &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-TAO_ObjectKey_var::operator TAO_ObjectKey &() const// cast 
+ACE_INLINE
+TAO::ObjectKey_var::operator ::TAO::ObjectKey &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA::Octet &
-TAO_ObjectKey_var::operator[] (CORBA::ULong slot)
+ACE_INLINE
+CORBA::Octet &
+TAO::ObjectKey_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE
+const CORBA::Octet &
+TAO::ObjectKey_var::operator[] (CORBA::ULong index) const
 {
-  return this->ptr_->operator[] (slot);
+  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const TAO_ObjectKey &
-TAO_ObjectKey_var::in (void) const
+ACE_INLINE
+const ::TAO::ObjectKey &
+TAO::ObjectKey_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE TAO_ObjectKey &
-TAO_ObjectKey_var::inout (void)
+ACE_INLINE
+::TAO::ObjectKey &
+TAO::ObjectKey_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE TAO_ObjectKey *&
-TAO_ObjectKey_var::out (void)
+ACE_INLINE
+::TAO::ObjectKey *&
+TAO::ObjectKey_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE TAO_ObjectKey *
-TAO_ObjectKey_var::_retn (void)
+ACE_INLINE
+::TAO::ObjectKey *
+TAO::ObjectKey_var::_retn (void)
 {
-  TAO_ObjectKey *tmp = this->ptr_;
+  ::TAO::ObjectKey *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE TAO_ObjectKey *
-TAO_ObjectKey_var::ptr (void) const
+ACE_INLINE
+::TAO::ObjectKey *
+TAO::ObjectKey_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 TAO_ObjectKey_out
+// Inline operations for class TAO::ObjectKey_out
 // *************************************************************
 
 ACE_INLINE
-TAO_ObjectKey_out::TAO_ObjectKey_out (TAO_ObjectKey *&p)
-	: ptr_ (p)
+TAO::ObjectKey_out::ObjectKey_out (ObjectKey *&p)
+  : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-TAO_ObjectKey_out::TAO_ObjectKey_out (TAO_ObjectKey_var &p) // constructor from _var
-	: ptr_ (p.out ())
+TAO::ObjectKey_out::ObjectKey_out (ObjectKey_var &p)
+  : ptr_ (p.out ())
 {
   delete this->ptr_;
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-TAO_ObjectKey_out::TAO_ObjectKey_out (TAO_ObjectKey_out &p) // copy constructor
-	: ptr_ (p.ptr_)
+TAO::ObjectKey_out::ObjectKey_out (const ::TAO::ObjectKey_out &p)
+  : ptr_ (ACE_const_cast (ObjectKey_out&, p).ptr_)
 {}
 
-ACE_INLINE TAO_ObjectKey_out &
-TAO_ObjectKey_out::operator= (TAO_ObjectKey_out &p)
+ACE_INLINE
+::TAO::ObjectKey_out &
+TAO::ObjectKey_out::operator= (const ::TAO::ObjectKey_out &p)
 {
-  this->ptr_ = p.ptr_;
+  this->ptr_ = ACE_const_cast (ObjectKey_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE TAO_ObjectKey_out &
-TAO_ObjectKey_out::operator= (TAO_ObjectKey *p)
+ACE_INLINE
+::TAO::ObjectKey_out &
+TAO::ObjectKey_out::operator= (ObjectKey *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
-TAO_ObjectKey_out::operator TAO_ObjectKey *&() // cast
+ACE_INLINE
+TAO::ObjectKey_out::operator ::TAO::ObjectKey *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_ObjectKey *&
-TAO_ObjectKey_out::ptr (void) // ptr
+ACE_INLINE
+::TAO::ObjectKey *&
+TAO::ObjectKey_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_ObjectKey *
-TAO_ObjectKey_out::operator-> (void)
+ACE_INLINE
+::TAO::ObjectKey *
+TAO::ObjectKey_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Octet &
-TAO_ObjectKey_out::operator[] (CORBA::ULong slot)
+ACE_INLINE
+CORBA::Octet &
+TAO::ObjectKey_out::operator[] (CORBA::ULong index)
 {
-  return this->ptr_->operator[] (slot);
+  return this->ptr_->operator[] (index);
 }
 
+#endif /* end #if !defined */
+
diff --git a/TAO/tao/Object_Proxy_Impl.cpp b/TAO/tao/Object_Proxy_Impl.cpp
index dba83c961fc..9f61e119c4e 100644
--- a/TAO/tao/Object_Proxy_Impl.cpp
+++ b/TAO/tao/Object_Proxy_Impl.cpp
@@ -1,10 +1,11 @@
+// $Id$
+
 #include "tao/Object_Proxy_Impl.h"
 
 ACE_RCSID (tao,
            Object_Proxy_Impl,
            "$Id$")
 
-
 TAO_Object_Proxy_Impl::~TAO_Object_Proxy_Impl (void)
 {
 }
diff --git a/TAO/tao/Object_Proxy_Impl.h b/TAO/tao/Object_Proxy_Impl.h
index cf8d14d7adf..13c9a296635 100644
--- a/TAO/tao/Object_Proxy_Impl.h
+++ b/TAO/tao/Object_Proxy_Impl.h
@@ -27,6 +27,11 @@
 
 #include "ace/CORBA_macros.h"
 
+namespace CORBA
+{
+  class InterfaceDef;
+  typedef InterfaceDef *InterfaceDef_ptr;
+};
 
 /**
  * @class TAO_Object_Proxy_Impl
diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl
index 1c5708dee1d..dafe79c3a23 100644
--- a/TAO/tao/OctetSeq.pidl
+++ b/TAO/tao/OctetSeq.pidl
@@ -4,13 +4,13 @@
 
 // ================================================================
 //
-//   This file was used to generate the code in PortableInterceptorC.*
+//   This file was used to generate the code in OctetSeqC.*
 //   The command used to generate code is:
 //
 //     tao_idl
-//        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+//        -o orig -Gp -Gd -Ge 1
 //          -Wb,export_macro=TAO_Export
-//          -Wb,export_include="corbafwd.h"
+//          -Wb,export_include="tao/corbafwd.h"
 //          -Wb,pre_include="ace/pre.h"
 //          -Wb,post_include="ace/post.h"
 //          OctetSeq.pidl
@@ -30,6 +30,4 @@ module CORBA
   typedef sequence<octet> OctetSeq;
 };
 
-#pragma prefix ""
-
 #endif  /* TAO_CORBA_OCTET_SEQ_IDL */
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index 70fb24a8a53..08a15a1a13a 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -19,74 +19,108 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
 #include "OctetSeqC.h"
 
 #if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
 #include "OctetSeqC.i"
 #endif /* !defined INLINE */
 
-#include "Any.h"
-#include "CDR.h"
-#include "Typecode.h"
+#include "Any_T.h"
 #include "ORB_Core.h"
 
 #if !defined (_CORBA_OCTETSEQ_CS_)
 #define _CORBA_OCTETSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::OctetSeq
 // *************************************************************
 
 CORBA::OctetSeq::OctetSeq (void)
 {}
-CORBA::OctetSeq::OctetSeq (CORBA::ULong max) // uses max size
-  :
+
+CORBA::OctetSeq::OctetSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
+TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::Octet>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA::OctetSeq::OctetSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+
+CORBA::OctetSeq::OctetSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Octet *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
+TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::Octet>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA::OctetSeq::OctetSeq (const CORBA::OctetSeq &seq) // copy ctor
-  :
+
+CORBA::OctetSeq::OctetSeq (const OctetSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
+TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::Octet>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 CORBA::OctetSeq::~OctetSeq (void) // dtor
 {}
-void CORBA::OctetSeq::_tao_any_destructor (void *x)
+
+void CORBA::OctetSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA::OctetSeq *tmp = ACE_static_cast (CORBA::OctetSeq*,x);
+  OctetSeq *tmp = ACE_static_cast (OctetSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_OctetSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  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
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  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,
@@ -94,130 +128,113 @@ static const CORBA::Long _oc_CORBA_OctetSeq[] =
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (CORBA::tk_alias, sizeof (_oc_CORBA_OctetSeq), (char *) &_oc_CORBA_OctetSeq, 0, sizeof (CORBA::OctetSeq));
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_OctetSeq),
+    (char *) &_oc_CORBA_OctetSeq,
+    0,
+    sizeof (CORBA::OctetSeq)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OctetSeq, &_tc_TAO_tc_CORBA_OctetSeq)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_OctetSeq,
+    &_tc_TAO_tc_CORBA_OctetSeq
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const CORBA::OctetSeq &_tao_elem
-  ) // copying
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_OctetSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert_copy (
+      _tao_any,
+      CORBA::OctetSeq::_tao_any_destructor,
+      CORBA::_tc_OctetSeq,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::OctetSeq *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OctetSeq *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert (
+      _tao_any,
+      CORBA::OctetSeq::_tao_any_destructor,
       CORBA::_tc_OctetSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::OctetSeq::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OctetSeq *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::OctetSeq *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::OctetSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::OctetSeq *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::OctetSeq *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::OctetSeq *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CORBA::_tc_OctetSeq ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA::OctetSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA::OctetSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::OctetSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_OctetSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA::OctetSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::extract (
+        _tao_any,
+        CORBA::OctetSeq::_tao_any_destructor,
+        CORBA::_tc_OctetSeq,
+        _tao_elem
+      );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::OctetSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA::OctetSeq *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
+      // Encode all elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA::OctetSeq *)&_tao_sequence);
+        if (oseq->mb ())
+          return strm.write_octet_array_mb (oseq->mb ());
+        else
+          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+      }
+      
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -226,40 +243,52 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),
-                          ACE_Message_Block::DONT_DELETE))
+      if (ACE_BIT_DISABLED (strm.start ()->flags (),
+      ACE_Message_Block::DONT_DELETE))
       {
         TAO_ORB_Core* orb_core = strm.orb_core ();
-
         if (orb_core != 0 &&
-            strm.orb_core ()->resource_factory ()->
-            input_cdr_allocator_type_locked () == 1)
-          {
-            TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-              ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-            oseq->replace (_tao_seq_len, strm.start ());
-            oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-            strm.skip_bytes (_tao_seq_len);
-            return 1;
-          }
+        strm.orb_core ()->resource_factory ()->
+        input_cdr_allocator_type_locked () == 1)
+        {
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+          oseq->replace (_tao_seq_len, strm.start ());
+          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+          strm.skip_bytes (_tao_seq_len);
+          return 1;
+        }
       }
-
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
+
diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h
index c53e4441312..b03afe024c8 100644
--- a/TAO/tao/OctetSeqC.h
+++ b/TAO/tao/OctetSeqC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_CORBA_OCTETSEQC_H_
-#define _TAO_IDL_CORBA_OCTETSEQC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_OCTETSEQC_H_
+#define _TAO_IDL_ORIG_OCTETSEQC_H_
 
 #include "ace/pre.h"
 #include "corbafwd.h"
@@ -68,9 +71,10 @@ namespace CORBA
   
   class TAO_Export OctetSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_Sequence<CORBA::Octet>
+  TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA::Octet>
+  TAO_Unbounded_Sequence<CORBA::Octet>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
@@ -98,15 +102,16 @@ namespace CORBA
       )
       : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-
   };
-  
-#endif /* end #if !defined */
 
+#endif /* end #if !defined */
 
 #if !defined (_CORBA_OCTETSEQ___VAR_CH_)
 #define _CORBA_OCTETSEQ___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::OctetSeq_var
   // *************************************************************
@@ -144,10 +149,8 @@ namespace CORBA
     OctetSeq *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_OCTETSEQ___OUT_CH_)
 #define _CORBA_OCTETSEQ___OUT_CH_
 
@@ -163,17 +166,25 @@ namespace CORBA
     OctetSeq *&ptr (void);
     OctetSeq *operator-> (void);
     CORBA::Octet & operator[] (CORBA::ULong index);
-    
+  
   private:
     OctetSeq *&ptr_;
     // assignment from T_var not allowed
     void operator= (const OctetSeq_var &);
   };
 
-
 #endif /* end #if !defined */
+  
+  // 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_OctetSeq;
 
-}  // End namespace CORBA
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
+}
+TAO_NAMESPACE_CLOSE // module CORBA
 
 // Proxy Broker Factory function pointer declarations.
 
@@ -184,6 +195,8 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_
 #define _TAO_CDR_OP_CORBA_OctetSeq_H_
@@ -199,9 +212,13 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "OctetSeqC.i"
@@ -217,3 +234,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/OctetSeqC.i b/TAO/tao/OctetSeqC.i
index b713fedefb6..9fcc77e584e 100644
--- a/TAO/tao/OctetSeqC.i
+++ b/TAO/tao/OctetSeqC.i
@@ -23,30 +23,37 @@
 #if !defined (_CORBA_OCTETSEQ_CI_)
 #define _CORBA_OCTETSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class CORBA::OctetSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::OctetSeq_var::OctetSeq_var (void) // default constructor
+CORBA::OctetSeq_var::OctetSeq_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA::OctetSeq_var::OctetSeq_var (CORBA::OctetSeq *p)
+CORBA::OctetSeq_var::OctetSeq_var (OctetSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA::OctetSeq_var::OctetSeq_var (const CORBA::OctetSeq_var &p) // copy constructor
+CORBA::OctetSeq_var::OctetSeq_var (const ::CORBA::OctetSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, CORBA::OctetSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CORBA::OctetSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size base types only
+// Fixed-size base types only.
 ACE_INLINE
 CORBA::OctetSeq_var::OctetSeq_var (const ::CORBA::OctetSeq &p)
 {
@@ -54,20 +61,22 @@ CORBA::OctetSeq_var::OctetSeq_var (const ::CORBA::OctetSeq &p)
 }
 
 ACE_INLINE
-CORBA::OctetSeq_var::~OctetSeq_var (void) // destructor
+CORBA::OctetSeq_var::~OctetSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::OctetSeq_var &
-CORBA::OctetSeq_var::operator= (CORBA::OctetSeq *p)
+ACE_INLINE
+CORBA::OctetSeq_var &
+CORBA::OctetSeq_var::operator= (OctetSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::CORBA::OctetSeq_var &
+ACE_INLINE
+::CORBA::OctetSeq_var &
 CORBA::OctetSeq_var::operator= (const ::CORBA::OctetSeq_var &p)
 {
   if (this != &p)
@@ -79,12 +88,16 @@ CORBA::OctetSeq_var::operator= (const ::CORBA::OctetSeq_var &p)
         }
       else
         {
-          CORBA::OctetSeq *deep_copy =
-            new CORBA::OctetSeq (*p.ptr_);
+          OctetSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              OctetSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              CORBA::OctetSeq *tmp = deep_copy;
+              OctetSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -95,74 +108,82 @@ CORBA::OctetSeq_var::operator= (const ::CORBA::OctetSeq_var &p)
   return *this;
 }
 
-// fixed-size types only
-ACE_INLINE ::CORBA::OctetSeq_var &
+// Fixed-size types only.
+ACE_INLINE
+::CORBA::OctetSeq_var &
 CORBA::OctetSeq_var::operator= (const ::CORBA::OctetSeq &p)
 {
   if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::CORBA::OctetSeq (p), *this);
-  }
+    {
+      delete this->ptr_;
+      ACE_NEW_RETURN (this->ptr_, ::CORBA::OctetSeq (p), *this);
+    }
+  
   return *this;
 }
 
-ACE_INLINE const ::CORBA::OctetSeq *
+ACE_INLINE
+const ::CORBA::OctetSeq *
 CORBA::OctetSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::OctetSeq *
+ACE_INLINE
+::CORBA::OctetSeq *
 CORBA::OctetSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::OctetSeq_var::operator const ::CORBA::OctetSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::OctetSeq_var::operator ::CORBA::OctetSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::OctetSeq_var::operator ::CORBA::OctetSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA::Octet &
+ACE_INLINE
+CORBA::Octet &
 CORBA::OctetSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::Octet &
+ACE_INLINE
+const CORBA::Octet &
 CORBA::OctetSeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::CORBA::OctetSeq &
+ACE_INLINE
+const ::CORBA::OctetSeq &
 CORBA::OctetSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::OctetSeq &
+ACE_INLINE
+::CORBA::OctetSeq &
 CORBA::OctetSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA::OctetSeq *&
+ACE_INLINE
+::CORBA::OctetSeq *&
 CORBA::OctetSeq_var::out (void)
 {
   delete this->ptr_;
@@ -170,7 +191,8 @@ CORBA::OctetSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::OctetSeq *
+ACE_INLINE
+::CORBA::OctetSeq *
 CORBA::OctetSeq_var::_retn (void)
 {
   ::CORBA::OctetSeq *tmp = this->ptr_;
@@ -178,25 +200,29 @@ CORBA::OctetSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::CORBA::OctetSeq *
+ACE_INLINE
+::CORBA::OctetSeq *
 CORBA::OctetSeq_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_OctetSeq_out
+// Inline operations for class CORBA::OctetSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA::OctetSeq_out::OctetSeq_out (CORBA::OctetSeq *&p)
+CORBA::OctetSeq_out::OctetSeq_out (OctetSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::OctetSeq_out::OctetSeq_out (CORBA::OctetSeq_var &p) // constructor from _var
+CORBA::OctetSeq_out::OctetSeq_out (OctetSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -204,51 +230,57 @@ CORBA::OctetSeq_out::OctetSeq_out (CORBA::OctetSeq_var &p) // constructor from _
 }
 
 ACE_INLINE
-CORBA::OctetSeq_out::OctetSeq_out (const ::CORBA::OctetSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::OctetSeq_out&, p).ptr_)
+CORBA::OctetSeq_out::OctetSeq_out (const ::CORBA::OctetSeq_out &p)
+  : ptr_ (ACE_const_cast (OctetSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA::OctetSeq_out &
+ACE_INLINE
+::CORBA::OctetSeq_out &
 CORBA::OctetSeq_out::operator= (const ::CORBA::OctetSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA::OctetSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (OctetSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA::OctetSeq_out &
-CORBA::OctetSeq_out::operator= (CORBA::OctetSeq *p)
+ACE_INLINE
+::CORBA::OctetSeq_out &
+CORBA::OctetSeq_out::operator= (OctetSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::OctetSeq_out::operator ::CORBA::OctetSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::OctetSeq *&
+ACE_INLINE
+::CORBA::OctetSeq *&
 CORBA::OctetSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::OctetSeq *
+ACE_INLINE
+::CORBA::OctetSeq *
 CORBA::OctetSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Octet &
+ACE_INLINE
+CORBA::Octet &
 CORBA::OctetSeq_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/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_I_
 #define _TAO_CDR_OP_CORBA_OctetSeq_I_
@@ -257,6 +289,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA::OctetSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA::OctetSeq &
diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl
index 256fa10946b..1374580b17b 100644
--- a/TAO/tao/Policy.pidl
+++ b/TAO/tao/Policy.pidl
@@ -17,7 +17,7 @@
  *   command used for this is:
  *
  *     tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/corbafwd.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 338fd760bb5..1b229e902aa 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PolicyC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
+
+#include "PolicyC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,9 +44,12 @@
 #include "PolicyC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_PolicyErrorCode[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   38,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -53,12 +61,12 @@ static const CORBA::Long _oc_CORBA_PolicyErrorCode[] =
   ACE_NTOHL (0x72436f64), 
   ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0
-  16,
+    16,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63794572), 
   ACE_NTOHL (0x726f7243), 
   ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -72,42 +80,28 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyErrorCode (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyErrorCode, &_tc_TAO_tc_CORBA_PolicyErrorCode)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyErrorCode,
+    &_tc_TAO_tc_CORBA_PolicyErrorCode
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, BAD_POLICY, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, UNSUPPORTED_POLICY, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, BAD_POLICY_TYPE, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, BAD_POLICY_VALUE, 3)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, UNSUPPORTED_POLICY_VALUE, 4)
-TAO_NAMESPACE_END
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 CORBA::PolicyError::PolicyError (void)
-  : CORBA::UserException ("IDL:omg.org/CORBA/PolicyError:1.0",
-                          "PolicyError")
+  : CORBA::UserException (
+        "IDL:omg.org/CORBA/PolicyError:1.0",
+        "PolicyError"
+      )
 {
 }
 
-// Destructor - all members are of self managing types.
 CORBA::PolicyError::~PolicyError (void)
 {
 }
 
-// Copy constructor.
 CORBA::PolicyError::PolicyError (const ::CORBA::PolicyError &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -117,7 +111,6 @@ CORBA::PolicyError::PolicyError (const ::CORBA::PolicyError &_tao_excp)
   this->reason = _tao_excp.reason;
 }
 
-// Assignment operator.
 CORBA::PolicyError&
 CORBA::PolicyError::operator= (const ::CORBA::PolicyError &_tao_excp)
 {
@@ -133,11 +126,11 @@ void CORBA::PolicyError::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA::PolicyError *
-CORBA::PolicyError::_downcast (CORBA::Exception *exc)
+CORBA::PolicyError::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (PolicyError *, exc);
+      return ACE_dynamic_cast (PolicyError *, _tao_excp);
     }
   else
     {
@@ -164,7 +157,7 @@ CORBA::PolicyError::_tao_duplicate (void) const
   return result;
 }
 
-void CORBA::PolicyError::_raise ()
+void CORBA::PolicyError::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -195,18 +188,34 @@ void CORBA::PolicyError::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+
 CORBA::PolicyError::PolicyError (
     CORBA::PolicyErrorCode _tao_reason
-  )
-  : CORBA::UserException ("IDL:omg.org/CORBA/PolicyError:1.0",
-                          "PolicyError")
+  )  
+  : CORBA::UserException (
+      "IDL:omg.org/CORBA/PolicyError:1.0",
+      "PolicyError"
+    )
 {
   this->reason = _tao_reason;
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr CORBA::PolicyError::_type (void) const
+{
+  return ::CORBA::_tc_PolicyError;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_PolicyError[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   34,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -217,15 +226,15 @@ static const CORBA::Long _oc_CORBA_PolicyError[] =
   ACE_NTOHL (0x4572726f), 
   ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyError:1.0
-  12,
+    12,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63794572), 
   ACE_NTOHL (0x726f7200),  // name = PolicyError
   1, // member count
-  7,
+    7,
   ACE_NTOHL (0x72656173), 
   ACE_NTOHL (0x6f6e0000),  // name = reason
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
@@ -239,12 +248,12 @@ static const CORBA::Long _oc_CORBA_PolicyError[] =
     ACE_NTOHL (0x72436f64), 
     ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0
-    16,
+        16,
     ACE_NTOHL (0x506f6c69), 
     ACE_NTOHL (0x63794572), 
     ACE_NTOHL (0x726f7243), 
     ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
-    CORBA::tk_short,
+        CORBA::tk_short,
 
 
 };
@@ -259,16 +268,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyError (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyError, &_tc_TAO_tc_CORBA_PolicyError)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyError,
+    &_tc_TAO_tc_CORBA_PolicyError
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::PolicyError::_type (void) const
-{
-  return ::CORBA::_tc_PolicyError;
-}
-
+// 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)
 
@@ -282,16 +290,21 @@ CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_U
   tmp = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (length);
   
   if (this->buffer_ != 0)
-  {
-    CORBA::UShort *old = ACE_reinterpret_cast (CORBA::UShort *,this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-    
-    if (this->release_)
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (old);
-    
-  }
+    {
+      CORBA::UShort *old =
+        ACE_reinterpret_cast (CORBA::UShort *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -299,87 +312,105 @@ void
 CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-  
-  CORBA::UShort *tmp = ACE_reinterpret_cast (CORBA::UShort *,this->buffer_);
+    {
+      return;
+    }
   
+  CORBA::UShort *tmp =
+    ACE_reinterpret_cast (CORBA::UShort *, this->buffer_);
   _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp);
   this->buffer_ = 0;
 } 
 
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::~_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) // Dtor.
+CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::~_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_)
 #define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::InvalidPolicies::_tao_seq_UShort
 // *************************************************************
 
 CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (void)
 {}
-CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max) // uses max size
+
+CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::UShort>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max, CORBA::ULong length, CORBA::UShort *buffer, CORBA::Boolean release)
+
+CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::UShort *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::UShort>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (const _tao_seq_UShort &seq) // copy ctor
+
+CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (const _tao_seq_UShort &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::UShort>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 CORBA::InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void) // dtor
 {}
+
 void CORBA::InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *_tao_void_pointer)
 {
   _tao_seq_UShort *tmp = ACE_static_cast (_tao_seq_UShort*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 CORBA::InvalidPolicies::InvalidPolicies (void)
   : CORBA::UserException (
-                          "IDL:omg.org/CORBA/InvalidPolicies:1.0",
-                          "InvalidPolicies"
-                          )
+        "IDL:omg.org/CORBA/InvalidPolicies:1.0",
+        "InvalidPolicies"
+      )
 {
 }
 
-// Destructor - all members are of self managing types.
 CORBA::InvalidPolicies::~InvalidPolicies (void)
 {
 }
 
-// Copy constructor.
 CORBA::InvalidPolicies::InvalidPolicies (const ::CORBA::InvalidPolicies &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -389,7 +420,6 @@ CORBA::InvalidPolicies::InvalidPolicies (const ::CORBA::InvalidPolicies &_tao_ex
   this->indices = _tao_excp.indices;
 }
 
-// Assignment operator.
 CORBA::InvalidPolicies&
 CORBA::InvalidPolicies::operator= (const ::CORBA::InvalidPolicies &_tao_excp)
 {
@@ -405,11 +435,11 @@ void CORBA::InvalidPolicies::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA::InvalidPolicies *
-CORBA::InvalidPolicies::_downcast (CORBA::Exception *exc)
+CORBA::InvalidPolicies::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InvalidPolicies *, exc);
+      return ACE_dynamic_cast (InvalidPolicies *, _tao_excp);
     }
   else
     {
@@ -436,7 +466,7 @@ CORBA::InvalidPolicies::_tao_duplicate (void) const
   return result;
 }
 
-void CORBA::InvalidPolicies::_raise ()
+void CORBA::InvalidPolicies::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -467,9 +497,14 @@ void CORBA::InvalidPolicies::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+
 CORBA::InvalidPolicies::InvalidPolicies (
     const CORBA::InvalidPolicies::_tao_seq_UShort & _tao_indices
-  )
+  )  
   : CORBA::UserException (
         "IDL:omg.org/CORBA/InvalidPolicies:1.0",
         "InvalidPolicies"
@@ -478,9 +513,18 @@ CORBA::InvalidPolicies::InvalidPolicies (
   this->indices = _tao_indices;
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr CORBA::InvalidPolicies::_type (void) const
+{
+  return ::CORBA::_tc_InvalidPolicies;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_InvalidPolicies[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   38,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -492,16 +536,16 @@ static const CORBA::Long _oc_CORBA_InvalidPolicies[] =
   ACE_NTOHL (0x69636965), 
   ACE_NTOHL (0x733a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InvalidPolicies:1.0
-  16,
+    16,
   ACE_NTOHL (0x496e7661), 
   ACE_NTOHL (0x6c696450), 
   ACE_NTOHL (0x6f6c6963), 
   ACE_NTOHL (0x69657300),  // name = InvalidPolicies
   1, // member count
-  8,
+    8,
   ACE_NTOHL (0x696e6469), 
   ACE_NTOHL (0x63657300),  // name = indices
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_ushort,
@@ -520,19 +564,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InvalidPolicies (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_InvalidPolicies, &_tc_TAO_tc_CORBA_InvalidPolicies)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_InvalidPolicies,
+    &_tc_TAO_tc_CORBA_InvalidPolicies
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::InvalidPolicies::_type (void) const
-{
-  return ::CORBA::_tc_InvalidPolicies;
-}
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::Policy::_tao_class_id = 0;
 
@@ -579,13 +619,23 @@ tao_CORBA_Policy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_Policy_marshal (
+    CORBA::Policy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::Policy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::Policy_var::Policy_var (void) // default constructor
+CORBA::Policy_var::Policy_var (void)
   : ptr_ (Policy::_nil ())
 {}
 
@@ -595,12 +645,12 @@ CORBA::Policy_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::Policy_var::Policy_var (const ::CORBA::Policy_var &p) // copy constructor
+CORBA::Policy_var::Policy_var (const ::CORBA::Policy_var &p)
   : TAO_Base_var (),
     ptr_ (Policy::_duplicate (p.ptr ()))
 {}
 
-CORBA::Policy_var::~Policy_var (void) // destructor
+CORBA::Policy_var::~Policy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -704,10 +754,11 @@ CORBA::Policy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::Policy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::Policy_out::Policy_out (Policy_ptr &p)
@@ -716,14 +767,14 @@ CORBA::Policy_out::Policy_out (Policy_ptr &p)
   this->ptr_ = ::CORBA::Policy::_nil ();
 }
 
-CORBA::Policy_out::Policy_out (Policy_var &p) // constructor from _var
+CORBA::Policy_out::Policy_out (Policy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::CORBA::Policy::_nil ();
 }
 
-CORBA::Policy_out::Policy_out (const ::CORBA::Policy_out &p) // copy constructor
+CORBA::Policy_out::Policy_out (const ::CORBA::Policy_out &p)
   : ptr_ (ACE_const_cast (Policy_out &, p).ptr_)
 {}
 
@@ -754,7 +805,7 @@ CORBA::Policy_out::operator ::CORBA::Policy_ptr &() // cast
 }
 
 ::CORBA::Policy_ptr &
-CORBA::Policy_out::ptr (void) // ptr
+CORBA::Policy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -765,39 +816,49 @@ CORBA::Policy_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_CORBA_Policy_policy_type_get : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::PolicyType result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (const TAO_ClientRequestInfo_CORBA_Policy_policy_type_get &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_Policy_policy_type_get &);
+    
+    ::CORBA::PolicyType _result;
+  };
   
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
   
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void result (CORBA::PolicyType result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (const TAO_ClientRequestInfo_CORBA_Policy_policy_type_get &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Policy_policy_type_get &);
-
-  CORBA::PolicyType _result;
-};
-
-TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+  TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
@@ -810,7 +871,6 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::arguments (ACE_ENV_SINGLE_AR
   ACE_CHECK_RETURN (0);
   
   return parameter_list;
-
 }
 
 Dynamic::ExceptionList *
@@ -844,41 +904,48 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_D
 void 
 TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::PolicyType result)
 {
-  // update the result 
+  // Update the result. 
   this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_CORBA_Policy_copy : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_CORBA_Policy_copy (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::Policy_ptr result);
+    
+  private:
+    TAO_ClientRequestInfo_CORBA_Policy_copy (const TAO_ClientRequestInfo_CORBA_Policy_copy &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_Policy_copy &);
+    
+    ::CORBA::Policy_ptr _result;
+  };
   
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
   
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void result (CORBA::Policy_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Policy_copy (const TAO_ClientRequestInfo_CORBA_Policy_copy &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Policy_copy &);
-
-  CORBA::Policy_ptr _result;
-};
-
-TAO_ClientRequestInfo_CORBA_Policy_copy::TAO_ClientRequestInfo_CORBA_Policy_copy (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+  TAO_ClientRequestInfo_CORBA_Policy_copy::TAO_ClientRequestInfo_CORBA_Policy_copy (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
@@ -891,7 +958,6 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK_RETURN (0);
   
   return parameter_list;
-
 }
 
 Dynamic::ExceptionList *
@@ -925,39 +991,44 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL)
 void 
 TAO_ClientRequestInfo_CORBA_Policy_copy::result (::CORBA::Policy_ptr result)
 {
-  // update the result 
+  // Update the result. 
   this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_CORBA_Policy_destroy : public TAO_ClientRequestInfo_i
 {
 public:
   TAO_ClientRequestInfo_CORBA_Policy_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-private:
-  TAO_ClientRequestInfo_CORBA_Policy_destroy (const TAO_ClientRequestInfo_CORBA_Policy_destroy &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Policy_destroy &);
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
+  private:
+    TAO_ClientRequestInfo_CORBA_Policy_destroy (const TAO_ClientRequestInfo_CORBA_Policy_destroy &);
+    void operator= (const TAO_ClientRequestInfo_CORBA_Policy_destroy &);
+  };
   
-};
-
-TAO_ClientRequestInfo_CORBA_Policy_destroy::TAO_ClientRequestInfo_CORBA_Policy_destroy (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target ACE_ENV_ARG_DECL_NOT_USED    
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
+  TAO_ClientRequestInfo_CORBA_Policy_destroy::TAO_ClientRequestInfo_CORBA_Policy_destroy (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
@@ -970,7 +1041,6 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK_RETURN (0);
   
   return parameter_list;
-
 }
 
 Dynamic::ExceptionList *
@@ -998,8 +1068,13 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   return result_any;
 }
 
+
+
 #endif /* TAO_HAS_INTERCEPTORS */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
+
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
@@ -1012,6 +1087,9 @@ CORBA::_TAO_Policy_Remote_Proxy_Impl::_TAO_Policy_Remote_Proxy_Impl (void)
 
 // Remote Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -1020,15 +1098,14 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
     CORBA::SystemException
   ))
 {
-  
   CORBA::PolicyType _tao_retval = 0;
-  
-  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
-
   
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_policy_type",
@@ -1054,13 +1131,13 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Policy_policy_type_get _tao_ri (
-        &_tao_call,
-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK_RETURN (_tao_retval);
-
-#endif /* TAO_HAS_INTERCEPTORS */
+          &_tao_call,
+          _collocated_tao_target_
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval);
       
+#endif /* TAO_HAS_INTERCEPTORS */
       
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
@@ -1070,9 +1147,9 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
           
           if (_invoke_status == TAO_INVOKE_RESTART)
@@ -1084,99 +1161,134 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
 #endif /* TAO_HAS_INTERCEPTORS */
           
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
+          
           _invoke_status =
             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
               
               continue;
             }
           
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          
           if (!(
-                            (_tao_in >> _tao_retval)
+              (_tao_in >> _tao_retval)
               ))
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  _tao_retval
+                );
             }
           
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::PolicyType _tao_retval_info = _tao_retval;
+          CORBA::PolicyType _tao_retval_info =
+            _tao_retval;
           _tao_ri.result (_tao_retval_info);
           
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-        
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-        
-        PortableInterceptor::ReplyStatus _tao_status =
-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        
-        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-            || _tao_status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK_RETURN (_tao_retval);
-
-    PortableInterceptor::ReplyStatus _tao_status =
-      _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-        || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-      continue;
-    
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval);
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (_tao_retval);
+      
+      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
+          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
+        {
+          continue;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
-    break;
-  }
-return _tao_retval;
+      
+      break;
+    }
+  
+  return _tao_retval;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 ::CORBA::Policy_ptr CORBA::_TAO_Policy_Remote_Proxy_Impl::copy (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -1185,16 +1297,14 @@ return _tao_retval;
     CORBA::SystemException
   ))
 {
-  
   CORBA::Policy_var _tao_retval (CORBA::Policy::_nil ());
-
-
-  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
-
   
+  if (istub == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "copy",
@@ -1220,13 +1330,13 @@ return _tao_retval;
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Policy_copy _tao_ri (
-        &_tao_call,
-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK_RETURN (_tao_retval._retn ());
-
-#endif /* TAO_HAS_INTERCEPTORS */
+          &_tao_call,
+          _collocated_tao_target_
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK_RETURN (_tao_retval._retn ());
       
+#endif /* TAO_HAS_INTERCEPTORS */
       
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
@@ -1236,9 +1346,9 @@ return _tao_retval;
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
           
           if (_invoke_status == TAO_INVOKE_RESTART)
@@ -1250,100 +1360,135 @@ return _tao_retval;
 #endif /* TAO_HAS_INTERCEPTORS */
           
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-                    TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          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_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
+          
           _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
-              );
-              
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    ),
+                  0
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_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_in >> _tao_retval.inout ())
               ))
             {
               TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
+                  CORBA::MARSHAL (
+                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
+                    ),
+                  0
+                );
             }
           
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
+          ::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
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-        
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-        
-        PortableInterceptor::ReplyStatus _tao_status =
-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        
-        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-            || _tao_status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK_RETURN (_tao_retval._retn ());
-
-    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;
-    
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (_tao_retval._retn ());
+      
+      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;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
-    break;
-  }
-return _tao_retval._retn ();
+      
+      break;
+    }
+  
+  return _tao_retval._retn ();
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -1352,15 +1497,13 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy (
     CORBA::SystemException
   ))
 {
-  
-  
-  
-  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
   
+  if (istub == 0)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "destroy",
@@ -1386,13 +1529,13 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy (
       
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Policy_destroy _tao_ri (
-        &_tao_call,
-        _collocated_tao_target_ ACE_ENV_ARG_PARAMETER
-      );
-            ACE_CHECK;
-
-#endif /* TAO_HAS_INTERCEPTORS */
+          &_tao_call,
+          _collocated_tao_target_
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_CHECK;
       
+#endif /* TAO_HAS_INTERCEPTORS */
       
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
@@ -1402,9 +1545,9 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
           
           if (_invoke_status == TAO_INVOKE_RESTART)
@@ -1416,90 +1559,116 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy (
 #endif /* TAO_HAS_INTERCEPTORS */
           
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
               ACE_ENV_ARG_PARAMETER
             );
-                    TAO_INTERCEPTOR_CHECK;
+          TAO_INTERCEPTOR_CHECK;
 
+          
           _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)
-              );
-              
+                  CORBA::UNKNOWN (
+                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                    )
+                );
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
-                _tao_ri.reply_status (_invoke_status);
-                _tao_vfr.receive_other (
-                  &_tao_ri
-                  ACE_ENV_ARG_PARAMETER
-                );
-                ACE_TRY_CHECK;
-              )
+                  _tao_ri.reply_status (_invoke_status);
+                  _tao_vfr.receive_other (
+                      &_tao_ri
+                      ACE_ENV_ARG_PARAMETER
+                    );
+                  ACE_TRY_CHECK;
+                )
               
               continue;
             }
-          
-          
 #if TAO_HAS_INTERCEPTORS == 1
           
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &_tao_ri
-            ACE_ENV_ARG_PARAMETER
-          );
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
           ACE_TRY_CHECK;
-        
-      }
-    ACE_CATCHANY
-      {
-        _tao_ri.exception (&ACE_ANY_EXCEPTION);
-        _tao_vfr.receive_exception (
-          &_tao_ri
-          ACE_ENV_ARG_PARAMETER
-        );
-        ACE_TRY_CHECK;
-        
-        PortableInterceptor::ReplyStatus _tao_status =
-          _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        
-        if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
-            || _tao_status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
-      }
-    ACE_ENDTRY;
-        ACE_CHECK;
-
-    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;
-    
+        }
+      ACE_CATCHANY
+        {
+          _tao_ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+              || _tao_status == PortableInterceptor::USER_EXCEPTION)
+            {
+              ACE_RE_THROW;
+            }
+        }
+      
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+      ACE_CATCHALL
+        {
+          CORBA::UNKNOWN ex;
+          
+          _tao_ri.exception (&ex);
+          _tao_vfr.receive_exception (
+              &_tao_ri
+              ACE_ENV_ARG_PARAMETER
+            );
+          ACE_TRY_CHECK;
+          
+          PortableInterceptor::ReplyStatus _tao_status =
+            _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+          
+          if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+            ACE_TRY_THROW (ex);
+        }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+      
+      ACE_ENDTRY;
+      ACE_CHECK;
+      
+      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;
+        }
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
-    break;
-  }
-
+      
+      break;
+    }
 }
 
-
 //
 //            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -1535,30 +1704,25 @@ CORBA::_TAO_Policy_Remote_Proxy_Broker::~_TAO_Policy_Remote_Proxy_Broker (void)
 
 CORBA::_TAO_Policy_Proxy_Impl&
 CORBA::_TAO_Policy_Remote_Proxy_Broker::select_proxy (
-  ::CORBA::Policy *
-  ACE_ENV_ARG_DECL_NOT_USED
-)
+    ::CORBA::Policy *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
   return this->remote_proxy_impl_;
 }
 
-
 //
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:198
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::Policy::Policy (int collocated)
 {
   this->CORBA_Policy_setup_collocation (collocated);
 }
 
-CORBA::Policy::~Policy (void)
-{}
-
 void
 CORBA::Policy::CORBA_Policy_setup_collocation (int collocated)
 {
@@ -1570,26 +1734,42 @@ CORBA::Policy::CORBA_Policy_setup_collocation (int collocated)
       ::CORBA::_TAO_Policy_Remote_Proxy_Broker::the_TAO_Policy_Remote_Proxy_Broker ();
 }
 
-void CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer)
+CORBA::Policy::~Policy (void)
+{}
+
+void 
+CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  Policy *tmp = ACE_static_cast (Policy*, _tao_void_pointer);
+  Policy *tmp = ACE_static_cast (Policy *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-CORBA::Policy_ptr CORBA::Policy::_narrow (
+CORBA::Policy_ptr
+CORBA::Policy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
-    return Policy::_nil ();
+    {
+      return Policy::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0" ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a =
+        obj->_is_a (
+            "IDL:omg.org/CORBA/Policy:1.0"
+            ACE_ENV_ARG_PARAMETER
+          );
       ACE_CHECK_RETURN (Policy::_nil ());
+      
       if (is_a == 0)
-        return Policy::_nil ();
+        {
+          return Policy::_nil ();
+        }
     }
+  
   return Policy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
@@ -1600,14 +1780,21 @@ CORBA::Policy::_unchecked_narrow (
   )
 {
   if (CORBA::is_nil (obj))
-    return Policy::_nil ();
+    {
+      return Policy::_nil ();
+    }
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      if (stub)
-        stub->_incr_refcnt ();
+      
+      if (stub != 0)
+        {
+          stub->_incr_refcnt ();
+        }
+      
       Policy_ptr default_proxy = Policy::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -1643,51 +1830,84 @@ CORBA::Policy::_unchecked_narrow (
     }
   else 
     return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Policy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Policy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Policy::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::Policy_ptr
 CORBA::Policy::_duplicate (Policy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
-CORBA::Boolean CORBA::Policy::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
+CORBA::Boolean
+CORBA::Policy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
-  return 1; // success using local knowledge
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
   else
-    return this->Object::_is_a (value ACE_ENV_ARG_PARAMETER);
+    {
+      return this->Object::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
 }
 
 void *CORBA::Policy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, Policy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-    
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, Policy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1722,8 +1942,10 @@ CORBA::Policy::_tao_scope (void) const
 }
 // ****************************************************************
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 CORBA::PolicyType CORBA::Policy::policy_type (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1735,12 +1957,15 @@ CORBA::PolicyType CORBA::Policy::policy_type (
   ACE_CHECK_RETURN (0);
   
   return proxy.policy_type (
-      this ACE_ENV_ARG_PARAMETER
+      this
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 ::CORBA::Policy_ptr CORBA::Policy::copy (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1752,12 +1977,15 @@ CORBA::PolicyType CORBA::Policy::policy_type (
   ACE_CHECK_RETURN (0);
   
   return proxy.copy (
-      this ACE_ENV_ARG_PARAMETER
+      this
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void CORBA::Policy::destroy (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1769,13 +1997,17 @@ void CORBA::Policy::destroy (
   ACE_CHECK;
   
   proxy.destroy (
-      this ACE_ENV_ARG_PARAMETER
+      this
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_Policy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   29,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -1785,10 +2017,10 @@ static const CORBA::Long _oc_CORBA_Policy[] =
   ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
-  7,
+    7,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = Policy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_Policy (
     CORBA::tk_objref,
@@ -1800,12 +2032,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Policy (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Policy, &_tc_TAO_tc_CORBA_Policy)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Policy,
+    &_tc_TAO_tc_CORBA_Policy
+  )
 TAO_NAMESPACE_END
 
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::PolicyManager::_tao_class_id = 0;
 
@@ -1852,13 +2087,23 @@ tao_CORBA_PolicyManager_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_PolicyManager_marshal (
+    CORBA::PolicyManager_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::PolicyManager_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::PolicyManager_var::PolicyManager_var (void) // default constructor
+CORBA::PolicyManager_var::PolicyManager_var (void)
   : ptr_ (PolicyManager::_nil ())
 {}
 
@@ -1868,12 +2113,12 @@ CORBA::PolicyManager_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::PolicyManager_var::PolicyManager_var (const ::CORBA::PolicyManager_var &p) // copy constructor
+CORBA::PolicyManager_var::PolicyManager_var (const ::CORBA::PolicyManager_var &p)
   : TAO_Base_var (),
     ptr_ (PolicyManager::_duplicate (p.ptr ()))
 {}
 
-CORBA::PolicyManager_var::~PolicyManager_var (void) // destructor
+CORBA::PolicyManager_var::~PolicyManager_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1977,10 +2222,11 @@ CORBA::PolicyManager_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::PolicyManager_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::PolicyManager_out::PolicyManager_out (PolicyManager_ptr &p)
@@ -1989,14 +2235,14 @@ CORBA::PolicyManager_out::PolicyManager_out (PolicyManager_ptr &p)
   this->ptr_ = ::CORBA::PolicyManager::_nil ();
 }
 
-CORBA::PolicyManager_out::PolicyManager_out (PolicyManager_var &p) // constructor from _var
+CORBA::PolicyManager_out::PolicyManager_out (PolicyManager_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::CORBA::PolicyManager::_nil ();
 }
 
-CORBA::PolicyManager_out::PolicyManager_out (const ::CORBA::PolicyManager_out &p) // copy constructor
+CORBA::PolicyManager_out::PolicyManager_out (const ::CORBA::PolicyManager_out &p)
   : ptr_ (ACE_const_cast (PolicyManager_out &, p).ptr_)
 {}
 
@@ -2027,7 +2273,7 @@ CORBA::PolicyManager_out::operator ::CORBA::PolicyManager_ptr &() // cast
 }
 
 ::CORBA::PolicyManager_ptr &
-CORBA::PolicyManager_out::ptr (void) // ptr
+CORBA::PolicyManager_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2038,9 +2284,8 @@ CORBA::PolicyManager_out::operator-> (void)
   return this->ptr_;
 }
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:198
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::PolicyManager::PolicyManager (void)
 {}
@@ -2048,13 +2293,15 @@ CORBA::PolicyManager::PolicyManager (void)
 CORBA::PolicyManager::~PolicyManager (void)
 {}
 
-void CORBA::PolicyManager::_tao_any_destructor (void *_tao_void_pointer)
+void 
+CORBA::PolicyManager::_tao_any_destructor (void *_tao_void_pointer)
 {
-  PolicyManager *tmp = ACE_static_cast (PolicyManager*, _tao_void_pointer);
+  PolicyManager *tmp = ACE_static_cast (PolicyManager *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-CORBA::PolicyManager_ptr CORBA::PolicyManager::_narrow (
+CORBA::PolicyManager_ptr
+CORBA::PolicyManager::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2069,43 +2316,61 @@ CORBA::PolicyManager::_unchecked_narrow (
   )
 {
   if (CORBA::is_nil (obj))
-    return PolicyManager::_nil ();
+    {
+      return PolicyManager::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           PolicyManager_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &PolicyManager::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &PolicyManager::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::PolicyManager_ptr
 CORBA::PolicyManager::_duplicate (PolicyManager_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *CORBA::PolicyManager::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-    
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -2114,9 +2379,12 @@ const char* CORBA::PolicyManager::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/PolicyManager:1.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_PolicyManager[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   36,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -2127,12 +2395,12 @@ static const CORBA::Long _oc_CORBA_PolicyManager[] =
   ACE_NTOHL (0x4d616e61), 
   ACE_NTOHL (0x6765723a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyManager:1.0
-  14,
+    14,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63794d61), 
   ACE_NTOHL (0x6e616765), 
   ACE_NTOHL (0x72000000),  // name = PolicyManager
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyManager (
     CORBA::tk_objref,
@@ -2144,12 +2412,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyManager (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyManager, &_tc_TAO_tc_CORBA_PolicyManager)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyManager,
+    &_tc_TAO_tc_CORBA_PolicyManager
+  )
 TAO_NAMESPACE_END
 
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::PolicyCurrent::_tao_class_id = 0;
 
@@ -2196,13 +2467,23 @@ tao_CORBA_PolicyCurrent_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_PolicyCurrent_marshal (
+    CORBA::PolicyCurrent_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::PolicyCurrent_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::PolicyCurrent_var::PolicyCurrent_var (void) // default constructor
+CORBA::PolicyCurrent_var::PolicyCurrent_var (void)
   : ptr_ (PolicyCurrent::_nil ())
 {}
 
@@ -2212,12 +2493,12 @@ CORBA::PolicyCurrent_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::PolicyCurrent_var::PolicyCurrent_var (const ::CORBA::PolicyCurrent_var &p) // copy constructor
+CORBA::PolicyCurrent_var::PolicyCurrent_var (const ::CORBA::PolicyCurrent_var &p)
   : TAO_Base_var (),
     ptr_ (PolicyCurrent::_duplicate (p.ptr ()))
 {}
 
-CORBA::PolicyCurrent_var::~PolicyCurrent_var (void) // destructor
+CORBA::PolicyCurrent_var::~PolicyCurrent_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2321,10 +2602,11 @@ CORBA::PolicyCurrent_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::PolicyCurrent_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::PolicyCurrent_out::PolicyCurrent_out (PolicyCurrent_ptr &p)
@@ -2333,14 +2615,14 @@ CORBA::PolicyCurrent_out::PolicyCurrent_out (PolicyCurrent_ptr &p)
   this->ptr_ = ::CORBA::PolicyCurrent::_nil ();
 }
 
-CORBA::PolicyCurrent_out::PolicyCurrent_out (PolicyCurrent_var &p) // constructor from _var
+CORBA::PolicyCurrent_out::PolicyCurrent_out (PolicyCurrent_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::CORBA::PolicyCurrent::_nil ();
 }
 
-CORBA::PolicyCurrent_out::PolicyCurrent_out (const ::CORBA::PolicyCurrent_out &p) // copy constructor
+CORBA::PolicyCurrent_out::PolicyCurrent_out (const ::CORBA::PolicyCurrent_out &p)
   : ptr_ (ACE_const_cast (PolicyCurrent_out &, p).ptr_)
 {}
 
@@ -2371,7 +2653,7 @@ CORBA::PolicyCurrent_out::operator ::CORBA::PolicyCurrent_ptr &() // cast
 }
 
 ::CORBA::PolicyCurrent_ptr &
-CORBA::PolicyCurrent_out::ptr (void) // ptr
+CORBA::PolicyCurrent_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2382,9 +2664,8 @@ CORBA::PolicyCurrent_out::operator-> (void)
   return this->ptr_;
 }
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:198
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::PolicyCurrent::PolicyCurrent (void)
 {}
@@ -2392,13 +2673,15 @@ CORBA::PolicyCurrent::PolicyCurrent (void)
 CORBA::PolicyCurrent::~PolicyCurrent (void)
 {}
 
-void CORBA::PolicyCurrent::_tao_any_destructor (void *_tao_void_pointer)
+void 
+CORBA::PolicyCurrent::_tao_any_destructor (void *_tao_void_pointer)
 {
-  PolicyCurrent *tmp = ACE_static_cast (PolicyCurrent*, _tao_void_pointer);
+  PolicyCurrent *tmp = ACE_static_cast (PolicyCurrent *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-CORBA::PolicyCurrent_ptr CORBA::PolicyCurrent::_narrow (
+CORBA::PolicyCurrent_ptr
+CORBA::PolicyCurrent::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2413,67 +2696,89 @@ CORBA::PolicyCurrent::_unchecked_narrow (
   )
 {
   if (CORBA::is_nil (obj))
-    return PolicyCurrent::_nil ();
+    {
+      return PolicyCurrent::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           PolicyCurrent_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &PolicyCurrent::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &PolicyCurrent::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::PolicyCurrent_ptr
 CORBA::PolicyCurrent::_duplicate (PolicyCurrent_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *CORBA::PolicyCurrent::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, PolicyCurrent)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::PolicyManager_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Current::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Current_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-    
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, PolicyCurrent)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::PolicyManager_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Current::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Current_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -2482,9 +2787,12 @@ const char* CORBA::PolicyCurrent::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/PolicyCurrent:1.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_PolicyCurrent[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   36,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -2495,12 +2803,12 @@ static const CORBA::Long _oc_CORBA_PolicyCurrent[] =
   ACE_NTOHL (0x43757272), 
   ACE_NTOHL (0x656e743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyCurrent:1.0
-  14,
+    14,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63794375), 
   ACE_NTOHL (0x7272656e), 
   ACE_NTOHL (0x74000000),  // name = PolicyCurrent
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyCurrent (
     CORBA::tk_objref,
@@ -2512,12 +2820,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyCurrent (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyCurrent, &_tc_TAO_tc_CORBA_PolicyCurrent)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyCurrent,
+    &_tc_TAO_tc_CORBA_PolicyCurrent
+  )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:60
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -2525,16 +2836,12 @@ void operator<<= (
     const CORBA::PolicyError &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_PolicyError,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::PolicyError>::insert_copy (
+      _tao_any,
+      CORBA::PolicyError::_tao_any_destructor,
+      CORBA::_tc_PolicyError,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -2543,28 +2850,22 @@ void operator<<= (
     CORBA::PolicyError *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_PolicyError,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::PolicyError::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::PolicyError>::insert (
+      _tao_any,
+      CORBA::PolicyError::_tao_any_destructor,
+      CORBA::_tc_PolicyError,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,CORBA::PolicyError *&_tao_elem
+    const CORBA::Any &_tao_any,
+    CORBA::PolicyError *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::PolicyError*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::PolicyError *&,
       _tao_elem
     );
 }
@@ -2575,86 +2876,24 @@ CORBA::Boolean operator>>= (
     const CORBA::PolicyError *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_PolicyError
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = (CORBA::PolicyError *)_tao_any.value ();
-        return 1;
-      }
-    else
-      {
-        CORBA::PolicyError *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::PolicyError,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        CORBA::String_var interface_repository_id;
-        
-        if (!(stream >> interface_repository_id.out ()))
-          {
-            return 0;
-          }
-        
-        if (ACE_OS::strcmp (
-                interface_repository_id.in (),
-                "IDL:omg.org/CORBA/PolicyError:1.0")
-              )
-          {
-            return 0;
-          }
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_PolicyError,
-                1,
-                tmp,
-                CORBA::PolicyError::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::PolicyError>::extract (
+        _tao_any,
+        CORBA::PolicyError::_tao_any_destructor,
+        CORBA::_tc_PolicyError,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::PolicyError>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyError>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:60
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -2662,16 +2901,12 @@ void operator<<= (
     const CORBA::InvalidPolicies &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_InvalidPolicies,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::insert_copy (
+      _tao_any,
+      CORBA::InvalidPolicies::_tao_any_destructor,
+      CORBA::_tc_InvalidPolicies,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -2680,28 +2915,22 @@ void operator<<= (
     CORBA::InvalidPolicies *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_InvalidPolicies,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::InvalidPolicies::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::insert (
+      _tao_any,
+      CORBA::InvalidPolicies::_tao_any_destructor,
+      CORBA::_tc_InvalidPolicies,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,CORBA::InvalidPolicies *&_tao_elem
+    const CORBA::Any &_tao_any,
+    CORBA::InvalidPolicies *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::InvalidPolicies*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::InvalidPolicies *&,
       _tao_elem
     );
 }
@@ -2712,342 +2941,213 @@ CORBA::Boolean operator>>= (
     const CORBA::InvalidPolicies *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_InvalidPolicies
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = (CORBA::InvalidPolicies *)_tao_any.value ();
-        return 1;
-      }
-    else
-      {
-        CORBA::InvalidPolicies *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::InvalidPolicies,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        CORBA::String_var interface_repository_id;
-        
-        if (!(stream >> interface_repository_id.out ()))
-          {
-            return 0;
-          }
-        
-        if (ACE_OS::strcmp (
-                interface_repository_id.in (),
-                "IDL:omg.org/CORBA/InvalidPolicies:1.0")
-              )
-          {
-            return 0;
-          }
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_InvalidPolicies,
-                1,
-                tmp,
-                CORBA::InvalidPolicies::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::extract (
+        _tao_any,
+        CORBA::InvalidPolicies::_tao_any_destructor,
+        CORBA::_tc_InvalidPolicies,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/any_op_cs.cpp:60
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::Policy_ptr _tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_Policy, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          CORBA::Policy::_duplicate (_tao_elem),
-          CORBA::Policy::_tao_any_destructor
-        );
-    }
+  CORBA::Policy_ptr _tao_objptr =
+    CORBA::Policy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::Policy_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_Policy, 
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          CORBA::Policy::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<CORBA::Policy>::insert (
+      _tao_any,
+      CORBA::Policy::_tao_any_destructor,
+      CORBA::_tc_Policy,
+      *_tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     CORBA::Policy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::Policy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_Policy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<CORBA::Policy>::extract (
+        _tao_any,
+        CORBA::Policy::_tao_any_destructor,
+        CORBA::_tc_Policy,
+        _tao_elem
       );
-    
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_Policy,
-            1,
-            _tao_elem,
-            CORBA::Policy::_tao_any_destructor
-          );
-        
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::Policy::_nil ();
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::Policy>::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::Policy,CORBA::Policy_var>;
+  template class TAO::Any_Impl_T<CORBA::Policy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var>
+# pragma instantiate TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::Policy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/any_op_cs.cpp:60
-
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::PolicyManager_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      CORBA::_tc_PolicyManager, 
-      1,
-      CORBA::PolicyManager::_duplicate (_tao_elem),
-      CORBA::PolicyManager::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  CORBA::PolicyManager_ptr _tao_objptr =
+    CORBA::PolicyManager::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::PolicyManager_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
-      CORBA::_tc_PolicyManager, 
-      1,
-      *_tao_elem,
-      CORBA::PolicyManager::_tao_any_destructor
+  TAO::Any_Impl_T<CORBA::PolicyManager>::insert (
+      _tao_any,
+      CORBA::PolicyManager::_tao_any_destructor,
+      CORBA::_tc_PolicyManager,
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     CORBA::PolicyManager_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::PolicyManager::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_PolicyManager
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          CORBA::PolicyManager_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-    
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::PolicyManager::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<CORBA::PolicyManager>::extract (
+        _tao_any,
+        CORBA::PolicyManager::_tao_any_destructor,
+        CORBA::_tc_PolicyManager,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::PolicyManager>::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::PolicyManager,CORBA::PolicyManager_var>;
+  template class TAO::Any_Impl_T<CORBA::PolicyManager>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Manager<CORBA::PolicyManager,CORBA::PolicyManager_var>
+# pragma instantiate TAO_Object_Manager<CORBA::PolicyManager, CORBA::PolicyManager_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::PolicyManager>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/any_op_cs.cpp:60
-
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::PolicyCurrent_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      CORBA::_tc_PolicyCurrent, 
-      1,
-      CORBA::PolicyCurrent::_duplicate (_tao_elem),
-      CORBA::PolicyCurrent::_tao_any_destructor
-    );
-  
-  _tao_any.contains_local (1);
+  CORBA::PolicyCurrent_ptr _tao_objptr =
+    CORBA::PolicyCurrent::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     CORBA::PolicyCurrent_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
-      CORBA::_tc_PolicyCurrent, 
-      1,
-      *_tao_elem,
-      CORBA::PolicyCurrent::_tao_any_destructor
+  TAO::Any_Impl_T<CORBA::PolicyCurrent>::insert (
+      _tao_any,
+      CORBA::PolicyCurrent::_tao_any_destructor,
+      CORBA::_tc_PolicyCurrent,
+      *_tao_elem
     );
-  
-  _tao_any.contains_local (1);
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     CORBA::PolicyCurrent_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::PolicyCurrent::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_PolicyCurrent
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    _tao_elem =
-      ACE_reinterpret_cast (
-          CORBA::PolicyCurrent_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-    
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  _tao_elem = CORBA::PolicyCurrent::_nil ();
-  return 0;
+  return
+    TAO::Any_Impl_T<CORBA::PolicyCurrent>::extract (
+        _tao_any,
+        CORBA::PolicyCurrent::_tao_any_destructor,
+        CORBA::_tc_PolicyCurrent,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::PolicyCurrent>::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::PolicyCurrent,CORBA::PolicyCurrent_var>;
+  template class TAO::Any_Impl_T<CORBA::PolicyCurrent>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Manager<CORBA::PolicyCurrent,CORBA::PolicyCurrent_var>
+# pragma instantiate TAO_Object_Manager<CORBA::PolicyCurrent, CORBA::PolicyCurrent_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::PolicyCurrent>
 #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
 
 #if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_
 #define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_
@@ -3057,12 +3157,15 @@ CORBA::Boolean operator<< (
     const CORBA::InvalidPolicies::_tao_seq_UShort &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      return strm.write_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -3071,26 +3174,38 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    return strm.read_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      return strm.read_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::Policy_ptr _tao_objref
@@ -3108,9 +3223,13 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
+    
     if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
+      {
+        return 0;
+      }
+    
+    // Narrow to the right type.
     _tao_objref =
       CORBA::Policy::_unchecked_narrow (
           obj.in ()
@@ -3127,3 +3246,33 @@ CORBA::Boolean operator>> (
   return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::PolicyManager>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::PolicyManager>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::PolicyCurrent>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::PolicyCurrent>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 43a3ac596e2..fc295057577 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_POLICYC_H_
-#define _TAO_IDL_POLICYC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_POLICYC_H_
+#define _TAO_IDL_ORIG_POLICYC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -59,39 +62,67 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  CORBA
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short PolicyErrorCode;
   typedef CORBA::Short_out PolicyErrorCode_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_PolicyErrorCode;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short BAD_POLICY;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short UNSUPPORTED_POLICY;
+  const CORBA::Short BAD_POLICY = 0;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short BAD_POLICY_TYPE;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short BAD_POLICY_VALUE;
+  const CORBA::Short UNSUPPORTED_POLICY = 1;
   
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short UNSUPPORTED_POLICY_VALUE;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short BAD_POLICY_TYPE = 2;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
+  const CORBA::Short BAD_POLICY_VALUE = 3;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short UNSUPPORTED_POLICY_VALUE = 4;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_CORBA_POLICYERROR_CH_)
 #define _CORBA_POLICYERROR_CH_
   
   class TAO_Export PolicyError : public CORBA::UserException
   {
   public:
-    ACE_NESTED_CLASS (CORBA, PolicyErrorCode) reason;
     
+    CORBA::PolicyErrorCode reason;
     PolicyError (void);
     PolicyError (const PolicyError &);
     ~PolicyError (void);
 
     PolicyError &operator= (const PolicyError &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static PolicyError *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -109,19 +140,29 @@ TAO_NAMESPACE  CORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     
-        PolicyError (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+    
+    PolicyError (
         ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason
       );
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyError;
   
+  // 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_PolicyError;
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_CORBA_INVALIDPOLICIES_CH_)
 #define _CORBA_INVALIDPOLICIES_CH_
   
@@ -129,16 +170,20 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyError;
   {
   public:
     
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     
+    
+    // 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_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_
     
-    class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
+    class TAO_Export _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
       : public TAO_Unbounded_Base_Sequence
     {
     public:
-      // = Initialization and termination methods.
       _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void);
       _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum); 
       _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (
@@ -175,60 +220,67 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyError;
           CORBA::Boolean release
         );
     };
-    
+
 #endif /* end #if !defined */
-    
-    
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-    
+
 #if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_)
 #define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
     class _tao_seq_UShort;
     
     // *************************************************************
-    // _tao_seq_UShort
+    // CORBA::InvalidPolicies::_tao_seq_UShort
     // *************************************************************
     
     class TAO_Export _tao_seq_UShort : 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_CORBA_InvalidPolicies__tao_seq_UShort
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<CORBA::UShort>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
-      _tao_seq_UShort (void); // default ctor
-      _tao_seq_UShort (CORBA::ULong max); // uses max size
+      _tao_seq_UShort (void);
+      _tao_seq_UShort (CORBA::ULong max);
       _tao_seq_UShort (
           CORBA::ULong max, 
           CORBA::ULong length, 
           CORBA::UShort *buffer, 
           CORBA::Boolean release = 0
         );
-      _tao_seq_UShort (const _tao_seq_UShort &); // copy ctor
+      _tao_seq_UShort (const _tao_seq_UShort &);
       ~_tao_seq_UShort (void);
+      
       static void _tao_any_destructor (void*);
       
+      
     };
-    
+
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
     
-#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_UShort _indices_seq;
-#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
-
     _tao_seq_UShort indices;
-    
     InvalidPolicies (void);
     InvalidPolicies (const InvalidPolicies &);
     ~InvalidPolicies (void);
 
     InvalidPolicies &operator= (const InvalidPolicies &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static InvalidPolicies *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -246,31 +298,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyError;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     
-        InvalidPolicies (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+    
+    InvalidPolicies (
         const _tao_seq_UShort & _tao_indices
       );
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   
+  // 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_InvalidPolicies;
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_CORBA_POLICY___PTR_CH_)
 #define _CORBA_POLICY___PTR_CH_
   
   class Policy;
   typedef Policy *Policy_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICY___VAR_CH_)
 #define _CORBA_POLICY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export Policy_var : public TAO_Base_var
   {
   public:
@@ -310,13 +374,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
     Policy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICY___OUT_CH_)
 #define _CORBA_POLICY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export Policy_out
   {
   public:
@@ -333,21 +398,15 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   private:
     Policy_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  // *************************************************************
-  // CORBA::Policy
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-  
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_POLICY_CH_)
 #define _CORBA_POLICY_CH_
   
-  // Forward Classes Declaration.
   class _TAO_Policy_Proxy_Impl;
   class _TAO_Policy_Remote_Proxy_Impl;
   class _TAO_Policy_Proxy_Broker;
@@ -360,11 +419,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
     // ****************************************************************
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Policy_ptr _ptr_type;
     typedef Policy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -385,40 +441,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
         return (Policy_ptr)0;
       }
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::PolicyType policy_type (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr copy (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id
+        const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
     // ****************************************************************
     virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &);
@@ -429,12 +495,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
 
   private:
     _TAO_Policy_Proxy_Broker *the_TAO_Policy_Proxy_Broker_;
-    
+  
   protected:
     Policy (int collocated = 0);
     
     // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
+    // parents piece of the given class in the right mode.
     virtual void CORBA_Policy_setup_collocation (int collocated);
     
     Policy (
@@ -442,12 +508,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
+    virtual ~Policy (void);
     
     friend class _TAO_Policy_Remote_Proxy_Impl;
     friend class _TAO_Policy_ThruPOA_Proxy_Impl;
     friend class _TAO_Policy_Direct_Proxy_Impl;
-    
-    virtual ~Policy (void);
   
   private:
     Policy (const Policy &);
@@ -455,19 +520,26 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   };
   
   // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulate
-  // an invocation logics.
+  // perform a call. Each different implementation encapsulates
+  // an invocation logic.
   
   
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_Export _TAO_Policy_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
-    virtual ~_TAO_Policy_Proxy_Impl (void) { }
+    virtual ~_TAO_Policy_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::PolicyType policy_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -476,6 +548,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual ::CORBA::Policy_ptr copy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -484,6 +559,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -491,8 +569,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
-    
+  
   protected:
     _TAO_Policy_Proxy_Impl (void);
   };
@@ -506,6 +583,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   //                Remote Proxy Impl. Declaration
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_Export _TAO_Policy_Remote_Proxy_Impl
     : public virtual _TAO_Policy_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
@@ -513,7 +593,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   public:
     _TAO_Policy_Remote_Proxy_Impl (void);
     
-    virtual ~_TAO_Policy_Remote_Proxy_Impl (void) { }
+    virtual ~_TAO_Policy_Remote_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::PolicyType policy_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -522,6 +606,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
         CORBA::SystemException
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::Policy_ptr copy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -530,6 +617,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
         CORBA::SystemException
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -537,8 +627,6 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
   };
   
   //
@@ -550,12 +638,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
   
-  
   ///////////////////////////////////////////////////////////////////////
   //                 Base Proxy Broker Declaration 
   //
   
-    class TAO_Export _TAO_Policy_Proxy_Broker
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
+  class TAO_Export _TAO_Policy_Proxy_Broker
   {
   public:
     virtual ~_TAO_Policy_Proxy_Broker (void);
@@ -578,6 +668,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   //                 Remote Proxy Broker Declaration 
   //
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_Export _TAO_Policy_Remote_Proxy_Broker
     : public virtual _TAO_Policy_Proxy_Broker
   {
@@ -604,25 +697,31 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   //
   //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Policy;
+  // 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_Policy;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_CORBA_POLICYMANAGER___PTR_CH_)
 #define _CORBA_POLICYMANAGER___PTR_CH_
   
   class PolicyManager;
   typedef PolicyManager *PolicyManager_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICYMANAGER___VAR_CH_)
 #define _CORBA_POLICYMANAGER___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export PolicyManager_var : public TAO_Base_var
   {
   public:
@@ -662,13 +761,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
     PolicyManager_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICYMANAGER___OUT_CH_)
 #define _CORBA_POLICYMANAGER___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export PolicyManager_out
   {
   public:
@@ -685,17 +785,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   private:
     PolicyManager_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  // *************************************************************
-  // CORBA::PolicyManager
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-  
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_POLICYMANAGER_CH_)
 #define _CORBA_POLICYMANAGER_CH_
   
@@ -703,11 +798,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyManager_ptr _ptr_type;
     typedef PolicyManager_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -728,7 +820,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
         return (PolicyManager_ptr)0;
       }
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::PolicyList * get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
@@ -738,6 +833,9 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_policy_overrides (
         const CORBA::PolicyList & policies,
         CORBA::SetOverrideType set_add
@@ -748,38 +846,47 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
         , CORBA::InvalidPolicies
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     PolicyManager (void);
-    
     virtual ~PolicyManager (void);
-  
+    
   private:
     PolicyManager (const PolicyManager &);
     void operator= (const PolicyManager &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyManager;
+  // 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_PolicyManager;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_CORBA_POLICYCURRENT___PTR_CH_)
 #define _CORBA_POLICYCURRENT___PTR_CH_
   
   class PolicyCurrent;
   typedef PolicyCurrent *PolicyCurrent_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICYCURRENT___VAR_CH_)
 #define _CORBA_POLICYCURRENT___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export PolicyCurrent_var : public TAO_Base_var
   {
   public:
@@ -819,13 +926,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
     PolicyCurrent_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICYCURRENT___OUT_CH_)
 #define _CORBA_POLICYCURRENT___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export PolicyCurrent_out
   {
   public:
@@ -842,17 +950,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
   private:
     PolicyCurrent_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  // *************************************************************
-  // CORBA::PolicyCurrent
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-  
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_POLICYCURRENT_CH_)
 #define _CORBA_POLICYCURRENT_CH_
   
@@ -861,11 +964,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
       public virtual CORBA::Current
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyCurrent_ptr _ptr_type;
     typedef PolicyCurrent_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -886,68 +986,106 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
         return (PolicyCurrent_ptr)0;
       }
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     PolicyCurrent (void);
-    
     virtual ~PolicyCurrent (void);
-  
+    
   private:
     PolicyCurrent (const PolicyCurrent &);
     void operator= (const PolicyCurrent &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyCurrent;
-  
+  // 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_PolicyCurrent;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
 // Proxy Broker Factory function pointer declarations.
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80
+
 extern TAO_Export
 CORBA::_TAO_Policy_Proxy_Broker *
 (*CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyError &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyError*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyError *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyError *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::InvalidPolicies &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::InvalidPolicies*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InvalidPolicies *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InvalidPolicies *&);
-// Any operators for interface CORBA::Policy
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy_ptr &);
-// Any operators for interface CORBA::PolicyManager
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyManager_ptr &);
-// Any operators for interface CORBA::PolicyCurrent
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyCurrent_ptr &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyError &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PolicyError &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InvalidPolicies &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InvalidPolicies &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_
 #define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_
 
@@ -962,12 +1100,19 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr );
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "PolicyC.i"
@@ -983,3 +1128,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i
index 84183bc7916..2e8ecab0895 100644
--- a/TAO/tao/PolicyC.i
+++ b/TAO/tao/PolicyC.i
@@ -19,191 +19,223 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// *************************************************************
-// Inline operations for exception CORBA::PolicyError
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception CORBA::InvalidPolicies
-// *************************************************************
 
+// 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_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_
 
-// = Static operations.
-ACE_INLINE CORBA::UShort *
+ACE_INLINE
+CORBA::UShort *
 CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   CORBA::UShort *retval = 0;
   ACE_NEW_RETURN (retval, CORBA::UShort[size], 0);
   return retval;
 }
 
-ACE_INLINE void CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (CORBA::UShort *buffer)
-// Free the sequence.
+ACE_INLINE
+void CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (CORBA::UShort *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) // Default constructor.
+CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void)
 {
 }
 
 ACE_INLINE
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum) // Constructor using a maximum length value.
+CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum,
-  CORBA::ULong length,
-  CORBA::UShort *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::UShort *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs)
-// Copy constructor.
+CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (
+    const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    CORBA::UShort *tmp1 = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->maximum_);
-    CORBA::UShort * const tmp2 = ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      CORBA::UShort *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->maximum_);
+      CORBA::UShort * const tmp2 =
+        ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator= (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs)
-// Assignment operator.
+ACE_INLINE
+CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &
+CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      CORBA::UShort *tmp = ACE_reinterpret_cast (CORBA::UShort *, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          CORBA::UShort *tmp =
+            ACE_reinterpret_cast (CORBA::UShort *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  CORBA::UShort *tmp1 = ACE_reinterpret_cast (CORBA::UShort *, this->buffer_);
-  CORBA::UShort * const tmp2 = ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_);
+  CORBA::UShort *tmp1 =
+    ACE_reinterpret_cast (CORBA::UShort *, this->buffer_);
+  CORBA::UShort * const tmp2 =
+    ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE CORBA::UShort &
+ACE_INLINE
+CORBA::UShort &
 CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  CORBA::UShort* tmp = ACE_reinterpret_cast(CORBA::UShort*,this->buffer_);
+  CORBA::UShort* tmp =
+    ACE_reinterpret_cast (CORBA::UShort*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const CORBA::UShort &
+ACE_INLINE
+const CORBA::UShort &
 CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  CORBA::UShort * const tmp = ACE_reinterpret_cast (CORBA::UShort* ACE_CAST_CONST, this->buffer_);
+  CORBA::UShort * const tmp =
+    ACE_reinterpret_cast (CORBA::UShort* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE CORBA::UShort *
+ACE_INLINE
+CORBA::UShort *
 CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::UShort *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::UShort*, this->buffer_);
+        }
     }
-    else
-    {
-      result = ACE_reinterpret_cast (CORBA::UShort*, 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::UShort*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(CORBA::UShort*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const CORBA::UShort *
+ACE_INLINE
+const CORBA::UShort *
 CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const CORBA::UShort * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::UShort * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::replace (CORBA::ULong max,
-CORBA::ULong length,
-CORBA::UShort *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::UShort *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    CORBA::UShort *tmp = ACE_reinterpret_cast(CORBA::UShort*,this->buffer_);
-    _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp);
-  }
+    {
+      CORBA::UShort *tmp =
+        ACE_reinterpret_cast (CORBA::UShort*, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::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_visitor_interface/interface_ci.cpp:68
+
 #if !defined (_CORBA_POLICY___CI_)
 #define _CORBA_POLICY___CI_
 
@@ -218,51 +250,96 @@ CORBA::Policy::Policy (
   this->CORBA_Policy_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::Policy::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_POLICYMANAGER___CI_)
 #define _CORBA_POLICYMANAGER___CI_
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::PolicyManager::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_POLICYCURRENT___CI_)
 #define _CORBA_POLICYCURRENT___CI_
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::PolicyCurrent::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::PolicyError &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::PolicyError &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-  {
-    // now marshal the members (if any)
-    if (
-      (strm << _tao_aggregate.reason)
-    )
-      return 1;
-    else
-      return 0;
-  }
+    {
+      // Now marshal the members (if any).
+      if (
+        (strm << _tao_aggregate.reason)
+       )
+        {
+          return 1;
+        }
+      else
+        {
+          return 0;
+        }
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA::PolicyError &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::PolicyError &_tao_aggregate
+  )
 {
-  // now marshal the members
+  // Demarshal the members.
   if (
     (strm >> _tao_aggregate.reason)
   )
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_I_
 #define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_I_
@@ -271,6 +348,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA::InvalidPolicies::_tao_seq_UShort &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA::InvalidPolicies::_tao_seq_UShort &
@@ -278,34 +356,58 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::InvalidPolicies &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::InvalidPolicies &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-  {
-    // now marshal the members (if any)
-    if (
-      (strm << _tao_aggregate.indices)
-    )
-      return 1;
-    else
-      return 0;
-  }
+    {
+      // Now marshal the members (if any).
+      if (
+        (strm << _tao_aggregate.indices)
+       )
+        {
+          return 1;
+        }
+      else
+        {
+          return 0;
+        }
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA::InvalidPolicies &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::InvalidPolicies &_tao_aggregate
+  )
 {
-  // now marshal the members
+  // Demarshal the members.
   if (
     (strm >> _tao_aggregate.indices)
   )
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const CORBA::Policy_ptr
diff --git a/TAO/tao/Policy_Forward.pidl b/TAO/tao/Policy_Forward.pidl
index 3db501a1b73..84069d295fa 100644
--- a/TAO/tao/Policy_Forward.pidl
+++ b/TAO/tao/Policy_Forward.pidl
@@ -15,7 +15,7 @@
  *   command used for this is:
  *
  *     tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/corbafwd.h"
  *          -Wb,pre_include="ace/pre.h"
@@ -58,6 +58,4 @@ module CORBA
   };
 };
 
-#pragma prefix ""
-
 #endif /* TAO_CORBA_POLICY_FORWARD_PIDL */
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index b7478c6c38a..f3d5e403458 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "Policy_ForwardC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "Policy_ForwardC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -39,9 +42,12 @@
 #include "Policy_ForwardC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_PolicyType[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   33,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -52,11 +58,11 @@ static const CORBA::Long _oc_CORBA_PolicyType[] =
   ACE_NTOHL (0x54797065), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-  11,
+    11,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63795479), 
   ACE_NTOHL (0x70650000),  // name = PolicyType
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
 };
 
@@ -70,9 +76,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyType (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyType, &_tc_TAO_tc_CORBA_PolicyType)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyType,
+    &_tc_TAO_tc_CORBA_PolicyType
+  )
 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)
 
@@ -87,25 +99,27 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_allocate_buffer (CORBA:
   tmp = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (length);
   
   if (this->buffer_ != 0)
-  {
-    CORBA::Policy **old = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        if (!this->release_)
-          {
-            tmp[i] = tao_CORBA_Policy_duplicate (old[i]);
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-      }
-    
-    if (this->release_)
-      {
-        delete[] old;
-      }
-  }
+    {
+      CORBA::Policy **old = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = tao_CORBA_Policy_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -113,7 +127,10 @@ void
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
@@ -163,59 +180,79 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_upcast (void *src) cons
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_POLICYLIST_CS_)
 #define _CORBA_POLICYLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::PolicyList
 // *************************************************************
 
 CORBA::PolicyList::PolicyList (void)
 {}
-CORBA::PolicyList::PolicyList (CORBA::ULong max) // uses max size
+
+CORBA::PolicyList::PolicyList (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA::PolicyList::PolicyList (CORBA::ULong max, CORBA::ULong length, CORBA::Policy_ptr *buffer, CORBA::Boolean release)
+
+CORBA::PolicyList::PolicyList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Policy_ptr *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA::PolicyList::PolicyList (const PolicyList &seq) // copy ctor
+
+CORBA::PolicyList::PolicyList (const PolicyList &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 CORBA::PolicyList::~PolicyList (void) // dtor
 {}
+
 void CORBA::PolicyList::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyList *tmp = ACE_static_cast (PolicyList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_PolicyList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   33,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -226,11 +263,11 @@ static const CORBA::Long _oc_CORBA_PolicyList[] =
   ACE_NTOHL (0x4c697374), 
   ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyList:1.0
-  11,
+    11,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63794c69), 
   ACE_NTOHL (0x73740000),  // name = PolicyList
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_objref, // typecode kind
@@ -245,10 +282,10 @@ static const CORBA::Long _oc_CORBA_PolicyList[] =
       ACE_NTOHL (0x6c696379), 
       ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
-      7,
+            7,
       ACE_NTOHL (0x506f6c69), 
       ACE_NTOHL (0x63790000),  // name = Policy
-
+      
     0U,
 
 };
@@ -263,9 +300,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyList, &_tc_TAO_tc_CORBA_PolicyList)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyList,
+    &_tc_TAO_tc_CORBA_PolicyList
+  )
 TAO_NAMESPACE_END
 
+// 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)
 
@@ -279,16 +322,21 @@ CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_allocate_buffer (CORBA::ULo
   tmp = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::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_CORBA_PolicyTypeSeq::freebuf (old);
-    
-  }
+    {
+      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_CORBA_PolicyTypeSeq::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -296,75 +344,96 @@ void
 CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-  
-  CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
+    {
+      return;
+    }
   
+  CORBA::ULong *tmp =
+    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp);
   this->buffer_ = 0;
 } 
 
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::~_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void) // Dtor.
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::~_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_POLICYTYPESEQ_CS_)
 #define _CORBA_POLICYTYPESEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::PolicyTypeSeq
 // *************************************************************
 
 CORBA::PolicyTypeSeq::PolicyTypeSeq (void)
 {}
-CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max) // uses max size
+
+CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::ULong>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release)
+
+CORBA::PolicyTypeSeq::PolicyTypeSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ULong *buffer,
+    CORBA::Boolean release
+  )
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::ULong>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA::PolicyTypeSeq::PolicyTypeSeq (const PolicyTypeSeq &seq) // copy ctor
+
+CORBA::PolicyTypeSeq::PolicyTypeSeq (const PolicyTypeSeq &seq)
   : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::ULong>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 CORBA::PolicyTypeSeq::~PolicyTypeSeq (void) // dtor
 {}
+
 void CORBA::PolicyTypeSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyTypeSeq *tmp = ACE_static_cast (PolicyTypeSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   36,
   ACE_NTOHL (0x49444c3a), 
   ACE_NTOHL (0x6f6d672e), 
@@ -375,12 +444,12 @@ static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
   ACE_NTOHL (0x54797065), 
   ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0
-  14,
+    14,
   ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63795479), 
   ACE_NTOHL (0x70655365), 
   ACE_NTOHL (0x71000000),  // name = PolicyTypeSeq
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
@@ -396,11 +465,11 @@ static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
       ACE_NTOHL (0x54797065), 
       ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-      11,
+            11,
       ACE_NTOHL (0x506f6c69), 
       ACE_NTOHL (0x63795479), 
       ACE_NTOHL (0x70650000),  // name = PolicyType
-      CORBA::tk_ulong,
+            CORBA::tk_ulong,
 
 
     0U,
@@ -417,9 +486,16 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PolicyTypeSeq, &_tc_TAO_tc_CORBA_PolicyTypeSeq)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyTypeSeq,
+    &_tc_TAO_tc_CORBA_PolicyTypeSeq
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_SetOverrideType[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -450,7 +526,7 @@ static const CORBA::Long _oc_CORBA_SetOverrideType[] =
   ACE_NTOHL (0x4f564552), 
   ACE_NTOHL (0x52494445), 
   ACE_NTOHL (0x0),  // name = ADD_OVERRIDE
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (
     CORBA::tk_enum,
@@ -462,12 +538,15 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_SetOverrideType, &_tc_TAO_tc_CORBA_SetOverrideType)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_SetOverrideType,
+    &_tc_TAO_tc_CORBA_SetOverrideType
+  )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -475,16 +554,12 @@ void operator<<= (
     const CORBA::PolicyList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_PolicyList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy (
+      _tao_any,
+      CORBA::PolicyList::_tao_any_destructor,
+      CORBA::_tc_PolicyList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -493,19 +568,12 @@ void operator<<= (
     CORBA::PolicyList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_PolicyList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::PolicyList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert (
+      _tao_any,
+      CORBA::PolicyList::_tao_any_destructor,
+      CORBA::_tc_PolicyList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -514,8 +582,8 @@ CORBA::Boolean operator>>= (
     CORBA::PolicyList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::PolicyList*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::PolicyList *&,
       _tao_elem
     );
 }
@@ -526,76 +594,17 @@ CORBA::Boolean operator>>= (
     const CORBA::PolicyList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_PolicyList
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::PolicyList*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::PolicyList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::PolicyList,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_PolicyList,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::PolicyList::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::PolicyList>::extract (
+        _tao_any,
+        CORBA::PolicyList::_tao_any_destructor,
+        CORBA::_tc_PolicyList,
+        _tao_elem
+      );
 }
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -603,16 +612,12 @@ void operator<<= (
     const CORBA::PolicyTypeSeq &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_PolicyTypeSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert_copy (
+      _tao_any,
+      CORBA::PolicyTypeSeq::_tao_any_destructor,
+      CORBA::_tc_PolicyTypeSeq,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -621,19 +626,12 @@ void operator<<= (
     CORBA::PolicyTypeSeq *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          CORBA::_tc_PolicyTypeSeq,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          CORBA::PolicyTypeSeq::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert (
+      _tao_any,
+      CORBA::PolicyTypeSeq::_tao_any_destructor,
+      CORBA::_tc_PolicyTypeSeq,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -642,8 +640,8 @@ CORBA::Boolean operator>>= (
     CORBA::PolicyTypeSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::PolicyTypeSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::PolicyTypeSeq *&,
       _tao_elem
     );
 }
@@ -654,129 +652,75 @@ CORBA::Boolean operator>>= (
     const CORBA::PolicyTypeSeq *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          CORBA::_tc_PolicyTypeSeq
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const CORBA::PolicyTypeSeq*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        CORBA::PolicyTypeSeq *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            CORBA::PolicyTypeSeq,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                CORBA::_tc_PolicyTypeSeq,
-                1,
-                ACE_static_cast (void *, tmp),
-                CORBA::PolicyTypeSeq::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::extract (
+        _tao_any,
+        CORBA::PolicyTypeSeq::_tao_any_destructor,
+        CORBA::_tc_PolicyTypeSeq,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::SetOverrideType _tao_elem)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::SetOverrideType _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert (
+      _tao_any,
       CORBA::_tc_SetOverrideType,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::SetOverrideType &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      return 0; // not equivalent
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract (
+        _tao_any,
+        CORBA::_tc_SetOverrideType,
+        _tao_elem 
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::PolicyList &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag =
+            tao_CORBA_Policy_marshal (_tao_sequence[i].in (), strm);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -785,40 +729,57 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::PolicyTypeSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -827,21 +788,30 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
 }
 
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index f9b49b84f5d..2713a0ea7b0 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_POLICY_FORWARDC_H_
-#define _TAO_IDL_POLICY_FORWARDC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_POLICY_FORWARDC_H_
+#define _TAO_IDL_ORIG_POLICY_FORWARDC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -57,25 +60,41 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  CORBA
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::ULong PolicyType;
   typedef CORBA::ULong_out PolicyType_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_PolicyType;
   
-  class Policy;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
   
+  class Policy;
+
 #if !defined (_CORBA_POLICY___PTR_CH_)
 #define _CORBA_POLICY___PTR_CH_
   
   typedef Policy *Policy_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICY___VAR_CH_)
 #define _CORBA_POLICY___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export Policy_var : public TAO_Base_var
   {
   public:
@@ -115,13 +134,14 @@ TAO_NAMESPACE  CORBA
     Policy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICY___OUT_CH_)
 #define _CORBA_POLICY___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export Policy_out
   {
   public:
@@ -138,21 +158,21 @@ TAO_NAMESPACE  CORBA
   private:
     Policy_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // 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_CORBA_POLICYLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
+  class TAO_Export _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void);
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (
@@ -193,55 +213,61 @@ TAO_NAMESPACE  CORBA
       );
     virtual CORBA::Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_CORBA_POLICYLIST_CH_)
 #define _CORBA_POLICYLIST_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class PolicyList;
   class PolicyList_var;
   
   // *************************************************************
-  // PolicyList
+  // CORBA::PolicyList
   // *************************************************************
   
   class TAO_Export PolicyList : 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_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<Policy,Policy_var>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    PolicyList (void); // default ctor
-    PolicyList (CORBA::ULong max); // uses max size
+    PolicyList (void);
+    PolicyList (CORBA::ULong max);
     PolicyList (
         CORBA::ULong max, 
         CORBA::ULong length, 
         Policy_ptr *buffer, 
         CORBA::Boolean release = 0
       );
-    PolicyList (const PolicyList &); // copy ctor
+    PolicyList (const PolicyList &);
     ~PolicyList (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICYLIST___VAR_CH_)
 #define _CORBA_POLICYLIST___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::PolicyList_var
   // *************************************************************
@@ -262,7 +288,9 @@ TAO_NAMESPACE  CORBA
     operator const PolicyList &() const;
     operator PolicyList &();
     operator PolicyList &() const;
-    operator PolicyList *&(); // variable-size base types only
+    
+    // Variable-size base types only.
+    operator PolicyList *&();
     
     TAO_Object_Manager<Policy, Policy_var> operator[] (CORBA::ULong index);
     
@@ -276,14 +304,15 @@ TAO_NAMESPACE  CORBA
   private:
     PolicyList *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICYLIST___OUT_CH_)
 #define _CORBA_POLICYLIST___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export PolicyList_out
   {
   public:
@@ -302,23 +331,26 @@ TAO_NAMESPACE  CORBA
     // Assignment from T_var not allowed.
     void operator= (const PolicyList_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList;
+  // 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_PolicyList;
   
+  // 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_CORBA_POLICYTYPESEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_
   
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
+  class TAO_Export _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void);
     _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (
@@ -355,55 +387,61 @@ TAO_NAMESPACE  CORBA
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
 #if !defined (_CORBA_POLICYTYPESEQ_CH_)
 #define _CORBA_POLICYTYPESEQ_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class PolicyTypeSeq;
   class PolicyTypeSeq_var;
   
   // *************************************************************
-  // PolicyTypeSeq
+  // CORBA::PolicyTypeSeq
   // *************************************************************
   
   class TAO_Export PolicyTypeSeq : 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_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::ULong>
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    PolicyTypeSeq (void); // default ctor
-    PolicyTypeSeq (CORBA::ULong max); // uses max size
+    PolicyTypeSeq (void);
+    PolicyTypeSeq (CORBA::ULong max);
     PolicyTypeSeq (
         CORBA::ULong max, 
         CORBA::ULong length, 
         CORBA::ULong *buffer, 
         CORBA::Boolean release = 0
       );
-    PolicyTypeSeq (const PolicyTypeSeq &); // copy ctor
+    PolicyTypeSeq (const PolicyTypeSeq &);
     ~PolicyTypeSeq (void);
+    
     static void _tao_any_destructor (void*);
     
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyTypeSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICYTYPESEQ___VAR_CH_)
 #define _CORBA_POLICYTYPESEQ___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::PolicyTypeSeq_var
   // *************************************************************
@@ -414,21 +452,24 @@ TAO_NAMESPACE  CORBA
     PolicyTypeSeq_var (void);
     PolicyTypeSeq_var (PolicyTypeSeq *);
     PolicyTypeSeq_var (const PolicyTypeSeq_var &);
+    
     // Fixed-size base types only.
     PolicyTypeSeq_var (const PolicyTypeSeq &);
+    
     ~PolicyTypeSeq_var (void);
     
     PolicyTypeSeq_var &operator= (PolicyTypeSeq *);
     PolicyTypeSeq_var &operator= (const PolicyTypeSeq_var &);
+    
     // Fixed-size base types only.
     PolicyTypeSeq_var &operator= (const PolicyTypeSeq &);
+    
     PolicyTypeSeq *operator-> (void);
     const PolicyTypeSeq *operator-> (void) const;
     
     operator const PolicyTypeSeq &() const;
     operator PolicyTypeSeq &();
     operator PolicyTypeSeq &() const;
-    
     PolicyType & operator[] (CORBA::ULong index);
     const PolicyType & operator[] (CORBA::ULong index) const;
     
@@ -442,14 +483,15 @@ TAO_NAMESPACE  CORBA
   private:
     PolicyTypeSeq *ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLICYTYPESEQ___OUT_CH_)
 #define _CORBA_POLICYTYPESEQ___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_Export PolicyTypeSeq_out
   {
   public:
@@ -468,12 +510,17 @@ TAO_NAMESPACE  CORBA
     // Assignment from T_var not allowed.
     void operator= (const PolicyTypeSeq_var &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
+  // 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_PolicyTypeSeq;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum SetOverrideType
   {
     SET_OVERRIDE,
@@ -481,60 +528,106 @@ TAO_NAMESPACE  CORBA
   };
   
   typedef SetOverrideType &SetOverrideType_out;
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SetOverrideType;
   
+  // 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_SetOverrideType;
+
+// 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_root/root.cpp:103
+
 // External declarations for undefined interface
+
 // CORBA::Policy
 TAO_Export
 CORBA::Policy_ptr
 tao_CORBA_Policy_duplicate (
     CORBA::Policy_ptr
   );
+
 TAO_Export
 void
 tao_CORBA_Policy_release (
     CORBA::Policy_ptr
   );
+
 TAO_Export
 CORBA::Policy_ptr
 tao_CORBA_Policy_nil (
     void
   );
+
 TAO_Export
 CORBA::Policy_ptr
 tao_CORBA_Policy_narrow (
     CORBA::Object *
     ACE_ENV_ARG_DECL_NOT_USED
   );
+
 TAO_Export
 CORBA::Object *
 tao_CORBA_Policy_upcast (
     void *
   );
 
-// Any operators for interface CORBA::Policy
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr);
+TAO_Export
+CORBA::Boolean
+tao_CORBA_Policy_marshal (
+    CORBA::Policy_ptr,
+    TAO_OutputCDR &
+  );
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
+
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyList &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyTypeSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyTypeSeq*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyTypeSeq *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyTypeSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_Export void operator<<= (CORBA::Any &, CORBA::SetOverrideType);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SetOverrideType &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr );
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_CORBA_PolicyList_H_
 #define _TAO_CDR_OP_CORBA_PolicyList_H_
 
@@ -549,6 +642,8 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyList_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_
 #define _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_
@@ -564,11 +659,19 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_ */
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &); // 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "Policy_ForwardC.i"
@@ -584,3 +687,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Policy_ForwardC.i b/TAO/tao/Policy_ForwardC.i
index 2f7c341fe78..6da5cf38028 100644
--- a/TAO/tao/Policy_ForwardC.i
+++ b/TAO/tao/Policy_ForwardC.i
@@ -20,12 +20,16 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// 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_POLICYLIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_
 
-ACE_INLINE CORBA::Policy **
+ACE_INLINE
+CORBA::Policy **
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (CORBA::ULong nelems)
 {
   CORBA::Policy **buf = 0;
@@ -40,11 +44,15 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (CORBA::ULong n
   return buf;
 }
 
-ACE_INLINE void 
+ACE_INLINE
+void 
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (CORBA::Policy **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -60,64 +68,83 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Se
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum,
-  CORBA::ULong length,
-  CORBA::Policy* *value,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::Policy* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList(const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs)
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList(
+    const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    CORBA::Policy **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
-    CORBA::Policy ** const tmp2 = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = tao_CORBA_Policy_duplicate (tmp2[i]);
-      }
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      CORBA::Policy **tmp1 =
+        _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
+      CORBA::Policy ** const tmp2 =
+        ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = tao_CORBA_Policy_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs)
+ACE_INLINE
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList &
+CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator= (
+    const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy **, this->buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      tao_CORBA_Policy_release (tmp[i]);
-      tmp[i] = tao_CORBA_Policy_nil ();
+      CORBA::Policy **tmp =
+        ACE_reinterpret_cast (CORBA::Policy **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tao_CORBA_Policy_release (tmp[i]);
+          tmp[i] = tao_CORBA_Policy_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_);
+        }
     }
-    if (this->maximum_ < rhs.maximum_)
+  else
     {
-      _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_);
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_);
     }
-  }
-  else
-    this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_);
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  CORBA::Policy **tmp1 = ACE_reinterpret_cast (CORBA::Policy **, this->buffer_);
-  CORBA::Policy ** const tmp2 = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_);
+  CORBA::Policy **tmp1 =
+    ACE_reinterpret_cast (CORBA::Policy **, this->buffer_);
+  
+  CORBA::Policy ** const tmp2 =
+    ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
@@ -127,70 +154,78 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator= (const _TAO_Un
   return *this;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var>
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  CORBA::Policy ** const tmp = ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, this->buffer_);
+  CORBA::Policy ** const tmp =
+    ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, this->buffer_);
   return TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> (tmp + index, this->release_);
 }
 
-ACE_INLINE CORBA::Policy* *
+ACE_INLINE
+CORBA::Policy* *
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::Policy **result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::Policy**, 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::Policy**,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(CORBA::Policy**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const CORBA::Policy* *
+ACE_INLINE
+const CORBA::Policy* *
 CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const CORBA::Policy ** ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::Policy ** ACE_CAST_CONST, this->buffer_);
 }
 
-
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_POLICYLIST_CI_)
 #define _CORBA_POLICYLIST_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class CORBA::PolicyList_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::PolicyList_var::PolicyList_var (void) // default constructor
+CORBA::PolicyList_var::PolicyList_var (void)
   : ptr_ (0)
 {}
 
@@ -200,21 +235,26 @@ CORBA::PolicyList_var::PolicyList_var (PolicyList *p)
 {}
 
 ACE_INLINE
-CORBA::PolicyList_var::PolicyList_var (const ::CORBA::PolicyList_var &p) // copy constructor
+CORBA::PolicyList_var::PolicyList_var (const ::CORBA::PolicyList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::PolicyList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CORBA::PolicyList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-CORBA::PolicyList_var::~PolicyList_var (void) // destructor
+CORBA::PolicyList_var::~PolicyList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::PolicyList_var &
+ACE_INLINE
+CORBA::PolicyList_var &
 CORBA::PolicyList_var::operator= (PolicyList *p)
 {
   delete this->ptr_;
@@ -222,7 +262,8 @@ CORBA::PolicyList_var::operator= (PolicyList *p)
   return *this;
 }
 
-ACE_INLINE ::CORBA::PolicyList_var &
+ACE_INLINE
+::CORBA::PolicyList_var &
 CORBA::PolicyList_var::operator= (const ::CORBA::PolicyList_var &p)
 {
   if (this != &p)
@@ -234,8 +275,12 @@ CORBA::PolicyList_var::operator= (const ::CORBA::PolicyList_var &p)
         }
       else
         {
-          PolicyList *deep_copy =
-            new PolicyList (*p.ptr_);
+          PolicyList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              PolicyList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -250,63 +295,68 @@ CORBA::PolicyList_var::operator= (const ::CORBA::PolicyList_var &p)
   return *this;
 }
 
-ACE_INLINE const ::CORBA::PolicyList *
+ACE_INLINE
+const ::CORBA::PolicyList *
 CORBA::PolicyList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyList *
+ACE_INLINE
+::CORBA::PolicyList *
 CORBA::PolicyList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyList_var::operator const ::CORBA::PolicyList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyList_var::operator ::CORBA::PolicyList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyList_var::operator ::CORBA::PolicyList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 CORBA::PolicyList_var::operator ::CORBA::PolicyList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
 CORBA::PolicyList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::CORBA::PolicyList &
+ACE_INLINE
+const ::CORBA::PolicyList &
 CORBA::PolicyList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyList &
+ACE_INLINE
+::CORBA::PolicyList &
 CORBA::PolicyList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA::PolicyList *&
+ACE_INLINE
+::CORBA::PolicyList *&
 CORBA::PolicyList_var::out (void)
 {
   delete this->ptr_;
@@ -314,7 +364,8 @@ CORBA::PolicyList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyList *
+ACE_INLINE
+::CORBA::PolicyList *
 CORBA::PolicyList_var::_retn (void)
 {
   ::CORBA::PolicyList *tmp = this->ptr_;
@@ -322,12 +373,16 @@ CORBA::PolicyList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::CORBA::PolicyList *
+ACE_INLINE
+::CORBA::PolicyList *
 CORBA::PolicyList_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::PolicyList_out
 // *************************************************************
@@ -340,7 +395,7 @@ CORBA::PolicyList_out::PolicyList_out (PolicyList *&p)
 }
 
 ACE_INLINE
-CORBA::PolicyList_out::PolicyList_out (PolicyList_var &p) // constructor from _var
+CORBA::PolicyList_out::PolicyList_out (PolicyList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -348,237 +403,280 @@ CORBA::PolicyList_out::PolicyList_out (PolicyList_var &p) // constructor from _v
 }
 
 ACE_INLINE
-CORBA::PolicyList_out::PolicyList_out (const ::CORBA::PolicyList_out &p) // copy constructor
+CORBA::PolicyList_out::PolicyList_out (const ::CORBA::PolicyList_out &p)
   : ptr_ (ACE_const_cast (PolicyList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA::PolicyList_out &
+ACE_INLINE
+::CORBA::PolicyList_out &
 CORBA::PolicyList_out::operator= (const ::CORBA::PolicyList_out &p)
 {
   this->ptr_ = ACE_const_cast (PolicyList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA::PolicyList_out &
+ACE_INLINE
+::CORBA::PolicyList_out &
 CORBA::PolicyList_out::operator= (PolicyList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyList_out::operator ::CORBA::PolicyList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyList *&
+ACE_INLINE
+::CORBA::PolicyList *&
 CORBA::PolicyList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyList *
+ACE_INLINE
+::CORBA::PolicyList *
 CORBA::PolicyList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
+ACE_INLINE
+TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
 CORBA::PolicyList_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_sequence_ci.cpp:99
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_
 
-// = Static operations.
-ACE_INLINE CORBA::ULong *
+ACE_INLINE
+CORBA::ULong *
 CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   CORBA::ULong *retval = 0;
   ACE_NEW_RETURN (retval, CORBA::ULong[size], 0);
   return retval;
 }
 
-ACE_INLINE void CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (CORBA::ULong *buffer)
-// Free the sequence.
+ACE_INLINE
+void CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (CORBA::ULong *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void) // Default constructor.
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void)
 {
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum,
-  CORBA::ULong length,
-  CORBA::ULong *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ULong *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs)
-// Copy constructor.
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (
+    const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    CORBA::ULong *tmp1 = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::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;
-  }
+    {
+      CORBA::ULong *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::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;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs)
-// Assignment operator.
+ACE_INLINE
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      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_CORBA_PolicyTypeSeq::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          CORBA::ULong *tmp =
+            ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::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_);
+  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];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE CORBA::ULong &
+ACE_INLINE
+CORBA::ULong &
 CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  CORBA::ULong* tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
+  CORBA::ULong* tmp =
+    ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const CORBA::ULong &
+ACE_INLINE
+const CORBA::ULong &
 CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  CORBA::ULong * const tmp = ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
+  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 *
+ACE_INLINE
+CORBA::ULong *
 CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (CORBA::Boolean orphan)
 {
   CORBA::ULong *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::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;
+      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 *
+ACE_INLINE
+const CORBA::ULong *
 CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::replace (CORBA::ULong max,
-CORBA::ULong length,
-CORBA::ULong *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::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_CORBA_PolicyTypeSeq::freebuf (tmp);
-  }
+    {
+      CORBA::ULong *tmp =
+        ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_CORBA_POLICYTYPESEQ_CI_)
 #define _CORBA_POLICYTYPESEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class CORBA::PolicyTypeSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (void) // default constructor
+CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (void)
   : ptr_ (0)
 {}
 
@@ -588,15 +686,19 @@ CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (PolicyTypeSeq *p)
 {}
 
 ACE_INLINE
-CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (const ::CORBA::PolicyTypeSeq_var &p) // copy constructor
+CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (const ::CORBA::PolicyTypeSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::PolicyTypeSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CORBA::PolicyTypeSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size base types only
+// Fixed-size base types only.
 ACE_INLINE
 CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (const ::CORBA::PolicyTypeSeq &p)
 {
@@ -604,12 +706,13 @@ CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (const ::CORBA::PolicyTypeSeq &p)
 }
 
 ACE_INLINE
-CORBA::PolicyTypeSeq_var::~PolicyTypeSeq_var (void) // destructor
+CORBA::PolicyTypeSeq_var::~PolicyTypeSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::PolicyTypeSeq_var &
+ACE_INLINE
+CORBA::PolicyTypeSeq_var &
 CORBA::PolicyTypeSeq_var::operator= (PolicyTypeSeq *p)
 {
   delete this->ptr_;
@@ -617,7 +720,8 @@ CORBA::PolicyTypeSeq_var::operator= (PolicyTypeSeq *p)
   return *this;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq_var &
+ACE_INLINE
+::CORBA::PolicyTypeSeq_var &
 CORBA::PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq_var &p)
 {
   if (this != &p)
@@ -629,8 +733,12 @@ CORBA::PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq_var &p)
         }
       else
         {
-          PolicyTypeSeq *deep_copy =
-            new PolicyTypeSeq (*p.ptr_);
+          PolicyTypeSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              PolicyTypeSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -645,74 +753,82 @@ CORBA::PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq_var &p)
   return *this;
 }
 
-// fixed-size types only
-ACE_INLINE ::CORBA::PolicyTypeSeq_var &
+// Fixed-size types only.
+ACE_INLINE
+::CORBA::PolicyTypeSeq_var &
 CORBA::PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq &p)
 {
   if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::CORBA::PolicyTypeSeq (p), *this);
-  }
+    {
+      delete this->ptr_;
+      ACE_NEW_RETURN (this->ptr_, ::CORBA::PolicyTypeSeq (p), *this);
+    }
+  
   return *this;
 }
 
-ACE_INLINE const ::CORBA::PolicyTypeSeq *
+ACE_INLINE
+const ::CORBA::PolicyTypeSeq *
 CORBA::PolicyTypeSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq *
+ACE_INLINE
+::CORBA::PolicyTypeSeq *
 CORBA::PolicyTypeSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyTypeSeq_var::operator const ::CORBA::PolicyTypeSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA::PolicyType &
+ACE_INLINE
+CORBA::PolicyType &
 CORBA::PolicyTypeSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::PolicyType &
+ACE_INLINE
+const CORBA::PolicyType &
 CORBA::PolicyTypeSeq_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const CORBA::PolicyType &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::CORBA::PolicyTypeSeq &
+ACE_INLINE
+const ::CORBA::PolicyTypeSeq &
 CORBA::PolicyTypeSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq &
+ACE_INLINE
+::CORBA::PolicyTypeSeq &
 CORBA::PolicyTypeSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA::PolicyTypeSeq *&
+ACE_INLINE
+::CORBA::PolicyTypeSeq *&
 CORBA::PolicyTypeSeq_var::out (void)
 {
   delete this->ptr_;
@@ -720,7 +836,8 @@ CORBA::PolicyTypeSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq *
+ACE_INLINE
+::CORBA::PolicyTypeSeq *
 CORBA::PolicyTypeSeq_var::_retn (void)
 {
   ::CORBA::PolicyTypeSeq *tmp = this->ptr_;
@@ -728,12 +845,16 @@ CORBA::PolicyTypeSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq *
+ACE_INLINE
+::CORBA::PolicyTypeSeq *
 CORBA::PolicyTypeSeq_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::PolicyTypeSeq_out
 // *************************************************************
@@ -746,7 +867,7 @@ CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (PolicyTypeSeq *&p)
 }
 
 ACE_INLINE
-CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (PolicyTypeSeq_var &p) // constructor from _var
+CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (PolicyTypeSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -754,51 +875,58 @@ CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (PolicyTypeSeq_var &p) // constructo
 }
 
 ACE_INLINE
-CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (const ::CORBA::PolicyTypeSeq_out &p) // copy constructor
+CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (const ::CORBA::PolicyTypeSeq_out &p)
   : ptr_ (ACE_const_cast (PolicyTypeSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA::PolicyTypeSeq_out &
+ACE_INLINE
+::CORBA::PolicyTypeSeq_out &
 CORBA::PolicyTypeSeq_out::operator= (const ::CORBA::PolicyTypeSeq_out &p)
 {
   this->ptr_ = ACE_const_cast (PolicyTypeSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq_out &
+ACE_INLINE
+::CORBA::PolicyTypeSeq_out &
 CORBA::PolicyTypeSeq_out::operator= (PolicyTypeSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyTypeSeq_out::operator ::CORBA::PolicyTypeSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq *&
+ACE_INLINE
+::CORBA::PolicyTypeSeq *&
 CORBA::PolicyTypeSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::PolicyTypeSeq *
+ACE_INLINE
+::CORBA::PolicyTypeSeq *
 CORBA::PolicyTypeSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::PolicyType &
+ACE_INLINE
+CORBA::PolicyType &
 CORBA::PolicyTypeSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
+
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const CORBA::Policy_ptr
@@ -809,6 +937,8 @@ TAO_Export CORBA::Boolean operator>> (
     CORBA::Policy_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_CORBA_PolicyList_I_
 #define _TAO_CDR_OP_CORBA_PolicyList_I_
@@ -817,6 +947,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA::PolicyList &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA::PolicyList &
@@ -824,6 +955,8 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyList_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_
 #define _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_
@@ -832,6 +965,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA::PolicyTypeSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA::PolicyTypeSeq &
@@ -839,13 +973,18 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enumval)
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
diff --git a/TAO/tao/Pollable.pidl b/TAO/tao/Pollable.pidl
index cf90aebe81c..c5fc4162c13 100644
--- a/TAO/tao/Pollable.pidl
+++ b/TAO/tao/Pollable.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl
- *     -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *     -o orig -Gp -Gd -Ge 1
  *     -Wb,export_macro=TAO_Export
  *     -Wb,export_include="tao/corbafwd.h"
  *     -Wb,pre_include="ace/pre.h"
@@ -64,6 +64,4 @@ module CORBA
   };
 };
 
-#pragma prefix ""
-
 #endif /* TAO_POLLABLE_PIDL */
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index 5cb43c5884d..c7ac789610e 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -19,6 +19,10 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
 #include "PollableC.h"
 
 #if (TAO_HAS_AMI_POLLER == 1)
@@ -33,6 +37,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -41,6 +47,9 @@
 #include "PollableC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int CORBA::Pollable::_tao_class_id = 0;
 
 CORBA::Pollable_ptr
@@ -86,13 +95,23 @@ tao_CORBA_Pollable_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_Pollable_marshal (
+    CORBA::Pollable_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::Pollable_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::Pollable_var::Pollable_var (void) // default constructor
+CORBA::Pollable_var::Pollable_var (void)
   : ptr_ (Pollable::_nil ())
 {}
 
@@ -102,12 +121,12 @@ CORBA::Pollable_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::Pollable_var::Pollable_var (const ::CORBA::Pollable_var &p) // copy constructor
+CORBA::Pollable_var::Pollable_var (const ::CORBA::Pollable_var &p)
   : TAO_Base_var (),
     ptr_ (Pollable::_duplicate (p.ptr ()))
 {}
 
-CORBA::Pollable_var::~Pollable_var (void) // destructor
+CORBA::Pollable_var::~Pollable_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -136,7 +155,7 @@ CORBA::Pollable_var::operator const ::CORBA::Pollable_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA::Pollable_var::operator ::CORBA::Pollable_ptr &() // cast
+CORBA::Pollable_var::operator ::CORBA::Pollable_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -211,10 +230,11 @@ CORBA::Pollable_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::Pollable_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::Pollable_out::Pollable_out (Pollable_ptr &p)
@@ -223,14 +243,14 @@ CORBA::Pollable_out::Pollable_out (Pollable_ptr &p)
   this->ptr_ = ::CORBA::Pollable::_nil ();
 }
 
-CORBA::Pollable_out::Pollable_out (Pollable_var &p) // constructor from _var
+CORBA::Pollable_out::Pollable_out (Pollable_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::CORBA::Pollable::_nil ();
 }
 
-CORBA::Pollable_out::Pollable_out (const ::CORBA::Pollable_out &p) // copy constructor
+CORBA::Pollable_out::Pollable_out (const ::CORBA::Pollable_out &p)
   : ptr_ (ACE_const_cast (Pollable_out &, p).ptr_)
 {}
 
@@ -261,7 +281,7 @@ CORBA::Pollable_out::operator ::CORBA::Pollable_ptr &() // cast
 }
 
 ::CORBA::Pollable_ptr &
-CORBA::Pollable_out::ptr (void) // ptr
+CORBA::Pollable_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -272,9 +292,8 @@ CORBA::Pollable_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::Pollable::Pollable (void)
 {}
@@ -282,7 +301,8 @@ CORBA::Pollable::Pollable (void)
 CORBA::Pollable::~Pollable (void)
 {}
 
-CORBA::Pollable_ptr CORBA::Pollable::_narrow (
+CORBA::Pollable_ptr
+CORBA::Pollable::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -290,50 +310,68 @@ CORBA::Pollable_ptr CORBA::Pollable::_narrow (
   return Pollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::Pollable_ptr
+CORBA::Pollable_ptr 
 CORBA::Pollable::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return Pollable::_nil ();
+    {
+      return Pollable::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Pollable_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Pollable::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Pollable::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::Pollable_ptr
 CORBA::Pollable::_duplicate (Pollable_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *CORBA::Pollable::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, Pollable)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, Pollable)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -342,6 +380,9 @@ const char* CORBA::Pollable::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Pollable:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int CORBA::DIIPollable::_tao_class_id = 0;
 
 CORBA::DIIPollable_ptr
@@ -387,13 +428,23 @@ tao_CORBA_DIIPollable_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_DIIPollable_marshal (
+    CORBA::DIIPollable_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::DIIPollable_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::DIIPollable_var::DIIPollable_var (void) // default constructor
+CORBA::DIIPollable_var::DIIPollable_var (void)
   : ptr_ (DIIPollable::_nil ())
 {}
 
@@ -403,12 +454,12 @@ CORBA::DIIPollable_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::DIIPollable_var::DIIPollable_var (const ::CORBA::DIIPollable_var &p) // copy constructor
+CORBA::DIIPollable_var::DIIPollable_var (const ::CORBA::DIIPollable_var &p)
   : TAO_Base_var (),
     ptr_ (DIIPollable::_duplicate (p.ptr ()))
 {}
 
-CORBA::DIIPollable_var::~DIIPollable_var (void) // destructor
+CORBA::DIIPollable_var::~DIIPollable_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -437,7 +488,7 @@ CORBA::DIIPollable_var::operator const ::CORBA::DIIPollable_ptr &() const // cas
   return this->ptr_;
 }
 
-CORBA::DIIPollable_var::operator ::CORBA::DIIPollable_ptr &() // cast
+CORBA::DIIPollable_var::operator ::CORBA::DIIPollable_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -512,10 +563,11 @@ CORBA::DIIPollable_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::DIIPollable_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_ptr &p)
@@ -524,14 +576,14 @@ CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_ptr &p)
   this->ptr_ = ::CORBA::DIIPollable::_nil ();
 }
 
-CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_var &p) // constructor from _var
+CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::CORBA::DIIPollable::_nil ();
 }
 
-CORBA::DIIPollable_out::DIIPollable_out (const ::CORBA::DIIPollable_out &p) // copy constructor
+CORBA::DIIPollable_out::DIIPollable_out (const ::CORBA::DIIPollable_out &p)
   : ptr_ (ACE_const_cast (DIIPollable_out &, p).ptr_)
 {}
 
@@ -562,7 +614,7 @@ CORBA::DIIPollable_out::operator ::CORBA::DIIPollable_ptr &() // cast
 }
 
 ::CORBA::DIIPollable_ptr &
-CORBA::DIIPollable_out::ptr (void) // ptr
+CORBA::DIIPollable_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -573,9 +625,8 @@ CORBA::DIIPollable_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::DIIPollable::DIIPollable (void)
 {}
@@ -583,7 +634,8 @@ CORBA::DIIPollable::DIIPollable (void)
 CORBA::DIIPollable::~DIIPollable (void)
 {}
 
-CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow (
+CORBA::DIIPollable_ptr
+CORBA::DIIPollable::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -591,62 +643,82 @@ CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow (
   return DIIPollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::DIIPollable_ptr
+CORBA::DIIPollable_ptr 
 CORBA::DIIPollable::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return DIIPollable::_nil ();
+    {
+      return DIIPollable::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           DIIPollable_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &DIIPollable::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &DIIPollable::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::DIIPollable_ptr
 CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *CORBA::DIIPollable::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, DIIPollable)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, Pollable)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Pollable_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, DIIPollable)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, Pollable)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Pollable_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -655,6 +727,9 @@ const char* CORBA::DIIPollable::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/DIIPollable:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int CORBA::PollableSet::_tao_class_id = 0;
 
 CORBA::PollableSet_ptr
@@ -700,13 +775,23 @@ tao_CORBA_PollableSet_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_PollableSet_marshal (
+    CORBA::PollableSet_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // CORBA::PollableSet_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-CORBA::PollableSet_var::PollableSet_var (void) // default constructor
+CORBA::PollableSet_var::PollableSet_var (void)
   : ptr_ (PollableSet::_nil ())
 {}
 
@@ -716,12 +801,12 @@ CORBA::PollableSet_var::ptr (void) const
   return this->ptr_;
 }
 
-CORBA::PollableSet_var::PollableSet_var (const ::CORBA::PollableSet_var &p) // copy constructor
+CORBA::PollableSet_var::PollableSet_var (const ::CORBA::PollableSet_var &p)
   : TAO_Base_var (),
     ptr_ (PollableSet::_duplicate (p.ptr ()))
 {}
 
-CORBA::PollableSet_var::~PollableSet_var (void) // destructor
+CORBA::PollableSet_var::~PollableSet_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -750,7 +835,7 @@ CORBA::PollableSet_var::operator const ::CORBA::PollableSet_ptr &() const // cas
   return this->ptr_;
 }
 
-CORBA::PollableSet_var::operator ::CORBA::PollableSet_ptr &() // cast
+CORBA::PollableSet_var::operator ::CORBA::PollableSet_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -825,10 +910,11 @@ CORBA::PollableSet_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // CORBA::PollableSet_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 CORBA::PollableSet_out::PollableSet_out (PollableSet_ptr &p)
@@ -837,14 +923,14 @@ CORBA::PollableSet_out::PollableSet_out (PollableSet_ptr &p)
   this->ptr_ = ::CORBA::PollableSet::_nil ();
 }
 
-CORBA::PollableSet_out::PollableSet_out (PollableSet_var &p) // constructor from _var
+CORBA::PollableSet_out::PollableSet_out (PollableSet_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::CORBA::PollableSet::_nil ();
 }
 
-CORBA::PollableSet_out::PollableSet_out (const ::CORBA::PollableSet_out &p) // copy constructor
+CORBA::PollableSet_out::PollableSet_out (const ::CORBA::PollableSet_out &p)
   : ptr_ (ACE_const_cast (PollableSet_out &, p).ptr_)
 {}
 
@@ -875,7 +961,7 @@ CORBA::PollableSet_out::operator ::CORBA::PollableSet_ptr &() // cast
 }
 
 ::CORBA::PollableSet_ptr &
-CORBA::PollableSet_out::ptr (void) // ptr
+CORBA::PollableSet_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -886,9 +972,8 @@ CORBA::PollableSet_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::PollableSet::PollableSet (void)
 {}
@@ -896,7 +981,8 @@ CORBA::PollableSet::PollableSet (void)
 CORBA::PollableSet::~PollableSet (void)
 {}
 
-CORBA::PollableSet_ptr CORBA::PollableSet::_narrow (
+CORBA::PollableSet_ptr
+CORBA::PollableSet::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -904,50 +990,68 @@ CORBA::PollableSet_ptr CORBA::PollableSet::_narrow (
   return PollableSet::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::PollableSet_ptr
+CORBA::PollableSet_ptr 
 CORBA::PollableSet::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return PollableSet::_nil ();
+    {
+      return PollableSet::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           PollableSet_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &PollableSet::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &PollableSet::_tao_class_id
+                )
+            )
         );
 }
 
 CORBA::PollableSet_ptr
 CORBA::PollableSet::_duplicate (PollableSet_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *CORBA::PollableSet::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::CORBA, PollableSet)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::CORBA, PollableSet)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -956,7 +1060,9 @@ const char* CORBA::PollableSet::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/PollableSet:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void)
   : CORBA::UserException (
         "IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0",
@@ -965,12 +1071,10 @@ CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 CORBA::PollableSet::NoPossiblePollable::~NoPossiblePollable (void)
 {
 }
 
-// Copy constructor.
 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -979,7 +1083,6 @@ CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::Polla
 {
 }
 
-// Assignment operator.
 CORBA::PollableSet::NoPossiblePollable&
 CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp)
 {
@@ -988,11 +1091,11 @@ CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::N
 }
 
 CORBA::PollableSet::NoPossiblePollable *
-CORBA::PollableSet::NoPossiblePollable::_downcast (CORBA::Exception *exc)
+CORBA::PollableSet::NoPossiblePollable::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (NoPossiblePollable *, exc);
+      return ACE_dynamic_cast (NoPossiblePollable *, _tao_excp);
     }
   else
     {
@@ -1013,13 +1116,13 @@ CORBA::PollableSet::NoPossiblePollable::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      CORBA::PollableSet::NoPossiblePollable (*this),
+      ::CORBA::PollableSet::NoPossiblePollable (*this),
       0
     );
   return result;
 }
 
-void CORBA::PollableSet::NoPossiblePollable::_raise ()
+void CORBA::PollableSet::NoPossiblePollable::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -1040,7 +1143,11 @@ void CORBA::PollableSet::NoPossiblePollable::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 CORBA::PollableSet::UnknownPollable::UnknownPollable (void)
   : CORBA::UserException (
         "IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0",
@@ -1049,12 +1156,10 @@ CORBA::PollableSet::UnknownPollable::UnknownPollable (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 CORBA::PollableSet::UnknownPollable::~UnknownPollable (void)
 {
 }
 
-// Copy constructor.
 CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet::UnknownPollable &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -1063,7 +1168,6 @@ CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet
 {
 }
 
-// Assignment operator.
 CORBA::PollableSet::UnknownPollable&
 CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::UnknownPollable &_tao_excp)
 {
@@ -1072,11 +1176,11 @@ CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::Unkn
 }
 
 CORBA::PollableSet::UnknownPollable *
-CORBA::PollableSet::UnknownPollable::_downcast (CORBA::Exception *exc)
+CORBA::PollableSet::UnknownPollable::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (UnknownPollable *, exc);
+      return ACE_dynamic_cast (UnknownPollable *, _tao_excp);
     }
   else
     {
@@ -1097,13 +1201,13 @@ CORBA::PollableSet::UnknownPollable::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      CORBA::PollableSet::UnknownPollable (*this),
+      ::CORBA::PollableSet::UnknownPollable (*this),
       0
     );
   return result;
 }
 
-void CORBA::PollableSet::UnknownPollable::_raise ()
+void CORBA::PollableSet::UnknownPollable::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -1124,25 +1228,7 @@ void CORBA::PollableSet::UnknownPollable::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::Pollable,CORBA::Pollable_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::Pollable,CORBA::Pollable_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* TAO_HAS_AMI_POLLER == 1 */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::DIIPollable,CORBA::DIIPollable_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::DIIPollable,CORBA::DIIPollable_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::PollableSet,CORBA::PollableSet_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::PollableSet,CORBA::PollableSet_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#endif /* TAO_HAS_AMI_POLLER == 1 */
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index 7d363500b53..e82096e2673 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_POLLABLEC_H_
 #define _TAO_IDL_ORIG_POLLABLEC_H_
 
@@ -26,6 +29,7 @@
 #include "tao/corbafwd.h"
 
 #if (TAO_HAS_AMI_POLLER == 1)
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -57,21 +61,30 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  CORBA
 {
-  class PollableSet;
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
+  class PollableSet;
+
 #if !defined (_CORBA_POLLABLESET___PTR_CH_)
 #define _CORBA_POLLABLESET___PTR_CH_
   
   typedef PollableSet *PollableSet_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLLABLESET___VAR_CH_)
 #define _CORBA_POLLABLESET___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export PollableSet_var : public TAO_Base_var
   {
   public:
@@ -111,13 +124,14 @@ TAO_NAMESPACE  CORBA
     PollableSet_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLLABLESET___OUT_CH_)
 #define _CORBA_POLLABLESET___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export PollableSet_out
   {
   public:
@@ -134,23 +148,26 @@ TAO_NAMESPACE  CORBA
   private:
     PollableSet_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_CORBA_POLLABLE___PTR_CH_)
 #define _CORBA_POLLABLE___PTR_CH_
   
   class Pollable;
   typedef Pollable *Pollable_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLLABLE___VAR_CH_)
 #define _CORBA_POLLABLE___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export Pollable_var : public TAO_Base_var
   {
   public:
@@ -190,13 +207,14 @@ TAO_NAMESPACE  CORBA
     Pollable_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLLABLE___OUT_CH_)
 #define _CORBA_POLLABLE___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export Pollable_out
   {
   public:
@@ -213,11 +231,12 @@ TAO_NAMESPACE  CORBA
   private:
     Pollable_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_POLLABLE_CH_)
 #define _CORBA_POLLABLE_CH_
   
@@ -225,11 +244,8 @@ TAO_NAMESPACE  CORBA
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Pollable_ptr _ptr_type;
     typedef Pollable_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -250,6 +266,11 @@ TAO_NAMESPACE  CORBA
         return (Pollable_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean is_ready (
         CORBA::ULong timeout
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -258,44 +279,52 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::PollableSet_ptr create_pollable_set (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     Pollable (void);
-    
     virtual ~Pollable (void);
-  
+    
   private:
     Pollable (const Pollable &);
     void operator= (const Pollable &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_CORBA_DIIPOLLABLE___PTR_CH_)
 #define _CORBA_DIIPOLLABLE___PTR_CH_
   
   class DIIPollable;
   typedef DIIPollable *DIIPollable_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_DIIPOLLABLE___VAR_CH_)
 #define _CORBA_DIIPOLLABLE___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export DIIPollable_var : public TAO_Base_var
   {
   public:
@@ -335,13 +364,14 @@ TAO_NAMESPACE  CORBA
     DIIPollable_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_DIIPOLLABLE___OUT_CH_)
 #define _CORBA_DIIPOLLABLE___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export DIIPollable_out
   {
   public:
@@ -358,11 +388,12 @@ TAO_NAMESPACE  CORBA
   private:
     DIIPollable_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_DIIPOLLABLE_CH_)
 #define _CORBA_DIIPOLLABLE_CH_
   
@@ -370,11 +401,8 @@ TAO_NAMESPACE  CORBA
     : public virtual CORBA::Pollable
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef DIIPollable_ptr _ptr_type;
     typedef DIIPollable_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -395,36 +423,44 @@ TAO_NAMESPACE  CORBA
         return (DIIPollable_ptr)0;
       }
     
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     DIIPollable (void);
-    
     virtual ~DIIPollable (void);
-  
+    
   private:
     DIIPollable (const DIIPollable &);
     void operator= (const DIIPollable &);
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_CORBA_POLLABLESET___PTR_CH_)
 #define _CORBA_POLLABLESET___PTR_CH_
   
   class PollableSet;
   typedef PollableSet *PollableSet_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLLABLESET___VAR_CH_)
 #define _CORBA_POLLABLESET___VAR_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export PollableSet_var : public TAO_Base_var
   {
   public:
@@ -464,13 +500,14 @@ TAO_NAMESPACE  CORBA
     PollableSet_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
-  
-  
+
 #if !defined (_CORBA_POLLABLESET___OUT_CH_)
 #define _CORBA_POLLABLESET___OUT_CH_
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export PollableSet_out
   {
   public:
@@ -487,11 +524,12 @@ TAO_NAMESPACE  CORBA
   private:
     PollableSet_ptr &ptr_;
   };
-  
-  
+
 #endif /* end #if !defined */
   
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_CORBA_POLLABLESET_CH_)
 #define _CORBA_POLLABLESET_CH_
   
@@ -499,11 +537,8 @@ TAO_NAMESPACE  CORBA
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PollableSet_ptr _ptr_type;
     typedef PollableSet_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
     
     // The static operations.
@@ -525,6 +560,10 @@ TAO_NAMESPACE  CORBA
       }
     
     
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_)
 #define _CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_
     
@@ -537,7 +576,7 @@ TAO_NAMESPACE  CORBA
       ~NoPossiblePollable (void);
 
       NoPossiblePollable &operator= (const NoPossiblePollable &);
-
+      
       static NoPossiblePollable *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -555,13 +594,15 @@ TAO_NAMESPACE  CORBA
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
-      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
-
 #endif /* end #if !defined */
     
-    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_)
 #define _CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_
     
@@ -574,7 +615,7 @@ TAO_NAMESPACE  CORBA
       ~UnknownPollable (void);
 
       UnknownPollable &operator= (const UnknownPollable &);
-
+      
       static UnknownPollable *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -592,20 +633,25 @@ TAO_NAMESPACE  CORBA
           ACE_ENV_ARG_DECL_NOT_USED
         );
       
-      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
-
 #endif /* end #if !defined */
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::DIIPollable_ptr create_dii_pollable (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_pollable (
         CORBA::Pollable_ptr potential
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -614,6 +660,9 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Pollable_ptr poll (
         CORBA::ULong timeout
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -623,6 +672,9 @@ TAO_NAMESPACE  CORBA
         , CORBA::PollableSet::NoPossiblePollable
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void remove (
         CORBA::Pollable_ptr potential
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -632,41 +684,57 @@ TAO_NAMESPACE  CORBA
         , CORBA::PollableSet::UnknownPollable
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::UShort number_left (
-        
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     PollableSet (void);
-    
     virtual ~PollableSet (void);
+    
+    friend class _TAO_PollableSet_Remote_Proxy_Impl;
+    friend class _TAO_PollableSet_ThruPOA_Proxy_Impl;
+    friend class _TAO_PollableSet_Direct_Proxy_Impl;
   
   private:
     PollableSet (const PollableSet &);
     void operator= (const PollableSet &);
   };
-  
-  
+
 #endif /* end #if !defined */
-  
-  
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "PollableC.i"
@@ -684,3 +752,4 @@ TAO_NAMESPACE_CLOSE // module CORBA
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i
index 6fb811d052f..437f3407c58 100644
--- a/TAO/tao/PollableC.i
+++ b/TAO/tao/PollableC.i
@@ -20,31 +20,48 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
 #if !defined (_CORBA_POLLABLE___CI_)
 #define _CORBA_POLLABLE___CI_
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::Pollable::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_DIIPOLLABLE___CI_)
 #define _CORBA_DIIPOLLABLE___CI_
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::DIIPollable::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception CORBA::PollableSet::NoPossiblePollable
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception CORBA::PollableSet::UnknownPollable
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_POLLABLESET___CI_)
 #define _CORBA_POLLABLESET___CI_
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::PollableSet::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 7a7b1cdb605..2db0543b4c8 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -22,7 +22,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -Gv
+ *     -o orig -Gp -Gd -Ge 1
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/corbafwd.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index dca45587fff..7df59e2124f 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PortableInterceptorC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "PortableInterceptorC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,6 +44,9 @@
 #include "PortableInterceptorC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::Interceptor::_tao_class_id = 0;
 
 PortableInterceptor::Interceptor_ptr
@@ -84,13 +92,23 @@ tao_PortableInterceptor_Interceptor_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_Interceptor_marshal (
+    PortableInterceptor::Interceptor_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::Interceptor_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::Interceptor_var::Interceptor_var (void) // default constructor
+PortableInterceptor::Interceptor_var::Interceptor_var (void)
   : ptr_ (Interceptor::_nil ())
 {}
 
@@ -100,12 +118,12 @@ PortableInterceptor::Interceptor_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::Interceptor_var::Interceptor_var (const ::PortableInterceptor::Interceptor_var &p) // copy constructor
+PortableInterceptor::Interceptor_var::Interceptor_var (const ::PortableInterceptor::Interceptor_var &p)
   : TAO_Base_var (),
     ptr_ (Interceptor::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::Interceptor_var::~Interceptor_var (void) // destructor
+PortableInterceptor::Interceptor_var::~Interceptor_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -134,7 +152,7 @@ PortableInterceptor::Interceptor_var::operator const ::PortableInterceptor::Inte
   return this->ptr_;
 }
 
-PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast
+PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -209,10 +227,11 @@ PortableInterceptor::Interceptor_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::Interceptor_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_ptr &p)
@@ -221,14 +240,14 @@ PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_ptr &p)
   this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
 }
 
-PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_var &p) // constructor from _var
+PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
 }
 
-PortableInterceptor::Interceptor_out::Interceptor_out (const ::PortableInterceptor::Interceptor_out &p) // copy constructor
+PortableInterceptor::Interceptor_out::Interceptor_out (const ::PortableInterceptor::Interceptor_out &p)
   : ptr_ (ACE_const_cast (Interceptor_out &, p).ptr_)
 {}
 
@@ -259,7 +278,7 @@ PortableInterceptor::Interceptor_out::operator ::PortableInterceptor::Intercepto
 }
 
 ::PortableInterceptor::Interceptor_ptr &
-PortableInterceptor::Interceptor_out::ptr (void) // ptr
+PortableInterceptor::Interceptor_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -270,9 +289,8 @@ PortableInterceptor::Interceptor_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::Interceptor::Interceptor (void)
 {}
@@ -280,7 +298,15 @@ PortableInterceptor::Interceptor::Interceptor (void)
 PortableInterceptor::Interceptor::~Interceptor (void)
 {}
 
-PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_narrow (
+void 
+PortableInterceptor::Interceptor::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Interceptor *tmp = ACE_static_cast (Interceptor *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -288,73 +314,133 @@ PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_narrow (
   return Interceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor_ptr 
 PortableInterceptor::Interceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return Interceptor::_nil ();
+    {
+      return Interceptor::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Interceptor_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Interceptor::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Interceptor::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::Interceptor_ptr
 PortableInterceptor::Interceptor::_duplicate (Interceptor_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::Interceptor::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/Interceptor:1.0";
+  return "IDL:omg.org/PortableInterceptor/Interceptor:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_Interceptor[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f723a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Interceptor:1.0
+    12,
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f7200),  // name = Interceptor
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Interceptor (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_Interceptor),
+    (char *) &_oc_PortableInterceptor_Interceptor,
+    0,
+    sizeof (PortableInterceptor::Interceptor)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Interceptor,
+    &_tc_TAO_tc_PortableInterceptor_Interceptor
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
   : CORBA::UserException (
-        "IDL:PortableInterceptor/ForwardRequest:1.0",
+        "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
         "ForwardRequest"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableInterceptor::ForwardRequest::~ForwardRequest (void)
 {
 }
 
-// Copy constructor.
 PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor::ForwardRequest &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -365,7 +451,6 @@ PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor
   this->permanent = _tao_excp.permanent;
 }
 
-// Assignment operator.
 PortableInterceptor::ForwardRequest&
 PortableInterceptor::ForwardRequest::operator= (const ::PortableInterceptor::ForwardRequest &_tao_excp)
 {
@@ -382,11 +467,11 @@ void PortableInterceptor::ForwardRequest::_tao_any_destructor (void *_tao_void_p
 }
 
 PortableInterceptor::ForwardRequest *
-PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *exc)
+PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ForwardRequest:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableInterceptor/ForwardRequest:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (ForwardRequest *, exc);
+      return ACE_dynamic_cast (ForwardRequest *, _tao_excp);
     }
   else
     {
@@ -407,13 +492,13 @@ PortableInterceptor::ForwardRequest::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableInterceptor::ForwardRequest (*this),
+      ::PortableInterceptor::ForwardRequest (*this),
       0
     );
   return result;
 }
 
-void PortableInterceptor::ForwardRequest::_raise ()
+void PortableInterceptor::ForwardRequest::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -427,7 +512,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -440,16 +525,20 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+
 PortableInterceptor::ForwardRequest::ForwardRequest (
     const CORBA::Object_ptr  _tao_forward,
     CORBA::Boolean _tao_permanent
-  )
-  : CORBA::UserException (
-        "IDL:PortableInterceptor/ForwardRequest:1.0",
+  )  : CORBA::UserException (
+        "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
         "ForwardRequest"
       )
 {
@@ -457,51 +546,46 @@ PortableInterceptor::ForwardRequest::ForwardRequest (
   this->permanent = _tao_permanent;
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_type (void) const
+{
+  return ::PortableInterceptor::_tc_ForwardRequest;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x466f7277),
-  ACE_NTOHL (0x61726452),
-  ACE_NTOHL (0x65717565),
-  ACE_NTOHL (0x73743a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/ForwardRequest:1.0
-  15,
-  ACE_NTOHL (0x466f7277),
-  ACE_NTOHL (0x61726452),
-  ACE_NTOHL (0x65717565),
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  51,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x466f7277), 
+  ACE_NTOHL (0x61726452), 
+  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ForwardRequest:1.0
+    15,
+  ACE_NTOHL (0x466f7277), 
+  ACE_NTOHL (0x61726452), 
+  ACE_NTOHL (0x65717565), 
   ACE_NTOHL (0x73740000),  // name = ForwardRequest
   2, // member count
-  8,
-  ACE_NTOHL (0x666f7277),
+    8,
+  ACE_NTOHL (0x666f7277), 
   ACE_NTOHL (0x61726400),  // name = forward
-  CORBA::tk_objref,
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    29,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f62),
-    ACE_NTOHL (0x6a656374),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-    7,
-    ACE_NTOHL (0x4f626a65),
-    ACE_NTOHL (0x63740000),  // name = Object
-
-  10,
-  ACE_NTOHL (0x7065726d),
-  ACE_NTOHL (0x616e656e),
+      10,
+  ACE_NTOHL (0x7065726d), 
+  ACE_NTOHL (0x616e656e), 
   ACE_NTOHL (0x74000000),  // name = permanent
-  CORBA::tk_boolean,
+    CORBA::tk_boolean,
 
 };
 
@@ -515,35 +599,37 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ForwardRequest (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ForwardRequest, &_tc_TAO_tc_PortableInterceptor_ForwardRequest)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ForwardRequest,
+    &_tc_TAO_tc_PortableInterceptor_ForwardRequest
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_type (void) const
-{
-  return ::PortableInterceptor::_tc_ForwardRequest;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_PortableInterceptor_ReplyStatus[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x5265706c),
-  ACE_NTOHL (0x79537461),
-  ACE_NTOHL (0x7475733a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/ReplyStatus:1.0
-  12,
-  ACE_NTOHL (0x5265706c),
-  ACE_NTOHL (0x79537461),
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x79537461), 
+  ACE_NTOHL (0x7475733a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ReplyStatus:1.0
+    12,
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x79537461), 
   ACE_NTOHL (0x74757300),  // name = ReplyStatus
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -557,50 +643,35 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ReplyStatus (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ReplyStatus, &_tc_TAO_tc_PortableInterceptor_ReplyStatus)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ReplyStatus,
+    &_tc_TAO_tc_PortableInterceptor_ReplyStatus
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SUCCESSFUL, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYSTEM_EXCEPTION, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, USER_EXCEPTION, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, LOCATION_FORWARD, 3)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, LOCATION_FORWARD_PERMANENT, 4)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, TRANSPORT_RETRY, 5)
-TAO_NAMESPACE_END
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_SlotId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x536c6f74),
-  ACE_NTOHL (0x49643a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/SlotId:1.0
-  7,
-  ACE_NTOHL (0x536c6f74),
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  43,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x536c6f74), 
+  ACE_NTOHL (0x49643a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/SlotId:1.0
+    7,
+  ACE_NTOHL (0x536c6f74), 
   ACE_NTOHL (0x49640000),  // name = SlotId
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
 };
 
@@ -614,24 +685,28 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_SlotId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_SlotId, &_tc_TAO_tc_PortableInterceptor_SlotId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_SlotId,
+    &_tc_TAO_tc_PortableInterceptor_SlotId
+  )
 TAO_NAMESPACE_END
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableInterceptor::InvalidSlot::InvalidSlot (void)
   : CORBA::UserException (
-        "IDL:PortableInterceptor/InvalidSlot:1.0",
+        "IDL:omg.org/PortableInterceptor/InvalidSlot:1.0",
         "InvalidSlot"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableInterceptor::InvalidSlot::~InvalidSlot (void)
 {
 }
 
-// Copy constructor.
 PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::InvalidSlot &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -640,7 +715,6 @@ PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::Inva
 {
 }
 
-// Assignment operator.
 PortableInterceptor::InvalidSlot&
 PortableInterceptor::InvalidSlot::operator= (const ::PortableInterceptor::InvalidSlot &_tao_excp)
 {
@@ -655,11 +729,11 @@ void PortableInterceptor::InvalidSlot::_tao_any_destructor (void *_tao_void_poin
 }
 
 PortableInterceptor::InvalidSlot *
-PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception *exc)
+PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/InvalidSlot:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableInterceptor/InvalidSlot:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InvalidSlot *, exc);
+      return ACE_dynamic_cast (InvalidSlot *, _tao_excp);
     }
   else
     {
@@ -680,13 +754,13 @@ PortableInterceptor::InvalidSlot::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableInterceptor::InvalidSlot (*this),
+      ::PortableInterceptor::InvalidSlot (*this),
       0
     );
   return result;
 }
 
-void PortableInterceptor::InvalidSlot::_raise ()
+void PortableInterceptor::InvalidSlot::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -700,7 +774,7 @@ void PortableInterceptor::InvalidSlot::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -713,30 +787,41 @@ void PortableInterceptor::InvalidSlot::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const
+{
+  return ::PortableInterceptor::_tc_InvalidSlot;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696453),
-  ACE_NTOHL (0x6c6f743a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/InvalidSlot:1.0
-  12,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696453),
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696453), 
+  ACE_NTOHL (0x6c6f743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/InvalidSlot:1.0
+    12,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696453), 
   ACE_NTOHL (0x6c6f7400),  // name = InvalidSlot
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot (
     CORBA::tk_except,
@@ -748,15 +833,15 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_InvalidSlot, &_tc_TAO_tc_PortableInterceptor_InvalidSlot)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_InvalidSlot,
+    &_tc_TAO_tc_PortableInterceptor_InvalidSlot
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const
-{
-  return ::PortableInterceptor::_tc_InvalidSlot;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int PortableInterceptor::Current::_tao_class_id = 0;
 
@@ -803,13 +888,23 @@ tao_PortableInterceptor_Current_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_Current_marshal (
+    PortableInterceptor::Current_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::Current_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::Current_var::Current_var (void) // default constructor
+PortableInterceptor::Current_var::Current_var (void)
   : ptr_ (Current::_nil ())
 {}
 
@@ -819,12 +914,12 @@ PortableInterceptor::Current_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::Current_var::Current_var (const ::PortableInterceptor::Current_var &p) // copy constructor
+PortableInterceptor::Current_var::Current_var (const ::PortableInterceptor::Current_var &p)
   : TAO_Base_var (),
     ptr_ (Current::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::Current_var::~Current_var (void) // destructor
+PortableInterceptor::Current_var::~Current_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -853,7 +948,7 @@ PortableInterceptor::Current_var::operator const ::PortableInterceptor::Current_
   return this->ptr_;
 }
 
-PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast
+PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -928,10 +1023,11 @@ PortableInterceptor::Current_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::Current_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::Current_out::Current_out (Current_ptr &p)
@@ -940,14 +1036,14 @@ PortableInterceptor::Current_out::Current_out (Current_ptr &p)
   this->ptr_ = ::PortableInterceptor::Current::_nil ();
 }
 
-PortableInterceptor::Current_out::Current_out (Current_var &p) // constructor from _var
+PortableInterceptor::Current_out::Current_out (Current_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::Current::_nil ();
 }
 
-PortableInterceptor::Current_out::Current_out (const ::PortableInterceptor::Current_out &p) // copy constructor
+PortableInterceptor::Current_out::Current_out (const ::PortableInterceptor::Current_out &p)
   : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
 {}
 
@@ -978,7 +1074,7 @@ PortableInterceptor::Current_out::operator ::PortableInterceptor::Current_ptr &(
 }
 
 ::PortableInterceptor::Current_ptr &
-PortableInterceptor::Current_out::ptr (void) // ptr
+PortableInterceptor::Current_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -989,9 +1085,8 @@ PortableInterceptor::Current_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::Current::Current (void)
 {}
@@ -999,7 +1094,15 @@ PortableInterceptor::Current::Current (void)
 PortableInterceptor::Current::~Current (void)
 {}
 
-PortableInterceptor::Current_ptr PortableInterceptor::Current::_narrow (
+void 
+PortableInterceptor::Current::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::Current_ptr
+PortableInterceptor::Current::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1007,70 +1110,133 @@ PortableInterceptor::Current_ptr PortableInterceptor::Current::_narrow (
   return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::Current_ptr
+PortableInterceptor::Current_ptr 
 PortableInterceptor::Current::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return Current::_nil ();
+    {
+      return Current::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Current_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Current::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Current::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::Current_ptr
 PortableInterceptor::Current::_duplicate (Current_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, Current)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Current::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Current_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, Current)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Current::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Current_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::Current::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/Current:1.0";
+  return "IDL:omg.org/PortableInterceptor/Current:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_Current[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Current:1.0
+    8,
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_Current),
+    (char *) &_oc_PortableInterceptor_Current,
+    0,
+    sizeof (PortableInterceptor::Current)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Current,
+    &_tc_TAO_tc_PortableInterceptor_Current
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::RequestInfo::_tao_class_id = 0;
 
 PortableInterceptor::RequestInfo_ptr
@@ -1116,13 +1282,23 @@ tao_PortableInterceptor_RequestInfo_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_RequestInfo_marshal (
+    PortableInterceptor::RequestInfo_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::RequestInfo_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::RequestInfo_var::RequestInfo_var (void) // default constructor
+PortableInterceptor::RequestInfo_var::RequestInfo_var (void)
   : ptr_ (RequestInfo::_nil ())
 {}
 
@@ -1132,12 +1308,12 @@ PortableInterceptor::RequestInfo_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::RequestInfo_var::RequestInfo_var (const ::PortableInterceptor::RequestInfo_var &p) // copy constructor
+PortableInterceptor::RequestInfo_var::RequestInfo_var (const ::PortableInterceptor::RequestInfo_var &p)
   : TAO_Base_var (),
     ptr_ (RequestInfo::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::RequestInfo_var::~RequestInfo_var (void) // destructor
+PortableInterceptor::RequestInfo_var::~RequestInfo_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1166,7 +1342,7 @@ PortableInterceptor::RequestInfo_var::operator const ::PortableInterceptor::Requ
   return this->ptr_;
 }
 
-PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast
+PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1241,10 +1417,11 @@ PortableInterceptor::RequestInfo_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::RequestInfo_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_ptr &p)
@@ -1253,14 +1430,14 @@ PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_ptr &p)
   this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
 }
 
-PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_var &p) // constructor from _var
+PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
 }
 
-PortableInterceptor::RequestInfo_out::RequestInfo_out (const ::PortableInterceptor::RequestInfo_out &p) // copy constructor
+PortableInterceptor::RequestInfo_out::RequestInfo_out (const ::PortableInterceptor::RequestInfo_out &p)
   : ptr_ (ACE_const_cast (RequestInfo_out &, p).ptr_)
 {}
 
@@ -1291,7 +1468,7 @@ PortableInterceptor::RequestInfo_out::operator ::PortableInterceptor::RequestInf
 }
 
 ::PortableInterceptor::RequestInfo_ptr &
-PortableInterceptor::RequestInfo_out::ptr (void) // ptr
+PortableInterceptor::RequestInfo_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1302,9 +1479,8 @@ PortableInterceptor::RequestInfo_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::RequestInfo::RequestInfo (void)
 {}
@@ -1312,7 +1488,15 @@ PortableInterceptor::RequestInfo::RequestInfo (void)
 PortableInterceptor::RequestInfo::~RequestInfo (void)
 {}
 
-PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_narrow (
+void 
+PortableInterceptor::RequestInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RequestInfo *tmp = ACE_static_cast (RequestInfo *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1320,58 +1504,121 @@ PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_narrow (
   return RequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo_ptr 
 PortableInterceptor::RequestInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return RequestInfo::_nil ();
+    {
+      return RequestInfo::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           RequestInfo_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &RequestInfo::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &RequestInfo::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::RequestInfo_ptr
 PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::RequestInfo::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/RequestInfo:1.0";
+  return "IDL:omg.org/PortableInterceptor/RequestInfo:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_RequestInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737449), 
+  ACE_NTOHL (0x6e666f3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/RequestInfo:1.0
+    12,
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737449), 
+  ACE_NTOHL (0x6e666f00),  // name = RequestInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_RequestInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_RequestInfo),
+    (char *) &_oc_PortableInterceptor_RequestInfo,
+    0,
+    sizeof (PortableInterceptor::RequestInfo)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_RequestInfo,
+    &_tc_TAO_tc_PortableInterceptor_RequestInfo
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::ClientRequestInfo::_tao_class_id = 0;
 
 PortableInterceptor::ClientRequestInfo_ptr
@@ -1417,13 +1664,23 @@ tao_PortableInterceptor_ClientRequestInfo_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_ClientRequestInfo_marshal (
+    PortableInterceptor::ClientRequestInfo_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::ClientRequestInfo_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (void) // default constructor
+PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (void)
   : ptr_ (ClientRequestInfo::_nil ())
 {}
 
@@ -1433,12 +1690,12 @@ PortableInterceptor::ClientRequestInfo_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (const ::PortableInterceptor::ClientRequestInfo_var &p) // copy constructor
+PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (const ::PortableInterceptor::ClientRequestInfo_var &p)
   : TAO_Base_var (),
     ptr_ (ClientRequestInfo::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::ClientRequestInfo_var::~ClientRequestInfo_var (void) // destructor
+PortableInterceptor::ClientRequestInfo_var::~ClientRequestInfo_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1467,7 +1724,7 @@ PortableInterceptor::ClientRequestInfo_var::operator const ::PortableInterceptor
   return this->ptr_;
 }
 
-PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast
+PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1542,10 +1799,11 @@ PortableInterceptor::ClientRequestInfo_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::ClientRequestInfo_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_ptr &p)
@@ -1554,14 +1812,14 @@ PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequest
   this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
 }
 
-PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_var &p) // constructor from _var
+PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
 }
 
-PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (const ::PortableInterceptor::ClientRequestInfo_out &p) // copy constructor
+PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (const ::PortableInterceptor::ClientRequestInfo_out &p)
   : ptr_ (ACE_const_cast (ClientRequestInfo_out &, p).ptr_)
 {}
 
@@ -1592,7 +1850,7 @@ PortableInterceptor::ClientRequestInfo_out::operator ::PortableInterceptor::Clie
 }
 
 ::PortableInterceptor::ClientRequestInfo_ptr &
-PortableInterceptor::ClientRequestInfo_out::ptr (void) // ptr
+PortableInterceptor::ClientRequestInfo_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1603,9 +1861,8 @@ PortableInterceptor::ClientRequestInfo_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
 {}
@@ -1613,7 +1870,15 @@ PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
 PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
 {}
 
-PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_narrow (
+void 
+PortableInterceptor::ClientRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ClientRequestInfo *tmp = ACE_static_cast (ClientRequestInfo *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1621,70 +1886,139 @@ PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInf
   return ClientRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo_ptr 
 PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ClientRequestInfo::_nil ();
+    {
+      return ClientRequestInfo::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ClientRequestInfo_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ClientRequestInfo::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ClientRequestInfo::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::ClientRequestInfo_ptr
 PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInfo)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableInterceptor::RequestInfo_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInfo)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableInterceptor::RequestInfo_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/ClientRequestInfo:1.0";
+  return "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ClientRequestInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  54,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
+  ACE_NTOHL (0x6f3a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0
+    18,
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
+  ACE_NTOHL (0x6f000000),  // name = ClientRequestInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ClientRequestInfo),
+    (char *) &_oc_PortableInterceptor_ClientRequestInfo,
+    0,
+    sizeof (PortableInterceptor::ClientRequestInfo)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ClientRequestInfo,
+    &_tc_TAO_tc_PortableInterceptor_ClientRequestInfo
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::ServerRequestInfo::_tao_class_id = 0;
 
 PortableInterceptor::ServerRequestInfo_ptr
@@ -1730,13 +2064,23 @@ tao_PortableInterceptor_ServerRequestInfo_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_ServerRequestInfo_marshal (
+    PortableInterceptor::ServerRequestInfo_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::ServerRequestInfo_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (void) // default constructor
+PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (void)
   : ptr_ (ServerRequestInfo::_nil ())
 {}
 
@@ -1746,12 +2090,12 @@ PortableInterceptor::ServerRequestInfo_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (const ::PortableInterceptor::ServerRequestInfo_var &p) // copy constructor
+PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (const ::PortableInterceptor::ServerRequestInfo_var &p)
   : TAO_Base_var (),
     ptr_ (ServerRequestInfo::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::ServerRequestInfo_var::~ServerRequestInfo_var (void) // destructor
+PortableInterceptor::ServerRequestInfo_var::~ServerRequestInfo_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1780,7 +2124,7 @@ PortableInterceptor::ServerRequestInfo_var::operator const ::PortableInterceptor
   return this->ptr_;
 }
 
-PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast
+PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1855,10 +2199,11 @@ PortableInterceptor::ServerRequestInfo_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::ServerRequestInfo_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_ptr &p)
@@ -1867,14 +2212,14 @@ PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequest
   this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
 }
 
-PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_var &p) // constructor from _var
+PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
 }
 
-PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (const ::PortableInterceptor::ServerRequestInfo_out &p) // copy constructor
+PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (const ::PortableInterceptor::ServerRequestInfo_out &p)
   : ptr_ (ACE_const_cast (ServerRequestInfo_out &, p).ptr_)
 {}
 
@@ -1905,7 +2250,7 @@ PortableInterceptor::ServerRequestInfo_out::operator ::PortableInterceptor::Serv
 }
 
 ::PortableInterceptor::ServerRequestInfo_ptr &
-PortableInterceptor::ServerRequestInfo_out::ptr (void) // ptr
+PortableInterceptor::ServerRequestInfo_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1916,9 +2261,8 @@ PortableInterceptor::ServerRequestInfo_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
 {}
@@ -1926,7 +2270,15 @@ PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
 PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
 {}
 
-PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_narrow (
+void 
+PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServerRequestInfo *tmp = ACE_static_cast (ServerRequestInfo *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1934,70 +2286,139 @@ PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInf
   return ServerRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo_ptr 
 PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ServerRequestInfo::_nil ();
+    {
+      return ServerRequestInfo::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServerRequestInfo_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServerRequestInfo::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServerRequestInfo::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::ServerRequestInfo_ptr
 PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInfo)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableInterceptor::RequestInfo_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInfo)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableInterceptor::RequestInfo_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/ServerRequestInfo:1.0";
+  return "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ServerRequestInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  54,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
+  ACE_NTOHL (0x6f3a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0
+    18,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
+  ACE_NTOHL (0x6f000000),  // name = ServerRequestInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ServerRequestInfo),
+    (char *) &_oc_PortableInterceptor_ServerRequestInfo,
+    0,
+    sizeof (PortableInterceptor::ServerRequestInfo)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServerRequestInfo,
+    &_tc_TAO_tc_PortableInterceptor_ServerRequestInfo
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::ClientRequestInterceptor::_tao_class_id = 0;
 
 PortableInterceptor::ClientRequestInterceptor_ptr
@@ -2043,13 +2464,23 @@ tao_PortableInterceptor_ClientRequestInterceptor_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_ClientRequestInterceptor_marshal (
+    PortableInterceptor::ClientRequestInterceptor_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::ClientRequestInterceptor_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (void) // default constructor
+PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (void)
   : ptr_ (ClientRequestInterceptor::_nil ())
 {}
 
@@ -2059,12 +2490,12 @@ PortableInterceptor::ClientRequestInterceptor_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (const ::PortableInterceptor::ClientRequestInterceptor_var &p) // copy constructor
+PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (const ::PortableInterceptor::ClientRequestInterceptor_var &p)
   : TAO_Base_var (),
     ptr_ (ClientRequestInterceptor::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::ClientRequestInterceptor_var::~ClientRequestInterceptor_var (void) // destructor
+PortableInterceptor::ClientRequestInterceptor_var::~ClientRequestInterceptor_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2093,7 +2524,7 @@ PortableInterceptor::ClientRequestInterceptor_var::operator const ::PortableInte
   return this->ptr_;
 }
 
-PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast
+PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2168,10 +2599,11 @@ PortableInterceptor::ClientRequestInterceptor_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::ClientRequestInterceptor_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_ptr &p)
@@ -2180,14 +2612,14 @@ PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out
   this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
 }
 
-PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_var &p) // constructor from _var
+PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
 }
 
-PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (const ::PortableInterceptor::ClientRequestInterceptor_out &p) // copy constructor
+PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (const ::PortableInterceptor::ClientRequestInterceptor_out &p)
   : ptr_ (ACE_const_cast (ClientRequestInterceptor_out &, p).ptr_)
 {}
 
@@ -2218,7 +2650,7 @@ PortableInterceptor::ClientRequestInterceptor_out::operator ::PortableIntercepto
 }
 
 ::PortableInterceptor::ClientRequestInterceptor_ptr &
-PortableInterceptor::ClientRequestInterceptor_out::ptr (void) // ptr
+PortableInterceptor::ClientRequestInterceptor_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2229,9 +2661,8 @@ PortableInterceptor::ClientRequestInterceptor_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
 {}
@@ -2239,7 +2670,15 @@ PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
 PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
 {}
 
-PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_narrow (
+void 
+PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ClientRequestInterceptor *tmp = ACE_static_cast (ClientRequestInterceptor *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2247,70 +2686,143 @@ PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientReq
   return ClientRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor_ptr 
 PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ClientRequestInterceptor::_nil ();
+    {
+      return ClientRequestInterceptor::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ClientRequestInterceptor_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ClientRequestInterceptor::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ClientRequestInterceptor::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::ClientRequestInterceptor_ptr
 PortableInterceptor::ClientRequestInterceptor::_duplicate (ClientRequestInterceptor_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInterceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableInterceptor::Interceptor_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInterceptor)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableInterceptor::Interceptor_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/ClientRequestInterceptor:1.0";
+  return "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ClientRequestInterceptor[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  61,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0
+    25,
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
+  ACE_NTOHL (0x0),  // name = ClientRequestInterceptor
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ClientRequestInterceptor),
+    (char *) &_oc_PortableInterceptor_ClientRequestInterceptor,
+    0,
+    sizeof (PortableInterceptor::ClientRequestInterceptor)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ClientRequestInterceptor,
+    &_tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::ServerRequestInterceptor::_tao_class_id = 0;
 
 PortableInterceptor::ServerRequestInterceptor_ptr
@@ -2356,13 +2868,23 @@ tao_PortableInterceptor_ServerRequestInterceptor_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_ServerRequestInterceptor_marshal (
+    PortableInterceptor::ServerRequestInterceptor_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::ServerRequestInterceptor_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (void) // default constructor
+PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (void)
   : ptr_ (ServerRequestInterceptor::_nil ())
 {}
 
@@ -2372,12 +2894,12 @@ PortableInterceptor::ServerRequestInterceptor_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (const ::PortableInterceptor::ServerRequestInterceptor_var &p) // copy constructor
+PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (const ::PortableInterceptor::ServerRequestInterceptor_var &p)
   : TAO_Base_var (),
     ptr_ (ServerRequestInterceptor::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::ServerRequestInterceptor_var::~ServerRequestInterceptor_var (void) // destructor
+PortableInterceptor::ServerRequestInterceptor_var::~ServerRequestInterceptor_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2406,7 +2928,7 @@ PortableInterceptor::ServerRequestInterceptor_var::operator const ::PortableInte
   return this->ptr_;
 }
 
-PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast
+PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2481,10 +3003,11 @@ PortableInterceptor::ServerRequestInterceptor_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::ServerRequestInterceptor_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_ptr &p)
@@ -2493,14 +3016,14 @@ PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out
   this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
 }
 
-PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_var &p) // constructor from _var
+PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
 }
 
-PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (const ::PortableInterceptor::ServerRequestInterceptor_out &p) // copy constructor
+PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (const ::PortableInterceptor::ServerRequestInterceptor_out &p)
   : ptr_ (ACE_const_cast (ServerRequestInterceptor_out &, p).ptr_)
 {}
 
@@ -2531,7 +3054,7 @@ PortableInterceptor::ServerRequestInterceptor_out::operator ::PortableIntercepto
 }
 
 ::PortableInterceptor::ServerRequestInterceptor_ptr &
-PortableInterceptor::ServerRequestInterceptor_out::ptr (void) // ptr
+PortableInterceptor::ServerRequestInterceptor_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2542,9 +3065,8 @@ PortableInterceptor::ServerRequestInterceptor_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
 {}
@@ -2552,7 +3074,15 @@ PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
 PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
 {}
 
-PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_narrow (
+void 
+PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServerRequestInterceptor *tmp = ACE_static_cast (ServerRequestInterceptor *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2560,70 +3090,143 @@ PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerReq
   return ServerRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor_ptr 
 PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ServerRequestInterceptor::_nil ();
+    {
+      return ServerRequestInterceptor::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServerRequestInterceptor_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServerRequestInterceptor::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServerRequestInterceptor::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_duplicate (ServerRequestInterceptor_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInterceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableInterceptor::Interceptor_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInterceptor)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableInterceptor::Interceptor_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/ServerRequestInterceptor:1.0";
+  return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ServerRequestInterceptor[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  61,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0
+    25,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
+  ACE_NTOHL (0x0),  // name = ServerRequestInterceptor
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ServerRequestInterceptor),
+    (char *) &_oc_PortableInterceptor_ServerRequestInterceptor,
+    0,
+    sizeof (PortableInterceptor::ServerRequestInterceptor)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServerRequestInterceptor,
+    &_tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::IORInfo::_tao_class_id = 0;
 
 PortableInterceptor::IORInfo_ptr
@@ -2669,13 +3272,23 @@ tao_PortableInterceptor_IORInfo_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_IORInfo_marshal (
+    PortableInterceptor::IORInfo_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::IORInfo_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::IORInfo_var::IORInfo_var (void) // default constructor
+PortableInterceptor::IORInfo_var::IORInfo_var (void)
   : ptr_ (IORInfo::_nil ())
 {}
 
@@ -2685,12 +3298,12 @@ PortableInterceptor::IORInfo_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::IORInfo_var::IORInfo_var (const ::PortableInterceptor::IORInfo_var &p) // copy constructor
+PortableInterceptor::IORInfo_var::IORInfo_var (const ::PortableInterceptor::IORInfo_var &p)
   : TAO_Base_var (),
     ptr_ (IORInfo::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::IORInfo_var::~IORInfo_var (void) // destructor
+PortableInterceptor::IORInfo_var::~IORInfo_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2719,7 +3332,7 @@ PortableInterceptor::IORInfo_var::operator const ::PortableInterceptor::IORInfo_
   return this->ptr_;
 }
 
-PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast
+PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2794,10 +3407,11 @@ PortableInterceptor::IORInfo_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::IORInfo_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_ptr &p)
@@ -2806,14 +3420,14 @@ PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_ptr &p)
   this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
 }
 
-PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_var &p) // constructor from _var
+PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
 }
 
-PortableInterceptor::IORInfo_out::IORInfo_out (const ::PortableInterceptor::IORInfo_out &p) // copy constructor
+PortableInterceptor::IORInfo_out::IORInfo_out (const ::PortableInterceptor::IORInfo_out &p)
   : ptr_ (ACE_const_cast (IORInfo_out &, p).ptr_)
 {}
 
@@ -2844,7 +3458,7 @@ PortableInterceptor::IORInfo_out::operator ::PortableInterceptor::IORInfo_ptr &(
 }
 
 ::PortableInterceptor::IORInfo_ptr &
-PortableInterceptor::IORInfo_out::ptr (void) // ptr
+PortableInterceptor::IORInfo_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2855,9 +3469,8 @@ PortableInterceptor::IORInfo_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::IORInfo::IORInfo (void)
 {}
@@ -2865,7 +3478,15 @@ PortableInterceptor::IORInfo::IORInfo (void)
 PortableInterceptor::IORInfo::~IORInfo (void)
 {}
 
-PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_narrow (
+void 
+PortableInterceptor::IORInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  IORInfo *tmp = ACE_static_cast (IORInfo *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2873,58 +3494,119 @@ PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_narrow (
   return IORInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo_ptr 
 PortableInterceptor::IORInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return IORInfo::_nil ();
+    {
+      return IORInfo::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           IORInfo_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &IORInfo::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &IORInfo::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::IORInfo_ptr
 PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, IORInfo)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, IORInfo)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/IORInfo:1.0";
+  return "IDL:omg.org/PortableInterceptor/IORInfo:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_IORInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x494f5249), 
+  ACE_NTOHL (0x6e666f3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/IORInfo:1.0
+    8,
+  ACE_NTOHL (0x494f5249), 
+  ACE_NTOHL (0x6e666f00),  // name = IORInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_IORInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_IORInfo),
+    (char *) &_oc_PortableInterceptor_IORInfo,
+    0,
+    sizeof (PortableInterceptor::IORInfo)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IORInfo,
+    &_tc_TAO_tc_PortableInterceptor_IORInfo
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::IORInterceptor::_tao_class_id = 0;
 
 PortableInterceptor::IORInterceptor_ptr
@@ -2970,13 +3652,23 @@ tao_PortableInterceptor_IORInterceptor_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_IORInterceptor_marshal (
+    PortableInterceptor::IORInterceptor_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::IORInterceptor_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::IORInterceptor_var::IORInterceptor_var (void) // default constructor
+PortableInterceptor::IORInterceptor_var::IORInterceptor_var (void)
   : ptr_ (IORInterceptor::_nil ())
 {}
 
@@ -2986,12 +3678,12 @@ PortableInterceptor::IORInterceptor_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::IORInterceptor_var::IORInterceptor_var (const ::PortableInterceptor::IORInterceptor_var &p) // copy constructor
+PortableInterceptor::IORInterceptor_var::IORInterceptor_var (const ::PortableInterceptor::IORInterceptor_var &p)
   : TAO_Base_var (),
     ptr_ (IORInterceptor::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::IORInterceptor_var::~IORInterceptor_var (void) // destructor
+PortableInterceptor::IORInterceptor_var::~IORInterceptor_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3020,7 +3712,7 @@ PortableInterceptor::IORInterceptor_var::operator const ::PortableInterceptor::I
   return this->ptr_;
 }
 
-PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast
+PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3095,10 +3787,11 @@ PortableInterceptor::IORInterceptor_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::IORInterceptor_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_ptr &p)
@@ -3107,14 +3800,14 @@ PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_ptr
   this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
 }
 
-PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_var &p) // constructor from _var
+PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
 }
 
-PortableInterceptor::IORInterceptor_out::IORInterceptor_out (const ::PortableInterceptor::IORInterceptor_out &p) // copy constructor
+PortableInterceptor::IORInterceptor_out::IORInterceptor_out (const ::PortableInterceptor::IORInterceptor_out &p)
   : ptr_ (ACE_const_cast (IORInterceptor_out &, p).ptr_)
 {}
 
@@ -3145,7 +3838,7 @@ PortableInterceptor::IORInterceptor_out::operator ::PortableInterceptor::IORInte
 }
 
 ::PortableInterceptor::IORInterceptor_ptr &
-PortableInterceptor::IORInterceptor_out::ptr (void) // ptr
+PortableInterceptor::IORInterceptor_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3156,9 +3849,8 @@ PortableInterceptor::IORInterceptor_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::IORInterceptor::IORInterceptor (void)
 {}
@@ -3166,7 +3858,15 @@ PortableInterceptor::IORInterceptor::IORInterceptor (void)
 PortableInterceptor::IORInterceptor::~IORInterceptor (void)
 {}
 
-PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_narrow (
+void 
+PortableInterceptor::IORInterceptor::_tao_any_destructor (void *_tao_void_pointer)
+{
+  IORInterceptor *tmp = ACE_static_cast (IORInterceptor *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3174,70 +3874,137 @@ PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_na
   return IORInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor_ptr 
 PortableInterceptor::IORInterceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return IORInterceptor::_nil ();
+    {
+      return IORInterceptor::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           IORInterceptor_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &IORInterceptor::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &IORInterceptor::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::IORInterceptor_ptr
 PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, IORInterceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableInterceptor::Interceptor_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, IORInterceptor)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableInterceptor::Interceptor_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/IORInterceptor:1.0";
+  return "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_IORInterceptor[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  51,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x494f5249), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x6f723a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/IORInterceptor:1.0
+    15,
+  ACE_NTOHL (0x494f5249), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x6f720000),  // name = IORInterceptor
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_IORInterceptor (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_IORInterceptor),
+    (char *) &_oc_PortableInterceptor_IORInterceptor,
+    0,
+    sizeof (PortableInterceptor::IORInterceptor)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IORInterceptor,
+    &_tc_TAO_tc_PortableInterceptor_IORInterceptor
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::PolicyFactory::_tao_class_id = 0;
 
 PortableInterceptor::PolicyFactory_ptr
@@ -3283,13 +4050,23 @@ tao_PortableInterceptor_PolicyFactory_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_PolicyFactory_marshal (
+    PortableInterceptor::PolicyFactory_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::PolicyFactory_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::PolicyFactory_var::PolicyFactory_var (void) // default constructor
+PortableInterceptor::PolicyFactory_var::PolicyFactory_var (void)
   : ptr_ (PolicyFactory::_nil ())
 {}
 
@@ -3299,12 +4076,12 @@ PortableInterceptor::PolicyFactory_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::PolicyFactory_var::PolicyFactory_var (const ::PortableInterceptor::PolicyFactory_var &p) // copy constructor
+PortableInterceptor::PolicyFactory_var::PolicyFactory_var (const ::PortableInterceptor::PolicyFactory_var &p)
   : TAO_Base_var (),
     ptr_ (PolicyFactory::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::PolicyFactory_var::~PolicyFactory_var (void) // destructor
+PortableInterceptor::PolicyFactory_var::~PolicyFactory_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3333,7 +4110,7 @@ PortableInterceptor::PolicyFactory_var::operator const ::PortableInterceptor::Po
   return this->ptr_;
 }
 
-PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast
+PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3408,10 +4185,11 @@ PortableInterceptor::PolicyFactory_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::PolicyFactory_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_ptr &p)
@@ -3420,14 +4198,14 @@ PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_ptr &p)
   this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
 }
 
-PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_var &p) // constructor from _var
+PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
 }
 
-PortableInterceptor::PolicyFactory_out::PolicyFactory_out (const ::PortableInterceptor::PolicyFactory_out &p) // copy constructor
+PortableInterceptor::PolicyFactory_out::PolicyFactory_out (const ::PortableInterceptor::PolicyFactory_out &p)
   : ptr_ (ACE_const_cast (PolicyFactory_out &, p).ptr_)
 {}
 
@@ -3458,7 +4236,7 @@ PortableInterceptor::PolicyFactory_out::operator ::PortableInterceptor::PolicyFa
 }
 
 ::PortableInterceptor::PolicyFactory_ptr &
-PortableInterceptor::PolicyFactory_out::ptr (void) // ptr
+PortableInterceptor::PolicyFactory_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3469,9 +4247,8 @@ PortableInterceptor::PolicyFactory_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::PolicyFactory::PolicyFactory (void)
 {}
@@ -3479,7 +4256,15 @@ PortableInterceptor::PolicyFactory::PolicyFactory (void)
 PortableInterceptor::PolicyFactory::~PolicyFactory (void)
 {}
 
-PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narrow (
+void 
+PortableInterceptor::PolicyFactory::_tao_any_destructor (void *_tao_void_pointer)
+{
+  PolicyFactory *tmp = ACE_static_cast (PolicyFactory *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3487,37 +4272,42 @@ PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narr
   return PolicyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory_ptr 
 PortableInterceptor::PolicyFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return PolicyFactory::_nil ();
+    {
+      return PolicyFactory::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           PolicyFactory_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &PolicyFactory::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &PolicyFactory::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
+// Hand-crafted.
+
 ::CORBA::Policy_ptr
 PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
                                                     ACE_ENV_ARG_DECL)
@@ -3531,24 +4321,86 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
 void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, PolicyFactory)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, PolicyFactory)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/PolicyFactory:1.0";
+  return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_PolicyFactory[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  50,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794661), 
+  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x793a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/PolicyFactory:1.0
+    14,
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794661), 
+  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x79000000),  // name = PolicyFactory
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_PolicyFactory (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_PolicyFactory),
+    (char *) &_oc_PortableInterceptor_PolicyFactory,
+    0,
+    sizeof (PortableInterceptor::PolicyFactory)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PolicyFactory,
+    &_tc_TAO_tc_PortableInterceptor_PolicyFactory
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::ORBInitInfo::_tao_class_id = 0;
 
 PortableInterceptor::ORBInitInfo_ptr
@@ -3594,13 +4446,23 @@ tao_PortableInterceptor_ORBInitInfo_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_ORBInitInfo_marshal (
+    PortableInterceptor::ORBInitInfo_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::ORBInitInfo_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (void) // default constructor
+PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (void)
   : ptr_ (ORBInitInfo::_nil ())
 {}
 
@@ -3610,12 +4472,12 @@ PortableInterceptor::ORBInitInfo_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (const ::PortableInterceptor::ORBInitInfo_var &p) // copy constructor
+PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (const ::PortableInterceptor::ORBInitInfo_var &p)
   : TAO_Base_var (),
     ptr_ (ORBInitInfo::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::ORBInitInfo_var::~ORBInitInfo_var (void) // destructor
+PortableInterceptor::ORBInitInfo_var::~ORBInitInfo_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3644,7 +4506,7 @@ PortableInterceptor::ORBInitInfo_var::operator const ::PortableInterceptor::ORBI
   return this->ptr_;
 }
 
-PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast
+PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3719,10 +4581,11 @@ PortableInterceptor::ORBInitInfo_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::ORBInitInfo_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_ptr &p)
@@ -3731,14 +4594,14 @@ PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_ptr &p)
   this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
 }
 
-PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_var &p) // constructor from _var
+PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
 }
 
-PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (const ::PortableInterceptor::ORBInitInfo_out &p) // copy constructor
+PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (const ::PortableInterceptor::ORBInitInfo_out &p)
   : ptr_ (ACE_const_cast (ORBInitInfo_out &, p).ptr_)
 {}
 
@@ -3769,7 +4632,7 @@ PortableInterceptor::ORBInitInfo_out::operator ::PortableInterceptor::ORBInitInf
 }
 
 ::PortableInterceptor::ORBInitInfo_ptr &
-PortableInterceptor::ORBInitInfo_out::ptr (void) // ptr
+PortableInterceptor::ORBInitInfo_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3780,9 +4643,8 @@ PortableInterceptor::ORBInitInfo_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
 {}
@@ -3790,7 +4652,15 @@ PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
 PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
 {}
 
-PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_narrow (
+void 
+PortableInterceptor::ORBInitInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ORBInitInfo *tmp = ACE_static_cast (ORBInitInfo *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3798,73 +4668,132 @@ PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_narrow (
   return ORBInitInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo_ptr 
 PortableInterceptor::ORBInitInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ORBInitInfo::_nil ();
+    {
+      return ORBInitInfo::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ORBInitInfo_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ORBInitInfo::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ORBInitInfo::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::ORBInitInfo_ptr
 PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitInfo)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitInfo)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/ORBInitInfo:1.0";
+  return "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_ObjectId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  57,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f2f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0
+    9,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x0),  // name = ObjectId
+    CORBA::tk_string, 
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_ORBInitInfo_ObjectId),
+    (char *) &_oc_PortableInterceptor_ORBInitInfo_ObjectId,
+    0,
+    sizeof (PortableInterceptor::ORBInitInfo::ObjectId)
+  );
+
+::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_ObjectId =
+  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void)
   : CORBA::UserException (
-        "IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
+        "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
         "DuplicateName"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableInterceptor::ORBInitInfo::DuplicateName::~DuplicateName (void)
 {
 }
 
-// Copy constructor.
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -3874,7 +4803,6 @@ PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::Portable
   this->name = CORBA::string_dup (_tao_excp.name.in ());
 }
 
-// Assignment operator.
 PortableInterceptor::ORBInitInfo::DuplicateName&
 PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
 {
@@ -3883,12 +4811,18 @@ PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInte
   return *this;
 }
 
+void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor (void *_tao_void_pointer)
+{
+  DuplicateName *tmp = ACE_static_cast (DuplicateName*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableInterceptor::ORBInitInfo::DuplicateName *
-PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *exc)
+PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (DuplicateName *, exc);
+      return ACE_dynamic_cast (DuplicateName *, _tao_excp);
     }
   else
     {
@@ -3909,13 +4843,13 @@ PortableInterceptor::ORBInitInfo::DuplicateName::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableInterceptor::ORBInitInfo::DuplicateName (*this),
+      ::PortableInterceptor::ORBInitInfo::DuplicateName (*this),
       0
     );
   return result;
 }
 
-void PortableInterceptor::ORBInitInfo::DuplicateName::_raise ()
+void PortableInterceptor::ORBInitInfo::DuplicateName::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -3936,32 +4870,89 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (
     const char * _tao_name
-  )
-  : CORBA::UserException (
-        "IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
+  )  : CORBA::UserException (
+        "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
         "DuplicateName"
       )
 {
   this->name = CORBA::string_dup (_tao_name);
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_type (void) const
+{
+  return ::PortableInterceptor::ORBInitInfo::_tc_DuplicateName;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_DuplicateName[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  62,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f2f), 
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x654e616d), 
+  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0
+    14,
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x654e616d), 
+  ACE_NTOHL (0x65000000),  // name = DuplicateName
+  1, // member count
+    5,
+  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x0),  // name = name
+    CORBA::tk_string, 
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName (
+    CORBA::tk_except,
+    sizeof (_oc_PortableInterceptor_ORBInitInfo_DuplicateName),
+    (char *) &_oc_PortableInterceptor_ORBInitInfo_DuplicateName,
+    0,
+    sizeof (PortableInterceptor::ORBInitInfo::DuplicateName)
+  );
+
+::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
+  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void)
   : CORBA::UserException (
-        "IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0",
+        "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0",
         "InvalidName"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableInterceptor::ORBInitInfo::InvalidName::~InvalidName (void)
 {
 }
 
-// Copy constructor.
 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -3970,7 +4961,6 @@ PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInte
 {
 }
 
-// Assignment operator.
 PortableInterceptor::ORBInitInfo::InvalidName&
 PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
 {
@@ -3978,12 +4968,18 @@ PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterc
   return *this;
 }
 
+void PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor (void *_tao_void_pointer)
+{
+  InvalidName *tmp = ACE_static_cast (InvalidName*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableInterceptor::ORBInitInfo::InvalidName *
-PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *exc)
+PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InvalidName *, exc);
+      return ACE_dynamic_cast (InvalidName *, _tao_excp);
     }
   else
     {
@@ -4004,13 +5000,13 @@ PortableInterceptor::ORBInitInfo::InvalidName::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableInterceptor::ORBInitInfo::InvalidName (*this),
+      ::PortableInterceptor::ORBInitInfo::InvalidName (*this),
       0
     );
   return result;
 }
 
-void PortableInterceptor::ORBInitInfo::InvalidName::_raise ()
+void PortableInterceptor::ORBInitInfo::InvalidName::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -4031,6 +5027,97 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_type (void) const
+{
+  return ::PortableInterceptor::ORBInitInfo::_tc_InvalidName;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_InvalidName[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  60,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f2f), 
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69644e), 
+  ACE_NTOHL (0x616d653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0
+    12,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69644e), 
+  ACE_NTOHL (0x616d6500),  // name = InvalidName
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName (
+    CORBA::tk_except,
+    sizeof (_oc_PortableInterceptor_ORBInitInfo_InvalidName),
+    (char *) &_oc_PortableInterceptor_ORBInitInfo_InvalidName,
+    0,
+    sizeof (PortableInterceptor::ORBInitInfo::InvalidName)
+  );
+
+::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_InvalidName =
+  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0
+    12,
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f00),  // name = ORBInitInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ORBInitInfo),
+    (char *) &_oc_PortableInterceptor_ORBInitInfo,
+    0,
+    sizeof (PortableInterceptor::ORBInitInfo)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ORBInitInfo,
+    &_tc_TAO_tc_PortableInterceptor_ORBInitInfo
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableInterceptor::ORBInitializer::_tao_class_id = 0;
 
 PortableInterceptor::ORBInitializer_ptr
@@ -4076,13 +5163,23 @@ tao_PortableInterceptor_ORBInitializer_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableInterceptor_ORBInitializer_marshal (
+    PortableInterceptor::ORBInitializer_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableInterceptor::ORBInitializer_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableInterceptor::ORBInitializer_var::ORBInitializer_var (void) // default constructor
+PortableInterceptor::ORBInitializer_var::ORBInitializer_var (void)
   : ptr_ (ORBInitializer::_nil ())
 {}
 
@@ -4092,12 +5189,12 @@ PortableInterceptor::ORBInitializer_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableInterceptor::ORBInitializer_var::ORBInitializer_var (const ::PortableInterceptor::ORBInitializer_var &p) // copy constructor
+PortableInterceptor::ORBInitializer_var::ORBInitializer_var (const ::PortableInterceptor::ORBInitializer_var &p)
   : TAO_Base_var (),
     ptr_ (ORBInitializer::_duplicate (p.ptr ()))
 {}
 
-PortableInterceptor::ORBInitializer_var::~ORBInitializer_var (void) // destructor
+PortableInterceptor::ORBInitializer_var::~ORBInitializer_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4126,7 +5223,7 @@ PortableInterceptor::ORBInitializer_var::operator const ::PortableInterceptor::O
   return this->ptr_;
 }
 
-PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast
+PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4201,10 +5298,11 @@ PortableInterceptor::ORBInitializer_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableInterceptor::ORBInitializer_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_ptr &p)
@@ -4213,14 +5311,14 @@ PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_ptr
   this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
 }
 
-PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_var &p) // constructor from _var
+PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
 }
 
-PortableInterceptor::ORBInitializer_out::ORBInitializer_out (const ::PortableInterceptor::ORBInitializer_out &p) // copy constructor
+PortableInterceptor::ORBInitializer_out::ORBInitializer_out (const ::PortableInterceptor::ORBInitializer_out &p)
   : ptr_ (ACE_const_cast (ORBInitializer_out &, p).ptr_)
 {}
 
@@ -4251,7 +5349,7 @@ PortableInterceptor::ORBInitializer_out::operator ::PortableInterceptor::ORBInit
 }
 
 ::PortableInterceptor::ORBInitializer_ptr &
-PortableInterceptor::ORBInitializer_out::ptr (void) // ptr
+PortableInterceptor::ORBInitializer_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4262,9 +5360,8 @@ PortableInterceptor::ORBInitializer_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableInterceptor::ORBInitializer::ORBInitializer (void)
 {}
@@ -4272,7 +5369,15 @@ PortableInterceptor::ORBInitializer::ORBInitializer (void)
 PortableInterceptor::ORBInitializer::~ORBInitializer (void)
 {}
 
-PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_narrow (
+void 
+PortableInterceptor::ORBInitializer::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ORBInitializer *tmp = ACE_static_cast (ORBInitializer *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4280,318 +5385,1183 @@ PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_na
   return ORBInitializer::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer_ptr 
 PortableInterceptor::ORBInitializer::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ORBInitializer::_nil ();
+    {
+      return ORBInitializer::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ORBInitializer_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ORBInitializer::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ORBInitializer::_tao_class_id
+                )
+            )
         );
 }
 
 PortableInterceptor::ORBInitializer_ptr
 PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitializer)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitializer)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableInterceptor::ORBInitializer::_interface_repository_id (void) const
 {
-  return "IDL:PortableInterceptor/ORBInitializer:1.0";
+  return "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0";
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitializer[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  51,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697469), 
+  ACE_NTOHL (0x616c697a), 
+  ACE_NTOHL (0x65723a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitializer:1.0
+    15,
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697469), 
+  ACE_NTOHL (0x616c697a), 
+  ACE_NTOHL (0x65720000),  // name = ORBInitializer
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitializer (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ORBInitializer),
+    (char *) &_oc_PortableInterceptor_ORBInitializer,
+    0,
+    sizeof (PortableInterceptor::ORBInitializer)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ORBInitializer,
+    &_tc_TAO_tc_PortableInterceptor_ORBInitializer
+  )
+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,
+    PortableInterceptor::Interceptor_ptr _tao_elem
+  )
+{
+  PortableInterceptor::Interceptor_ptr _tao_objptr =
+    PortableInterceptor::Interceptor::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::Interceptor_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::Interceptor>::insert (
+      _tao_any,
+      PortableInterceptor::Interceptor::_tao_any_destructor,
+      PortableInterceptor::_tc_Interceptor,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::Interceptor_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::Interceptor>::extract (
+        _tao_any,
+        PortableInterceptor::Interceptor::_tao_any_destructor,
+        PortableInterceptor::_tc_Interceptor,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::Interceptor>::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<PortableInterceptor::Interceptor,PortableInterceptor::Interceptor_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::Interceptor,PortableInterceptor::Interceptor_var>
+  template class TAO_Object_Manager<PortableInterceptor::Interceptor,PortableInterceptor::Interceptor_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::Interceptor>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::Interceptor, PortableInterceptor::Interceptor_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::Interceptor>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const PortableInterceptor::ForwardRequest &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableInterceptor::ForwardRequest &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::insert_copy (
+      _tao_any,
+      PortableInterceptor::ForwardRequest::_tao_any_destructor,
       PortableInterceptor::_tc_ForwardRequest,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::ForwardRequest *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ForwardRequest *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::insert (
+      _tao_any,
+      PortableInterceptor::ForwardRequest::_tao_any_destructor,
       PortableInterceptor::_tc_ForwardRequest,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableInterceptor::ForwardRequest::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableInterceptor::ForwardRequest *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ForwardRequest *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableInterceptor::ForwardRequest*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableInterceptor::ForwardRequest *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableInterceptor::ForwardRequest *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableInterceptor::ForwardRequest *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ForwardRequest ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::extract (
+        _tao_any,
+        PortableInterceptor::ForwardRequest::_tao_any_destructor,
+        PortableInterceptor::_tc_ForwardRequest,
+        _tao_elem
+      );
+}
 
-    if (!result)
-      return 0; // not equivalent
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableInterceptor::ForwardRequest *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      PortableInterceptor::ForwardRequest *tmp;
-      ACE_NEW_RETURN (tmp, PortableInterceptor::ForwardRequest, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:PortableInterceptor/ForwardRequest:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableInterceptor::_tc_ForwardRequest,
-            1,
-            tmp,
-            PortableInterceptor::ForwardRequest::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
-void operator<<= (CORBA::Any &_tao_any, const PortableInterceptor::InvalidSlot &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableInterceptor::InvalidSlot &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::insert_copy (
+      _tao_any,
+      PortableInterceptor::InvalidSlot::_tao_any_destructor,
       PortableInterceptor::_tc_InvalidSlot,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableInterceptor::InvalidSlot *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::InvalidSlot *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::insert (
+      _tao_any,
+      PortableInterceptor::InvalidSlot::_tao_any_destructor,
       PortableInterceptor::_tc_InvalidSlot,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableInterceptor::InvalidSlot::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableInterceptor::InvalidSlot *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::InvalidSlot *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableInterceptor::InvalidSlot*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableInterceptor::InvalidSlot *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableInterceptor::InvalidSlot *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableInterceptor::InvalidSlot *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::extract (
+        _tao_any,
+        PortableInterceptor::InvalidSlot::_tao_any_destructor,
+        PortableInterceptor::_tc_InvalidSlot,
+        _tao_elem
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_InvalidSlot ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (!result)
-      return 0; // not equivalent
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableInterceptor::InvalidSlot *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      PortableInterceptor::InvalidSlot *tmp;
-      ACE_NEW_RETURN (tmp, PortableInterceptor::InvalidSlot, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:PortableInterceptor/InvalidSlot:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableInterceptor::_tc_InvalidSlot,
-            1,
-            tmp,
-            PortableInterceptor::InvalidSlot::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::Current_ptr _tao_elem
+  )
+{
+  PortableInterceptor::Current_ptr _tao_objptr =
+    PortableInterceptor::Current::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::Current_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::Current>::insert (
+      _tao_any,
+      PortableInterceptor::Current::_tao_any_destructor,
+      PortableInterceptor::_tc_Current,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::Current_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::Current>::extract (
+        _tao_any,
+        PortableInterceptor::Current::_tao_any_destructor,
+        PortableInterceptor::_tc_Current,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::Current>::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<PortableInterceptor::Current,PortableInterceptor::Current_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::Current,PortableInterceptor::Current_var>
+  template class TAO_Object_Manager<PortableInterceptor::Current,PortableInterceptor::Current_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::Current>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::Current, PortableInterceptor::Current_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::Current>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableInterceptor::RequestInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::RequestInfo_ptr _tao_objptr =
+    PortableInterceptor::RequestInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::RequestInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::insert (
+      _tao_any,
+      PortableInterceptor::RequestInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_RequestInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::RequestInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::extract (
+        _tao_any,
+        PortableInterceptor::RequestInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_RequestInfo,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::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<PortableInterceptor::RequestInfo,PortableInterceptor::RequestInfo_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::RequestInfo,PortableInterceptor::RequestInfo_var>
+  template class TAO_Object_Manager<PortableInterceptor::RequestInfo,PortableInterceptor::RequestInfo_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::RequestInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::RequestInfo, PortableInterceptor::RequestInfo_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::RequestInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableInterceptor::ClientRequestInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ClientRequestInfo_ptr _tao_objptr =
+    PortableInterceptor::ClientRequestInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::insert (
+      _tao_any,
+      PortableInterceptor::ClientRequestInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_ClientRequestInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::extract (
+        _tao_any,
+        PortableInterceptor::ClientRequestInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_ClientRequestInfo,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::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<PortableInterceptor::ClientRequestInfo,PortableInterceptor::ClientRequestInfo_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInfo,PortableInterceptor::ClientRequestInfo_var>
+  template class TAO_Object_Manager<PortableInterceptor::ClientRequestInfo,PortableInterceptor::ClientRequestInfo_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInfo, PortableInterceptor::ClientRequestInfo_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableInterceptor::ServerRequestInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ServerRequestInfo_ptr _tao_objptr =
+    PortableInterceptor::ServerRequestInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::insert (
+      _tao_any,
+      PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_ServerRequestInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::extract (
+        _tao_any,
+        PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_ServerRequestInfo,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::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<PortableInterceptor::ServerRequestInfo,PortableInterceptor::ServerRequestInfo_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInfo,PortableInterceptor::ServerRequestInfo_var>
+  template class TAO_Object_Manager<PortableInterceptor::ServerRequestInfo,PortableInterceptor::ServerRequestInfo_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInfo, PortableInterceptor::ServerRequestInfo_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableInterceptor::ClientRequestInterceptor_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ClientRequestInterceptor_ptr _tao_objptr =
+    PortableInterceptor::ClientRequestInterceptor::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInterceptor_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::insert (
+      _tao_any,
+      PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor,
+      PortableInterceptor::_tc_ClientRequestInterceptor,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInterceptor_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::extract (
+        _tao_any,
+        PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor,
+        PortableInterceptor::_tc_ClientRequestInterceptor,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::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<PortableInterceptor::ClientRequestInterceptor,PortableInterceptor::ClientRequestInterceptor_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor,PortableInterceptor::ClientRequestInterceptor_var>
+  template class TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor,PortableInterceptor::ClientRequestInterceptor_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor, PortableInterceptor::ClientRequestInterceptor_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableInterceptor::ServerRequestInterceptor_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ServerRequestInterceptor_ptr _tao_objptr =
+    PortableInterceptor::ServerRequestInterceptor::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInterceptor_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::insert (
+      _tao_any,
+      PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor,
+      PortableInterceptor::_tc_ServerRequestInterceptor,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInterceptor_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::extract (
+        _tao_any,
+        PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor,
+        PortableInterceptor::_tc_ServerRequestInterceptor,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::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<PortableInterceptor::ServerRequestInterceptor,PortableInterceptor::ServerRequestInterceptor_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor,PortableInterceptor::ServerRequestInterceptor_var>
+  template class TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor,PortableInterceptor::ServerRequestInterceptor_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor, PortableInterceptor::ServerRequestInterceptor_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableInterceptor::IORInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::IORInfo_ptr _tao_objptr =
+    PortableInterceptor::IORInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::IORInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::IORInfo>::insert (
+      _tao_any,
+      PortableInterceptor::IORInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_IORInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::IORInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::IORInfo>::extract (
+        _tao_any,
+        PortableInterceptor::IORInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_IORInfo,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::IORInfo>::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<PortableInterceptor::IORInfo,PortableInterceptor::IORInfo_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInfo,PortableInterceptor::IORInfo_var>
+  template class TAO_Object_Manager<PortableInterceptor::IORInfo,PortableInterceptor::IORInfo_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::IORInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInfo, PortableInterceptor::IORInfo_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::IORInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableInterceptor::IORInterceptor_ptr _tao_elem
+  )
+{
+  PortableInterceptor::IORInterceptor_ptr _tao_objptr =
+    PortableInterceptor::IORInterceptor::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::IORInterceptor_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::insert (
+      _tao_any,
+      PortableInterceptor::IORInterceptor::_tao_any_destructor,
+      PortableInterceptor::_tc_IORInterceptor,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::IORInterceptor_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::extract (
+        _tao_any,
+        PortableInterceptor::IORInterceptor::_tao_any_destructor,
+        PortableInterceptor::_tc_IORInterceptor,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::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<PortableInterceptor::IORInterceptor,PortableInterceptor::IORInterceptor_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInterceptor,PortableInterceptor::IORInterceptor_var>
+  template class TAO_Object_Manager<PortableInterceptor::IORInterceptor,PortableInterceptor::IORInterceptor_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInterceptor, PortableInterceptor::IORInterceptor_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableInterceptor::PolicyFactory_ptr _tao_elem
+  )
+{
+  PortableInterceptor::PolicyFactory_ptr _tao_objptr =
+    PortableInterceptor::PolicyFactory::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::PolicyFactory_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::insert (
+      _tao_any,
+      PortableInterceptor::PolicyFactory::_tao_any_destructor,
+      PortableInterceptor::_tc_PolicyFactory,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::PolicyFactory_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::extract (
+        _tao_any,
+        PortableInterceptor::PolicyFactory::_tao_any_destructor,
+        PortableInterceptor::_tc_PolicyFactory,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::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<PortableInterceptor::PolicyFactory,PortableInterceptor::PolicyFactory_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::PolicyFactory,PortableInterceptor::PolicyFactory_var>
+  template class TAO_Object_Manager<PortableInterceptor::PolicyFactory,PortableInterceptor::PolicyFactory_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::PolicyFactory, PortableInterceptor::PolicyFactory_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableInterceptor::ORBInitInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ORBInitInfo_ptr _tao_objptr =
+    PortableInterceptor::ORBInitInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::insert (
+      _tao_any,
+      PortableInterceptor::ORBInitInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_ORBInitInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::extract (
+        _tao_any,
+        PortableInterceptor::ORBInitInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_ORBInitInfo,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::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<PortableInterceptor::ORBInitInfo,PortableInterceptor::ORBInitInfo_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitInfo,PortableInterceptor::ORBInitInfo_var>
+  template class TAO_Object_Manager<PortableInterceptor::ORBInitInfo,PortableInterceptor::ORBInitInfo_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitInfo, PortableInterceptor::ORBInitInfo_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableInterceptor::ORBInitializer_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ORBInitializer_ptr _tao_objptr =
+    PortableInterceptor::ORBInitializer::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitializer_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::insert (
+      _tao_any,
+      PortableInterceptor::ORBInitializer::_tao_any_destructor,
+      PortableInterceptor::_tc_ORBInitializer,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitializer_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::extract (
+        _tao_any,
+        PortableInterceptor::ORBInitializer::_tao_any_destructor,
+        PortableInterceptor::_tc_ORBInitializer,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::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<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var>
+  template class TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var>;
+  template class TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer, PortableInterceptor::ORBInitializer_var>
+# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::Interceptor>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::Current>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::Current>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::IORInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::IORInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index c3fcee94899..35fa933d859 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
 #define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
 
@@ -60,42 +63,50 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  PortableInterceptor
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___PTR_CH_
-
+  
   class Interceptor;
   typedef Interceptor *Interceptor_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export Interceptor_var : public TAO_Base_var
   {
   public:
     Interceptor_var (void); // default constructor
-    Interceptor_var (Interceptor_ptr p) : ptr_ (p) {}
+    Interceptor_var (Interceptor_ptr p) : ptr_ (p) {} 
     Interceptor_var (const Interceptor_var &); // copy constructor
     ~Interceptor_var (void); // destructor
-
+    
     Interceptor_var &operator= (Interceptor_ptr);
     Interceptor_var &operator= (const Interceptor_var &);
     Interceptor_ptr operator-> (void) const;
-
+    
     operator const Interceptor_ptr &() const;
     operator Interceptor_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Interceptor_ptr in (void) const;
     Interceptor_ptr &inout (void);
     Interceptor_ptr &out (void);
     Interceptor_ptr _retn (void);
     Interceptor_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Interceptor_ptr tao_duplicate (Interceptor_ptr);
@@ -106,7 +117,7 @@ TAO_NAMESPACE  PortableInterceptor
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Interceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -114,13 +125,14 @@ TAO_NAMESPACE  PortableInterceptor
     Interceptor_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export Interceptor_out
   {
   public:
@@ -133,98 +145,111 @@ TAO_NAMESPACE  PortableInterceptor
     operator Interceptor_ptr &();
     Interceptor_ptr &ptr (void);
     Interceptor_ptr operator-> (void);
-
+  
   private:
     Interceptor_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_
-
+  
   class TAO_Export Interceptor
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Interceptor_ptr _ptr_type;
     typedef Interceptor_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static Interceptor_ptr _duplicate (Interceptor_ptr obj);
-
+    
     static Interceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Interceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Interceptor_ptr _nil (void)
       {
         return (Interceptor_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * name (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     Interceptor (void);
-
     virtual ~Interceptor (void);
-
+    
   private:
     Interceptor (const Interceptor &);
     void operator= (const Interceptor &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_Interceptor;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_)
 #define _PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_
-
+  
   class TAO_Export ForwardRequest : public CORBA::UserException
   {
   public:
+    
     CORBA::Object_var forward;
     CORBA::Boolean permanent;
-
     ForwardRequest (void);
     ForwardRequest (const ForwardRequest &);
     ~ForwardRequest (void);
 
     ForwardRequest &operator= (const ForwardRequest &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static ForwardRequest *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -236,61 +261,108 @@ TAO_NAMESPACE  PortableInterceptor
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-        ForwardRequest (
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+    
+    ForwardRequest (
         const CORBA::Object_ptr  _tao_forward,
         CORBA::Boolean _tao_permanent
       );
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
-
+  
+  // 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_ForwardRequest;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short ReplyStatus;
   typedef CORBA::Short_out ReplyStatus_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_ReplyStatus;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SUCCESSFUL;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYSTEM_EXCEPTION;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short USER_EXCEPTION;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short LOCATION_FORWARD;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short LOCATION_FORWARD_PERMANENT;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short TRANSPORT_RETRY;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SUCCESSFUL = 0;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SYSTEM_EXCEPTION = 1;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short USER_EXCEPTION = 2;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short LOCATION_FORWARD = 3;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short LOCATION_FORWARD_PERMANENT = 4;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short TRANSPORT_RETRY = 5;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short UNKNOWN = 6;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::ULong SlotId;
   typedef CORBA::ULong_out SlotId_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_SlotId;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_INVALIDSLOT_CH_)
 #define _PORTABLEINTERCEPTOR_INVALIDSLOT_CH_
-
+  
   class TAO_Export InvalidSlot : public CORBA::UserException
   {
   public:
-
+    
     InvalidSlot (void);
     InvalidSlot (const InvalidSlot &);
     ~InvalidSlot (void);
 
     InvalidSlot &operator= (const InvalidSlot &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static InvalidSlot *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -302,55 +374,63 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
-
+  
+  // 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_InvalidSlot;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT___PTR_CH_
-
+  
   class Current;
   typedef Current *Current_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export Current_var : public TAO_Base_var
   {
   public:
     Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -361,7 +441,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Current_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -369,13 +449,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     Current_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export Current_out
   {
   public:
@@ -388,47 +469,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator Current_ptr &();
     Current_ptr &ptr (void);
     Current_ptr operator-> (void);
-
+  
   private:
     Current_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT_CH_
-
+  
   class TAO_Export Current
     : public virtual CORBA::Current
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * get_slot (
         PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -437,7 +521,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_slot (
         PortableInterceptor::SlotId id,
         const CORBA::Any & data
@@ -447,58 +534,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     Current (void);
-
     virtual ~Current (void);
-
+    
   private:
     Current (const Current &);
     void operator= (const Current &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___PTR_CH_
-
+  
   class RequestInfo;
   typedef RequestInfo *RequestInfo_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export RequestInfo_var : public TAO_Base_var
   {
   public:
     RequestInfo_var (void); // default constructor
-    RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {}
+    RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {} 
     RequestInfo_var (const RequestInfo_var &); // copy constructor
     ~RequestInfo_var (void); // destructor
-
+    
     RequestInfo_var &operator= (RequestInfo_ptr);
     RequestInfo_var &operator= (const RequestInfo_var &);
     RequestInfo_ptr operator-> (void) const;
-
+    
     operator const RequestInfo_ptr &() const;
     operator RequestInfo_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     RequestInfo_ptr in (void) const;
     RequestInfo_ptr &inout (void);
     RequestInfo_ptr &out (void);
     RequestInfo_ptr _retn (void);
     RequestInfo_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static RequestInfo_ptr tao_duplicate (RequestInfo_ptr);
@@ -509,7 +607,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     RequestInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -517,13 +615,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     RequestInfo_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export RequestInfo_out
   {
   public:
@@ -536,137 +635,160 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator RequestInfo_ptr &();
     RequestInfo_ptr &ptr (void);
     RequestInfo_ptr operator-> (void);
-
+  
   private:
     RequestInfo_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
-
+  
   class TAO_Export RequestInfo
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef RequestInfo_ptr _ptr_type;
     typedef RequestInfo_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
-
+    
     static RequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestInfo_ptr _nil (void)
       {
         return (RequestInfo_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong request_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * operation (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::Dynamic::ParameterList * arguments (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::Dynamic::ExceptionList * exceptions (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::Dynamic::ContextList * contexts (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::Dynamic::RequestContext * operation_context (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * result (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean response_expected (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-#if TAO_HAS_CORBA_MESSAGING == 1
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual Messaging::SyncScope sync_scope (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual PortableInterceptor::ReplyStatus reply_status (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr forward_reference (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * get_slot (
         PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -675,7 +797,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::ServiceContext * get_request_service_context (
         IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -683,7 +808,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::ServiceContext * get_reply_service_context (
         IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -691,58 +819,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     RequestInfo (void);
-
     virtual ~RequestInfo (void);
-
+    
   private:
     RequestInfo (const RequestInfo &);
     void operator= (const RequestInfo &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_RequestInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___PTR_CH_
-
+  
   class ClientRequestInfo;
   typedef ClientRequestInfo *ClientRequestInfo_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ClientRequestInfo_var : public TAO_Base_var
   {
   public:
     ClientRequestInfo_var (void); // default constructor
-    ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {}
+    ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {} 
     ClientRequestInfo_var (const ClientRequestInfo_var &); // copy constructor
     ~ClientRequestInfo_var (void); // destructor
-
+    
     ClientRequestInfo_var &operator= (ClientRequestInfo_ptr);
     ClientRequestInfo_var &operator= (const ClientRequestInfo_var &);
     ClientRequestInfo_ptr operator-> (void) const;
-
+    
     operator const ClientRequestInfo_ptr &() const;
     operator ClientRequestInfo_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ClientRequestInfo_ptr in (void) const;
     ClientRequestInfo_ptr &inout (void);
     ClientRequestInfo_ptr &out (void);
     ClientRequestInfo_ptr _retn (void);
     ClientRequestInfo_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ClientRequestInfo_ptr tao_duplicate (ClientRequestInfo_ptr);
@@ -753,7 +892,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ClientRequestInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -761,13 +900,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     ClientRequestInfo_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ClientRequestInfo_out
   {
   public:
@@ -780,87 +920,100 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ClientRequestInfo_ptr &();
     ClientRequestInfo_ptr &ptr (void);
     ClientRequestInfo_ptr operator-> (void);
-
+  
   private:
     ClientRequestInfo_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
-
+  
   class TAO_Export ClientRequestInfo
     : public virtual PortableInterceptor::RequestInfo
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ClientRequestInfo_ptr _ptr_type;
     typedef ClientRequestInfo_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
-
+    
     static ClientRequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInfo_ptr _nil (void)
       {
         return (ClientRequestInfo_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr target (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr effective_target (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::TaggedProfile * effective_profile (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * received_exception (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * received_exception_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::TaggedComponent * get_effective_component (
         IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -868,7 +1021,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::TaggedComponentSeq * get_effective_components (
         IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -876,7 +1032,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr get_request_policy (
         CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -884,7 +1043,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_request_service_context (
         const IOP::ServiceContext & service_context,
         CORBA::Boolean replace
@@ -893,58 +1055,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ClientRequestInfo (void);
-
     virtual ~ClientRequestInfo (void);
-
+    
   private:
     ClientRequestInfo (const ClientRequestInfo &);
     void operator= (const ClientRequestInfo &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ClientRequestInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___PTR_CH_
-
+  
   class ServerRequestInfo;
   typedef ServerRequestInfo *ServerRequestInfo_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ServerRequestInfo_var : public TAO_Base_var
   {
   public:
     ServerRequestInfo_var (void); // default constructor
-    ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {}
+    ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {} 
     ServerRequestInfo_var (const ServerRequestInfo_var &); // copy constructor
     ~ServerRequestInfo_var (void); // destructor
-
+    
     ServerRequestInfo_var &operator= (ServerRequestInfo_ptr);
     ServerRequestInfo_var &operator= (const ServerRequestInfo_var &);
     ServerRequestInfo_ptr operator-> (void) const;
-
+    
     operator const ServerRequestInfo_ptr &() const;
     operator ServerRequestInfo_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServerRequestInfo_ptr in (void) const;
     ServerRequestInfo_ptr &inout (void);
     ServerRequestInfo_ptr &out (void);
     ServerRequestInfo_ptr _retn (void);
     ServerRequestInfo_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerRequestInfo_ptr tao_duplicate (ServerRequestInfo_ptr);
@@ -955,7 +1128,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServerRequestInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -963,13 +1136,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     ServerRequestInfo_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ServerRequestInfo_out
   {
   public:
@@ -982,103 +1156,120 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ServerRequestInfo_ptr &();
     ServerRequestInfo_ptr &ptr (void);
     ServerRequestInfo_ptr operator-> (void);
-
+  
   private:
     ServerRequestInfo_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
-
+  
   class TAO_Export ServerRequestInfo
     : public virtual PortableInterceptor::RequestInfo
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServerRequestInfo_ptr _ptr_type;
     typedef ServerRequestInfo_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj);
-
+    
     static ServerRequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInfo_ptr _nil (void)
       {
         return (ServerRequestInfo_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Any * sending_exception (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * server_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * orb_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableInterceptor::AdapterName * adapter_name (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::OctetSeq * object_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::OctetSeq * adapter_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * target_most_derived_interface (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr get_server_policy (
         CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1086,7 +1277,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_slot (
         PortableInterceptor::SlotId id,
         const CORBA::Any & data
@@ -1096,7 +1290,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean target_is_a (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1104,7 +1301,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_reply_service_context (
         const IOP::ServiceContext & service_context,
         CORBA::Boolean replace
@@ -1113,58 +1313,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ServerRequestInfo (void);
-
     virtual ~ServerRequestInfo (void);
-
+    
   private:
     ServerRequestInfo (const ServerRequestInfo &);
     void operator= (const ServerRequestInfo &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ServerRequestInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___PTR_CH_
-
+  
   class ClientRequestInterceptor;
   typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ClientRequestInterceptor_var : public TAO_Base_var
   {
   public:
     ClientRequestInterceptor_var (void); // default constructor
-    ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {}
+    ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {} 
     ClientRequestInterceptor_var (const ClientRequestInterceptor_var &); // copy constructor
     ~ClientRequestInterceptor_var (void); // destructor
-
+    
     ClientRequestInterceptor_var &operator= (ClientRequestInterceptor_ptr);
     ClientRequestInterceptor_var &operator= (const ClientRequestInterceptor_var &);
     ClientRequestInterceptor_ptr operator-> (void) const;
-
+    
     operator const ClientRequestInterceptor_ptr &() const;
     operator ClientRequestInterceptor_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ClientRequestInterceptor_ptr in (void) const;
     ClientRequestInterceptor_ptr &inout (void);
     ClientRequestInterceptor_ptr &out (void);
     ClientRequestInterceptor_ptr _retn (void);
     ClientRequestInterceptor_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ClientRequestInterceptor_ptr tao_duplicate (ClientRequestInterceptor_ptr);
@@ -1175,7 +1386,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ClientRequestInterceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1183,13 +1394,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     ClientRequestInterceptor_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ClientRequestInterceptor_out
   {
   public:
@@ -1202,47 +1414,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ClientRequestInterceptor_ptr &();
     ClientRequestInterceptor_ptr &ptr (void);
     ClientRequestInterceptor_ptr operator-> (void);
-
+  
   private:
     ClientRequestInterceptor_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_
-
+  
   class TAO_Export ClientRequestInterceptor
     : public virtual PortableInterceptor::Interceptor
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ClientRequestInterceptor_ptr _ptr_type;
     typedef ClientRequestInterceptor_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj);
-
+    
     static ClientRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInterceptor_ptr _nil (void)
       {
         return (ClientRequestInterceptor_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_request (
         PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1251,7 +1466,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_poll (
         PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1259,7 +1477,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void receive_reply (
         PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1267,7 +1488,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void receive_exception (
         PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1276,7 +1500,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void receive_other (
         PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1285,58 +1512,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ClientRequestInterceptor (void);
-
     virtual ~ClientRequestInterceptor (void);
-
+    
   private:
     ClientRequestInterceptor (const ClientRequestInterceptor &);
     void operator= (const ClientRequestInterceptor &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ClientRequestInterceptor;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___PTR_CH_
-
+  
   class ServerRequestInterceptor;
   typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ServerRequestInterceptor_var : public TAO_Base_var
   {
   public:
     ServerRequestInterceptor_var (void); // default constructor
-    ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {}
+    ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {} 
     ServerRequestInterceptor_var (const ServerRequestInterceptor_var &); // copy constructor
     ~ServerRequestInterceptor_var (void); // destructor
-
+    
     ServerRequestInterceptor_var &operator= (ServerRequestInterceptor_ptr);
     ServerRequestInterceptor_var &operator= (const ServerRequestInterceptor_var &);
     ServerRequestInterceptor_ptr operator-> (void) const;
-
+    
     operator const ServerRequestInterceptor_ptr &() const;
     operator ServerRequestInterceptor_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServerRequestInterceptor_ptr in (void) const;
     ServerRequestInterceptor_ptr &inout (void);
     ServerRequestInterceptor_ptr &out (void);
     ServerRequestInterceptor_ptr _retn (void);
     ServerRequestInterceptor_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerRequestInterceptor_ptr tao_duplicate (ServerRequestInterceptor_ptr);
@@ -1347,7 +1585,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServerRequestInterceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1355,13 +1593,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     ServerRequestInterceptor_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ServerRequestInterceptor_out
   {
   public:
@@ -1374,47 +1613,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ServerRequestInterceptor_ptr &();
     ServerRequestInterceptor_ptr &ptr (void);
     ServerRequestInterceptor_ptr operator-> (void);
-
+  
   private:
     ServerRequestInterceptor_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_
-
+  
   class TAO_Export ServerRequestInterceptor
     : public virtual PortableInterceptor::Interceptor
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServerRequestInterceptor_ptr _ptr_type;
     typedef ServerRequestInterceptor_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj);
-
+    
     static ServerRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInterceptor_ptr _nil (void)
       {
         return (ServerRequestInterceptor_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1423,7 +1665,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void receive_request (
         PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1432,7 +1677,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_reply (
         PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1440,7 +1688,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_exception (
         PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1449,7 +1700,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1458,58 +1712,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ServerRequestInterceptor (void);
-
     virtual ~ServerRequestInterceptor (void);
-
+    
   private:
     ServerRequestInterceptor (const ServerRequestInterceptor &);
     void operator= (const ServerRequestInterceptor &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ServerRequestInterceptor;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO___PTR_CH_
-
+  
   class IORInfo;
   typedef IORInfo *IORInfo_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export IORInfo_var : public TAO_Base_var
   {
   public:
     IORInfo_var (void); // default constructor
-    IORInfo_var (IORInfo_ptr p) : ptr_ (p) {}
+    IORInfo_var (IORInfo_ptr p) : ptr_ (p) {} 
     IORInfo_var (const IORInfo_var &); // copy constructor
     ~IORInfo_var (void); // destructor
-
+    
     IORInfo_var &operator= (IORInfo_ptr);
     IORInfo_var &operator= (const IORInfo_var &);
     IORInfo_ptr operator-> (void) const;
-
+    
     operator const IORInfo_ptr &() const;
     operator IORInfo_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     IORInfo_ptr in (void) const;
     IORInfo_ptr &inout (void);
     IORInfo_ptr &out (void);
     IORInfo_ptr _retn (void);
     IORInfo_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static IORInfo_ptr tao_duplicate (IORInfo_ptr);
@@ -1520,7 +1785,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     IORInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1528,13 +1793,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     IORInfo_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export IORInfo_out
   {
   public:
@@ -1547,47 +1813,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator IORInfo_ptr &();
     IORInfo_ptr &ptr (void);
     IORInfo_ptr operator-> (void);
-
+  
   private:
     IORInfo_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO_CH_
-
+  
   class TAO_Export IORInfo
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IORInfo_ptr _ptr_type;
     typedef IORInfo_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static IORInfo_ptr _duplicate (IORInfo_ptr obj);
-
+    
     static IORInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInfo_ptr _nil (void)
       {
         return (IORInfo_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr get_effective_policy (
         CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1595,56 +1864,73 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_ior_component (
-        const IOP::TaggedComponent & component
+        const IOP::TaggedComponent & a_component
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_ior_component_to_profile (
-        const IOP::TaggedComponent & component,
+        const IOP::TaggedComponent & a_component,
         IOP::ProfileId profile_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual PortableInterceptor::AdapterManagerId manager_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual PortableInterceptor::AdapterState state (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void current_factory (
         PortableInterceptor::ObjectReferenceFactory * current_factory
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1652,58 +1938,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     IORInfo (void);
-
     virtual ~IORInfo (void);
-
+    
   private:
     IORInfo (const IORInfo &);
     void operator= (const IORInfo &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_IORInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___PTR_CH_
-
+  
   class IORInterceptor;
   typedef IORInterceptor *IORInterceptor_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export IORInterceptor_var : public TAO_Base_var
   {
   public:
     IORInterceptor_var (void); // default constructor
-    IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {}
+    IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {} 
     IORInterceptor_var (const IORInterceptor_var &); // copy constructor
     ~IORInterceptor_var (void); // destructor
-
+    
     IORInterceptor_var &operator= (IORInterceptor_ptr);
     IORInterceptor_var &operator= (const IORInterceptor_var &);
     IORInterceptor_ptr operator-> (void) const;
-
+    
     operator const IORInterceptor_ptr &() const;
     operator IORInterceptor_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     IORInterceptor_ptr in (void) const;
     IORInterceptor_ptr &inout (void);
     IORInterceptor_ptr &out (void);
     IORInterceptor_ptr _retn (void);
     IORInterceptor_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static IORInterceptor_ptr tao_duplicate (IORInterceptor_ptr);
@@ -1714,7 +2011,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     IORInterceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1722,13 +2019,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     IORInterceptor_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export IORInterceptor_out
   {
   public:
@@ -1741,47 +2039,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator IORInterceptor_ptr &();
     IORInterceptor_ptr &ptr (void);
     IORInterceptor_ptr operator-> (void);
-
+  
   private:
     IORInterceptor_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_
-
+  
   class TAO_Export IORInterceptor
     : public virtual PortableInterceptor::Interceptor
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IORInterceptor_ptr _ptr_type;
     typedef IORInterceptor_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj);
-
+    
     static IORInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInterceptor_ptr _nil (void)
       {
         return (IORInterceptor_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void establish_components (
         PortableInterceptor::IORInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1789,7 +2090,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void components_established (
         PortableInterceptor::IORInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1797,7 +2101,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void adapter_manager_state_changed (
         PortableInterceptor::AdapterManagerId id,
         PortableInterceptor::AdapterState state
@@ -1806,7 +2113,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void adapter_state_changed (
         const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
         PortableInterceptor::AdapterState state
@@ -1815,58 +2125,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     IORInterceptor (void);
-
     virtual ~IORInterceptor (void);
-
+    
   private:
     IORInterceptor (const IORInterceptor &);
     void operator= (const IORInterceptor &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_IORInterceptor;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___PTR_CH_
-
+  
   class PolicyFactory;
   typedef PolicyFactory *PolicyFactory_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export PolicyFactory_var : public TAO_Base_var
   {
   public:
     PolicyFactory_var (void); // default constructor
-    PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {}
+    PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {} 
     PolicyFactory_var (const PolicyFactory_var &); // copy constructor
     ~PolicyFactory_var (void); // destructor
-
+    
     PolicyFactory_var &operator= (PolicyFactory_ptr);
     PolicyFactory_var &operator= (const PolicyFactory_var &);
     PolicyFactory_ptr operator-> (void) const;
-
+    
     operator const PolicyFactory_ptr &() const;
     operator PolicyFactory_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     PolicyFactory_ptr in (void) const;
     PolicyFactory_ptr &inout (void);
     PolicyFactory_ptr &out (void);
     PolicyFactory_ptr _retn (void);
     PolicyFactory_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static PolicyFactory_ptr tao_duplicate (PolicyFactory_ptr);
@@ -1877,7 +2198,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     PolicyFactory_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1885,13 +2206,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     PolicyFactory_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export PolicyFactory_out
   {
   public:
@@ -1904,47 +2226,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator PolicyFactory_ptr &();
     PolicyFactory_ptr &ptr (void);
     PolicyFactory_ptr operator-> (void);
-
+  
   private:
     PolicyFactory_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
-
+  
   class TAO_Export PolicyFactory
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PolicyFactory_ptr _ptr_type;
     typedef PolicyFactory_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj);
-
+    
     static PolicyFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyFactory_ptr _nil (void)
       {
         return (PolicyFactory_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr create_policy (
         CORBA::PolicyType type,
         const CORBA::Any & value
@@ -1955,6 +2280,8 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         , CORBA::PolicyError
       )) = 0;
 
+    // Hand-crafted addition.
+    
     virtual ::CORBA::Policy_ptr _create_policy (
         CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1964,57 +2291,68 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         , CORBA::PolicyError
       ));
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     PolicyFactory (void);
-
     virtual ~PolicyFactory (void);
-
+    
   private:
     PolicyFactory (const PolicyFactory &);
     void operator= (const PolicyFactory &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_PolicyFactory;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___PTR_CH_
-
+  
   class ORBInitInfo;
   typedef ORBInitInfo *ORBInitInfo_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ORBInitInfo_var : public TAO_Base_var
   {
   public:
     ORBInitInfo_var (void); // default constructor
-    ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {}
+    ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {} 
     ORBInitInfo_var (const ORBInitInfo_var &); // copy constructor
     ~ORBInitInfo_var (void); // destructor
-
+    
     ORBInitInfo_var &operator= (ORBInitInfo_ptr);
     ORBInitInfo_var &operator= (const ORBInitInfo_var &);
     ORBInitInfo_ptr operator-> (void) const;
-
+    
     operator const ORBInitInfo_ptr &() const;
     operator ORBInitInfo_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ORBInitInfo_ptr in (void) const;
     ORBInitInfo_ptr &inout (void);
     ORBInitInfo_ptr &out (void);
     ORBInitInfo_ptr _retn (void);
     ORBInitInfo_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ORBInitInfo_ptr tao_duplicate (ORBInitInfo_ptr);
@@ -2025,7 +2363,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ORBInitInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2033,13 +2371,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     ORBInitInfo_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ORBInitInfo_out
   {
   public:
@@ -2052,65 +2391,78 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ORBInitInfo_ptr &();
     ORBInitInfo_ptr &ptr (void);
     ORBInitInfo_ptr operator-> (void);
-
+  
   private:
     ORBInitInfo_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_
-
+  
   class TAO_Export ORBInitInfo
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ORBInitInfo_ptr _ptr_type;
     typedef ORBInitInfo_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj);
-
+    
     static ORBInitInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ORBInitInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ORBInitInfo_ptr _nil (void)
       {
         return (ORBInitInfo_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
+    
     typedef char * ObjectId;
     typedef CORBA::String_var ObjectId_var;
     typedef CORBA::String_out ObjectId_out;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_ObjectId;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_
-
+    
     class TAO_Export DuplicateName : public CORBA::UserException
     {
     public:
+      
       TAO_String_Manager name;
-
       DuplicateName (void);
       DuplicateName (const DuplicateName &);
       ~DuplicateName (void);
 
       DuplicateName &operator= (const DuplicateName &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static DuplicateName *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2122,35 +2474,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-            DuplicateName (
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+      
+      DuplicateName (
           const char * _tao_name
         );
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_DuplicateName;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_
-
+    
     class TAO_Export InvalidName : public CORBA::UserException
     {
     public:
-
+      
       InvalidName (void);
       InvalidName (const InvalidName &);
       ~InvalidName (void);
 
       InvalidName &operator= (const InvalidName &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static InvalidName *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2162,42 +2529,58 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_InvalidName;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::StringSeq * arguments (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * orb_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::IOP::CodecFactory_ptr codec_factory (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void register_initial_reference (
         const char * id,
         CORBA::Object_ptr obj
@@ -2207,7 +2590,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ORBInitInfo::InvalidName
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr resolve_initial_references (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2216,7 +2602,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ORBInitInfo::InvalidName
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_client_request_interceptor (
         PortableInterceptor::ClientRequestInterceptor_ptr interceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2225,7 +2614,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_server_request_interceptor (
         PortableInterceptor::ServerRequestInterceptor_ptr interceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2234,7 +2626,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_ior_interceptor (
         PortableInterceptor::IORInterceptor_ptr interceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2243,15 +2638,20 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         CORBA::SystemException
         , PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual PortableInterceptor::SlotId allocate_slot_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void register_policy_factory (
         CORBA::PolicyType type,
         PortableInterceptor::PolicyFactory_ptr policy_factory
@@ -2260,64 +2660,77 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ORBInitInfo (void);
-
     virtual ~ORBInitInfo (void);
-
+    
   private:
     ORBInitInfo (const ORBInitInfo &);
     void operator= (const ORBInitInfo &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ORBInitInfo;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___PTR_CH_
-
+  
   class ORBInitializer;
   typedef ORBInitializer *ORBInitializer_ptr;
 
+  /// Hand-crafted addition.   
   /// Register an ORBInitializer with the global ORBInitializer
   /// table.
   TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
       ORBInitializer_ptr init
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+    );
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export ORBInitializer_var : public TAO_Base_var
   {
   public:
     ORBInitializer_var (void); // default constructor
-    ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {}
+    ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {} 
     ORBInitializer_var (const ORBInitializer_var &); // copy constructor
     ~ORBInitializer_var (void); // destructor
-
+    
     ORBInitializer_var &operator= (ORBInitializer_ptr);
     ORBInitializer_var &operator= (const ORBInitializer_var &);
     ORBInitializer_ptr operator-> (void) const;
-
+    
     operator const ORBInitializer_ptr &() const;
     operator ORBInitializer_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ORBInitializer_ptr in (void) const;
     ORBInitializer_ptr &inout (void);
     ORBInitializer_ptr &out (void);
     ORBInitializer_ptr _retn (void);
     ORBInitializer_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ORBInitializer_ptr tao_duplicate (ORBInitializer_ptr);
@@ -2328,7 +2741,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ORBInitializer_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2336,13 +2749,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     ORBInitializer_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export ORBInitializer_out
   {
   public:
@@ -2355,47 +2769,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ORBInitializer_ptr &();
     ORBInitializer_ptr &ptr (void);
     ORBInitializer_ptr operator-> (void);
-
+  
   private:
     ORBInitializer_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_
-
+  
   class TAO_Export ORBInitializer
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ORBInitializer_ptr _ptr_type;
     typedef ORBInitializer_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj);
-
+    
     static ORBInitializer_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ORBInitializer_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ORBInitializer_ptr _nil (void)
       {
         return (ORBInitializer_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void pre_init (
         PortableInterceptor::ORBInitInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2403,7 +2820,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void post_init (
         PortableInterceptor::ORBInitInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2411,58 +2831,177 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ORBInitializer (void);
-
     virtual ~ORBInitializer (void);
-
+    
   private:
     ORBInitializer (const ORBInitializer &);
     void operator= (const ORBInitializer &);
   };
 
-
 #endif /* end #if !defined */
+  
+  // 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_ORBInitializer;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module PortableInterceptor
 
-TAO_NAMESPACE  OBV_PortableInterceptor
-{
-}
-TAO_NAMESPACE_CLOSE
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_NAMESPACE  OBV_Messaging
-{
-}
-TAO_NAMESPACE_CLOSE
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Interceptor_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ForwardRequest &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ForwardRequest*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ForwardRequest *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ForwardRequest *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::InvalidSlot &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::InvalidSlot*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::InvalidSlot *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::InvalidSlot *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Current_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::RequestInfo_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInfo_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInfo_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::IORInfo_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInterceptor_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInterceptor_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::IORInterceptor_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::PolicyFactory_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitializer_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ForwardRequest &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ForwardRequest &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::InvalidSlot &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::InvalidSlot &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "PortableInterceptorC.i"
@@ -2478,3 +3017,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::Inval
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableInterceptorC.i b/TAO/tao/PortableInterceptorC.i
index 0874ea77d99..b1528e1d8f8 100644
--- a/TAO/tao/PortableInterceptorC.i
+++ b/TAO/tao/PortableInterceptorC.i
@@ -20,145 +20,262 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception PortableInterceptor::ForwardRequest
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableInterceptor::InvalidSlot
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___CI_)
 #define _PORTABLEINTERCEPTOR_CURRENT___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___CI_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO___CI_)
 #define _PORTABLEINTERCEPTOR_IORINFO___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___CI_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception PortableInterceptor::ORBInitInfo::DuplicateName
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableInterceptor::ORBInitInfo::InvalidName
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___CI_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableInterceptor::ForwardRequest &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const PortableInterceptor::ForwardRequest &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-  {
-    // now marshal the members (if any)
-    if (
-      (strm << _tao_aggregate.forward.in ()) &&
-      (strm << CORBA::Any::from_boolean (_tao_aggregate.permanent))
-    )
-      return 1;
-    else
-      return 0;
-  }
+    {
+      // Now marshal the members (if any).
+      if (
+        (strm << _tao_aggregate.forward.in ()) &&
+        (strm << CORBA::Any::from_boolean (_tao_aggregate.permanent))
+       )
+        {
+          return 1;
+        }
+      else
+        {
+          return 0;
+        }
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableInterceptor::ForwardRequest &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    PortableInterceptor::ForwardRequest &_tao_aggregate
+  )
 {
-  // now marshal the members
+  // Demarshal the members.
   if (
     (strm >> _tao_aggregate.forward.out ()) &&
     (strm >> CORBA::Any::to_boolean (_tao_aggregate.permanent))
   )
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableInterceptor::InvalidSlot &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const PortableInterceptor::InvalidSlot &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,PortableInterceptor::InvalidSlot&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    PortableInterceptor::InvalidSlot&
+  )
 {
   return 1;
 }
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
index 11c0f2c28e7..d1941884fd2 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -10,7 +10,7 @@ TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void)
 }
 
 int
-TAO_Default_Acceptor_Filter::fill_profile (const TAO_ObjectKey &object_key,
+TAO_Default_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key,
                                            TAO_MProfile &mprofile,
                                            TAO_Acceptor **acceptors_begin,
                                            TAO_Acceptor **acceptors_end,
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
index 3b46c48a4f0..91a47a64fb4 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
@@ -50,7 +50,7 @@ public:
   TAO_Default_Acceptor_Filter (void);
 
   /// Populate <mprofile> with all available endpoints.
-  int fill_profile (const TAO_ObjectKey &object_key,
+  int fill_profile (const TAO::ObjectKey &object_key,
                     TAO_MProfile &mprofile,
                     TAO_Acceptor **acceptors_begin,
                     TAO_Acceptor **acceptors_end,
diff --git a/TAO/tao/PortableServer/Default_ORT.pidl b/TAO/tao/PortableServer/Default_ORT.pidl
index 9150a33028f..365933d6c21 100644
--- a/TAO/tao/PortableServer/Default_ORT.pidl
+++ b/TAO/tao/PortableServer/Default_ORT.pidl
@@ -10,7 +10,7 @@
  * command:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        Default_ORT.pidl
diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp
index f1dcf238e9e..1914b77bd82 100644
--- a/TAO/tao/PortableServer/Default_ORTC.cpp
+++ b/TAO/tao/PortableServer/Default_ORTC.cpp
@@ -19,13 +19,13 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:315
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
 #include "Default_ORTC.h"
 
-#include "tao/Any.h"
+#include "tao/Any_T.h"
 #include "tao/ValueFactory.h"
 
 #if defined (__BORLANDC__)
@@ -36,38 +36,39 @@
 #include "Default_ORTC.i"
 #endif /* !defined INLINE */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceTemplate[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x44656661),
-  ACE_NTOHL (0x756c745f),
-  ACE_NTOHL (0x4f52542f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x6174653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0
-  24,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  56,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x44656661), 
+  ACE_NTOHL (0x756c745f), 
+  ACE_NTOHL (0x4f52542f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x6174653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/TAO_Default_ORT/ObjectReferenceTemplate:1.0
+    24,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
   ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
-  0, // value modifier
+    0, // value modifier
   CORBA::tk_null, // no stateful base valuetype
 
-  0, // member count
-};
+0, // member count
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate (
     CORBA::tk_value,
@@ -86,9 +87,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_cs.cpp:95
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95
 
 void
 tao_TAO_Default_ORT_ObjectReferenceTemplate_add_ref (
@@ -107,7 +107,7 @@ tao_TAO_Default_ORT_ObjectReferenceTemplate_remove_ref (
 }
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:299
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298
 
 // *************************************************************
 // Operations for class TAO_Default_ORT::ObjectReferenceTemplate_var
@@ -160,11 +160,16 @@ TAO_Default_ORT::ObjectReferenceTemplate_var::operator= (const ObjectReferenceTe
     CORBA::add_ref (tmp);
     this->ptr_ = tmp;
   }
-
+  
   return *this;
 }
 
-TAO_Default_ORT::ObjectReferenceTemplate_var::operator TAO_Default_ORT::ObjectReferenceTemplate*& () // cast
+TAO_Default_ORT::ObjectReferenceTemplate_var::operator const TAO_Default_ORT::ObjectReferenceTemplate* () const // cast
+{
+  return this->ptr_;
+}
+
+TAO_Default_ORT::ObjectReferenceTemplate_var::operator TAO_Default_ORT::ObjectReferenceTemplate*& () // cast 
 {
   return this->ptr_;
 }
@@ -221,7 +226,7 @@ TAO_Default_ORT::ObjectReferenceTemplate_var::tao_remove_ref (
 }
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:569
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568
 
 // *************************************************************
 // Operations for class TAO_Default_ORT::ObjectReferenceTemplate_out
@@ -287,7 +292,7 @@ TAO_Default_ORT::ObjectReferenceTemplate_out::operator-> (void)
 // *************************************************************
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_cs.cpp:138
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138
 
 TAO_Default_ORT::ObjectReferenceTemplate *
 TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
@@ -296,7 +301,7 @@ TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-
+  
   return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
 }
 
@@ -306,26 +311,20 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_repository_id (void) const
   return this->_tao_obv_static_repository_id ();
 }
 
-#if defined (_MSC_VER)
-void *
-TAO_Default_ORT::ObjectReferenceTemplate::TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (
-    ptr_arith_t type_id
-  )
-{
-  return this->_tao_obv_narrow (type_id);
-}
-#endif /* _MSC_VER */
-
 void *
+#if defined (_MSC_VER)
+TAO_Default_ORT::ObjectReferenceTemplate::TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t type_id)
+#else
 TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
+#endif /* _MSC_VER */
 {
   if (type_id == (ptr_arith_t) &_downcast)
     {
       return this;
     }
-
+  
   void *rval = 0;
-
+  
   if (rval == 0)
     {
 #if defined (_MSC_VER)
@@ -334,10 +333,18 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
       rval = this->PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (type_id);
 #endif /* _MSC_VER */
     }
-
+  
   return rval;
 }
 
+#if defined (_MSC_VER)
+void *
+TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
+{
+  return this->TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (type_id);
+}
+#endif /* _MSC_VER */
+
 void
 TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -373,29 +380,29 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
@@ -403,7 +410,10 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_obv_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
+
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
+{}
 
 CORBA::Boolean
 OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &strm)
@@ -416,123 +426,62 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal__TAO_Default_ORT_Ob
 {
   return _tao_unmarshal_state (strm);
 }
+
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:56
 
-// Copying.
+// Copying insertion.
 void
 operator<<= (
-    CORBA::Any &any,
-    TAO_Default_ORT::ObjectReferenceTemplate *value
+    CORBA::Any &_tao_any,
+    TAO_Default_ORT::ObjectReferenceTemplate *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << value)
-    {
-      any._tao_replace (
-          TAO_Default_ORT::_tc_ObjectReferenceTemplate,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  CORBA::add_ref (_tao_elem);
+  _tao_any <<= &_tao_elem;
 }
 
-// Non-copying.
+// Non-copying insertion.
 void
 operator<<= (
-    CORBA::Any &any,
-    TAO_Default_ORT::ObjectReferenceTemplate **value
+    CORBA::Any &_tao_any,
+    TAO_Default_ORT::ObjectReferenceTemplate **_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *value)
-    {
-      any._tao_replace (
-          TAO_Default_ORT::_tc_ObjectReferenceTemplate,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *value,
-          TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::insert (
+      _tao_any,
+      TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor,
+      TAO_Default_ORT::_tc_ObjectReferenceTemplate,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
 operator>>= (
-    const CORBA::Any &any,
-    TAO_Default_ORT::ObjectReferenceTemplate *&value
+    const CORBA::Any &_tao_any,
+    TAO_Default_ORT::ObjectReferenceTemplate *&_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    value = 0;
-    CORBA::TypeCode_var type = any.type ();
-    CORBA::Boolean result =
-      type->equivalent (
-          TAO_Default_ORT::_tc_ObjectReferenceTemplate
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    if (any.any_owns_data ())
-      {
-        const TAO_Default_ORT::ObjectReferenceTemplate *const_holder =
-          ACE_static_cast (
-              const TAO_Default_ORT::ObjectReferenceTemplate *,
-              any.value ()
-            );
-        value =
-          ACE_const_cast (
-              TAO_Default_ORT::ObjectReferenceTemplate *,
-              const_holder
-            );
-        return 1;
-      }
-    else
-      {
-        TAO_Default_ORT::ObjectReferenceTemplate *tmp;
-        TAO_InputCDR stream (
-            any._tao_get_cdr (),
-            any._tao_byte_order ()
-          );
-
-        if (stream >> tmp)
-          {
-            ((CORBA::Any *)&any)->_tao_replace (
-                TAO_Default_ORT::_tc_ObjectReferenceTemplate,
-                1,
-                ACE_static_cast (void *, tmp),
-                TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor
-              );
-            value = tmp;
-            return 1;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::extract (
+        _tao_any,
+        TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor,
+        TAO_Default_ORT::_tc_ObjectReferenceTemplate,
+        _tao_elem
+      );
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var>
+  template class TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var>;
+  template class TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var>
+#  pragma instantiate TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:742
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740
 
 void
 CORBA::add_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
@@ -553,7 +502,7 @@ CORBA::remove_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_cs.cpp:70
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73
 
 CORBA::Boolean
 operator<< (
@@ -582,7 +531,7 @@ operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/marshal_cs.cpp:44
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/marshal_cs.cpp:44
 
 CORBA::Boolean
 OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_state (TAO_OutputCDR &)
diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h
index de08280d311..83f8b4daef7 100644
--- a/TAO/tao/PortableServer/Default_ORTC.h
+++ b/TAO/tao/PortableServer/Default_ORTC.h
@@ -19,9 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_DEFAULT_ORTC_H_
 #define _TAO_IDL_ORIG_DEFAULT_ORTC_H_
@@ -38,13 +37,13 @@
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO
+#define TAO_EXPORT_MACRO 
 
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
 #  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO
+#  define TAO_EXPORT_NESTED_MACRO 
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -59,30 +58,29 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:45
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  TAO_Default_ORT
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_valuetype/valuetype_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52
+  
   class ObjectReferenceTemplate;
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___PTR_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___PTR_CH_
-
+  
   typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___VAR_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_valuetype.cpp:182
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181
+  
   class  ObjectReferenceTemplate_var
   {
   public:
@@ -91,38 +89,37 @@ TAO_NAMESPACE  TAO_Default_ORT
     ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension)
     ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &);
     ~ObjectReferenceTemplate_var (void);
-
+    
     ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*);
     ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &);
     ObjectReferenceTemplate* operator-> (void) const;
-
+    
+    operator const ObjectReferenceTemplate* () const;
     operator ObjectReferenceTemplate*& ();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ObjectReferenceTemplate* in (void) const;
     ObjectReferenceTemplate*& inout (void);
     ObjectReferenceTemplate*& out (void);
     ObjectReferenceTemplate* _retn (void);
     ObjectReferenceTemplate* ptr (void) const;
-
+    
     // Hooks used by template sequence and valuetype manager classes
     // for non-defined forward declared valuetypes.
     static void tao_add_ref (ObjectReferenceTemplate *);
     static void tao_remove_ref (ObjectReferenceTemplate *);
-
+  
   private:
     ObjectReferenceTemplate* ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OUT_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_valuetype.cpp:491
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
+  
   class  ObjectReferenceTemplate_out
   {
   public:
@@ -135,121 +132,122 @@ TAO_NAMESPACE  TAO_Default_ORT
     operator ObjectReferenceTemplate*& ();
     ObjectReferenceTemplate*& ptr (void);
     ObjectReferenceTemplate* operator-> (void);
-
+    
   private:
     ObjectReferenceTemplate* &ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:96
 
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_
-
+  
   class  ObjectReferenceTemplate
-    : public virtual PortableInterceptor::ObjectReferenceTemplate,
-      public virtual CORBA::ValueBase
-
-{
-public:
-  typedef ObjectReferenceTemplate_var _var_type;
-  static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* );
-  // The address of static _downcast is implicit used as type id
-
-  // (TAO extensions or internals)
-  static CORBA::Boolean _tao_unmarshal (
-      TAO_InputCDR &,
-      ObjectReferenceTemplate *&
-    );
-  virtual const char* _tao_obv_repository_id (void) const;
-  static const char* _tao_obv_static_repository_id (void);
-
-  static void _tao_any_destructor (void *);
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_valuetype/valuetype_ch.cpp:304
-
-protected:
-  ObjectReferenceTemplate (void);
-  virtual ~ObjectReferenceTemplate (void);
-
-  // TAO internals
-  virtual void *_tao_obv_narrow (ptr_arith_t);
+    : public virtual PortableInterceptor::ObjectReferenceTemplate
+  {
+  public:
+    typedef ObjectReferenceTemplate_var _var_type;
+    static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* );
+    // The address of static _downcast is implicit used as type id
+
+    // (TAO extensions or internals)
+    static CORBA::Boolean _tao_unmarshal (
+        TAO_InputCDR &,
+        ObjectReferenceTemplate *&
+      );
+    virtual const char* _tao_obv_repository_id (void) const;
+    static const char* _tao_obv_static_repository_id (void);
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:315
+  
+  protected:
+    ObjectReferenceTemplate (void);
+    virtual ~ObjectReferenceTemplate (void);
+    
+    virtual void *_tao_obv_narrow (ptr_arith_t);
 #if defined (_MSC_VER)
-  virtual void *TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (
-      ptr_arith_t
-    );
+    virtual void *TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t);
 #endif /* _MSC_VER */
-  virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
-  virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-
-private:
-  ObjectReferenceTemplate (const ObjectReferenceTemplate &);
-  void operator= (const ObjectReferenceTemplate &);
-
-protected:
-  virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) = 0;
-  virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0;
-
-};
+    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
+    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
+    
+  private:
+    ObjectReferenceTemplate (const ObjectReferenceTemplate &);
+    void operator= (const ObjectReferenceTemplate &);
+    
+  protected:
+    virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) = 0;
+    virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0;
+  };
 
 #endif /* end #if !defined */
+  
+  // 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_ObjectReferenceTemplate;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_decl.cpp:44
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module TAO_Default_ORT
 
-TAO_NAMESPACE  OBV_PortableInterceptor
-{
-}
-TAO_NAMESPACE_CLOSE
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:55
 
 TAO_NAMESPACE  OBV_TAO_Default_ORT
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_
-
+  
   // OBV_ class
   class  ObjectReferenceTemplate
     : public virtual TAO_Default_ORT::ObjectReferenceTemplate
   {
   public:
-
-
+    virtual ~ObjectReferenceTemplate (void);
+    
   protected:
     virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &);
     virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &);
     CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &);
     CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
-
+  
   private:
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:85
 
-  }
-TAO_NAMESPACE_CLOSE
+}TAO_NAMESPACE_CLOSE
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
 
-// Any operators for valuetype TAO_Default_ORT::ObjectReferenceTemplate
  void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *); // copying
  void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate **); // non-copying
  CORBA::Boolean operator>>= (const CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *&);
 
-#ifndef __ACE_INLINE__
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
+#ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:684
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682
 
 TAO_NAMESPACE CORBA
 {
@@ -259,15 +257,18 @@ TAO_NAMESPACE CORBA
 TAO_NAMESPACE_CLOSE
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_ch.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
  CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *);
  CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1002
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "Default_ORTC.i"
@@ -283,3 +284,5 @@ TAO_NAMESPACE_CLOSE
 
 #include "ace/post.h"
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/Default_ORTC.i b/TAO/tao/PortableServer/Default_ORTC.i
index 297356dcd63..98f2c6fbd2f 100644
--- a/TAO/tao/PortableServer/Default_ORTC.i
+++ b/TAO/tao/PortableServer/Default_ORTC.i
@@ -19,8 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
 // TAO_IDL - Generated from 
-// be/be_visitor_valuetype/valuetype_ci.cpp:58
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
 TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
@@ -37,19 +38,21 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
 }
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:714
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:712
 
 #if defined (__ACE_INLINE__)
+
 TAO_NAMESPACE CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
 }
 TAO_NAMESPACE_CLOSE
+
 #endif /*__ACE_INLINE__*/
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_ci.cpp:60
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ci.cpp:60
 
  CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *);
  CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
index 025c163c8c8..8659a5fea65 100644
--- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
+++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
@@ -1,8 +1,9 @@
+// $Id$
+
 #include "Direct_Object_Proxy_Impl.h"
 #include "Object_Adapter.h"
 #include "tao/Object.h"
 
-
 ACE_RCSID (PortableServer,
            TAO_Direct_Object_Proxy_Impl,
            "$Id$")
diff --git a/TAO/tao/PortableServer/ImR_Locator.pidl b/TAO/tao/PortableServer/ImR_Locator.pidl
index 32aff2f4e78..597fbc37e36 100644
--- a/TAO/tao/PortableServer/ImR_Locator.pidl
+++ b/TAO/tao/PortableServer/ImR_Locator.pidl
@@ -81,4 +81,3 @@ module ImplementationRepository
 
 };
 
-#pragma prefix ""
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.cpp b/TAO/tao/PortableServer/ImR_LocatorC.cpp
index 6f68e569052..ed7e5ad9c7f 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorC.cpp
@@ -19,12 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:315
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
-#include "ImR_LocatorC.h"
 
+#include "ImR_LocatorC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -35,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -43,9 +44,8 @@
 #include "ImR_LocatorC.i"
 #endif /* !defined INLINE */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int ImplementationRepository::Locator::_tao_class_id = 0;
 
@@ -92,13 +92,23 @@ tao_ImplementationRepository_Locator_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_ImplementationRepository_Locator_marshal (
+    ImplementationRepository::Locator_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // ImplementationRepository::Locator_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:720
 // *************************************************************
 
-ImplementationRepository::Locator_var::Locator_var (void) // default constructor
+ImplementationRepository::Locator_var::Locator_var (void)
   : ptr_ (Locator::_nil ())
 {}
 
@@ -108,12 +118,12 @@ ImplementationRepository::Locator_var::ptr (void) const
   return this->ptr_;
 }
 
-ImplementationRepository::Locator_var::Locator_var (const ::ImplementationRepository::Locator_var &p) // copy constructor
+ImplementationRepository::Locator_var::Locator_var (const ::ImplementationRepository::Locator_var &p)
   : TAO_Base_var (),
     ptr_ (Locator::_duplicate (p.ptr ()))
 {}
 
-ImplementationRepository::Locator_var::~Locator_var (void) // destructor
+ImplementationRepository::Locator_var::~Locator_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -142,7 +152,7 @@ ImplementationRepository::Locator_var::operator const ::ImplementationRepository
   return this->ptr_;
 }
 
-ImplementationRepository::Locator_var::operator ::ImplementationRepository::Locator_ptr &() // cast
+ImplementationRepository::Locator_var::operator ::ImplementationRepository::Locator_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -217,10 +227,11 @@ ImplementationRepository::Locator_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // ImplementationRepository::Locator_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1019
 // *************************************************************
 
 ImplementationRepository::Locator_out::Locator_out (Locator_ptr &p)
@@ -229,14 +240,14 @@ ImplementationRepository::Locator_out::Locator_out (Locator_ptr &p)
   this->ptr_ = ::ImplementationRepository::Locator::_nil ();
 }
 
-ImplementationRepository::Locator_out::Locator_out (Locator_var &p) // constructor from _var
+ImplementationRepository::Locator_out::Locator_out (Locator_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::ImplementationRepository::Locator::_nil ();
 }
 
-ImplementationRepository::Locator_out::Locator_out (const ::ImplementationRepository::Locator_out &p) // copy constructor
+ImplementationRepository::Locator_out::Locator_out (const ::ImplementationRepository::Locator_out &p)
   : ptr_ (ACE_const_cast (Locator_out &, p).ptr_)
 {}
 
@@ -267,7 +278,7 @@ ImplementationRepository::Locator_out::operator ::ImplementationRepository::Loca
 }
 
 ::ImplementationRepository::Locator_ptr &
-ImplementationRepository::Locator_out::ptr (void) // ptr
+ImplementationRepository::Locator_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -278,12 +289,14 @@ ImplementationRepository::Locator_out::operator-> (void)
   return this->ptr_;
 }
 
-// *************************************************************
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location : public TAO_ClientRequestInfo_i
 {
 public:
@@ -291,36 +304,38 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location &);
-
-  const char * server_;
-  const char * location_;
-
-};
-
-TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server),
-    location_ (location)
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location &);
+    const char * server_;
+    const char * location_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
+  TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      const char * location
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server),
+      location_ (location)
 {}
 
 Dynamic::ParameterList *
@@ -331,19 +346,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
-    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -355,15 +370,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound,
     ImplementationRepository::_tc_CannotActivate
   };
-
+  
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -375,7 +390,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -384,10 +399,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location : public TAO_ClientRequestInfo_i
 {
 public:
@@ -395,36 +415,38 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location &);
-
-  const char * server_;
-  const char * location_;
-
-};
-
-TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server),
-    location_ (location)
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location &);
+    const char * server_;
+    const char * location_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
+  TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      const char * location
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server),
+      location_ (location)
 {}
 
 Dynamic::ParameterList *
@@ -435,19 +457,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
-    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -459,14 +481,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -478,7 +500,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -487,10 +509,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location : public TAO_ClientRequestInfo_i
 {
 public:
@@ -498,36 +525,38 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &);
-
-  const char * server_;
-  const char * location_;
-
-};
-
-TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server),
-    location_ (location)
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &);
+    const char * server_;
+    const char * location_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
+  TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      const char * location
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server),
+      location_ (location)
 {}
 
 Dynamic::ParameterList *
@@ -538,19 +567,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
-    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -562,14 +591,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -581,7 +610,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -590,10 +619,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location : public TAO_ClientRequestInfo_i
 {
 public:
@@ -601,36 +635,38 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &);
-
-  const char * server_;
-  const char * location_;
-
-};
-
-TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    server_ (server),
-    location_ (location)
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  private:
+    TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &);
+    const char * server_;
+    const char * location_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
+  TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      const char * location
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      server_ (server),
+      location_ (location)
 {}
 
 Dynamic::ParameterList *
@@ -641,19 +677,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
-    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -665,14 +701,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -684,7 +720,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -693,10 +729,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator : public TAO_ClientRequestInfo_i
 {
 public:
@@ -704,38 +745,42 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * location,
-      CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void result (CORBA::ULong result);
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator (const TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator &);
-
-  const char * location_;
-  CORBA::Object_ptr object_ref_;
-  CORBA::ULong _result;
-};
-
-TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * location,
-    CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_NOT_USED
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    location_ (location),
-    object_ref_ (object_ref)
+      CORBA::Object_ptr object_ref
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::ULong result);
+    
+  private:
+    TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator (const TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator &);
+    const char * location_;
+    CORBA::Object_ptr object_ref_;
+    
+    ::CORBA::ULong _result;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
+  TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * location,
+      CORBA::Object_ptr object_ref
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      location_ (location),
+      object_ref_ (object_ref)
 {}
 
 Dynamic::ParameterList *
@@ -746,19 +791,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::argum
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
-    (*parameter_list)[len].argument <<= location_;
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= object_ref_;
+  
+  (*parameter_list)[len].argument <<= object_ref_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -770,14 +815,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::excep
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_register_activator_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_register_activator_exceptiondata[] = 
   {
     ImplementationRepository::_tc_AlreadyRegistered
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -789,7 +834,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::excep
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -798,20 +843,23 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::resul
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::result (CORBA::ULong result)
 {
-  // update the result
+  // Update the result. 
   this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+
 class TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator : public TAO_ClientRequestInfo_i
 {
 public:
@@ -819,38 +867,42 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * location,
-      CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void result (CORBA::ULong result);
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator (const TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator &);
-
-  const char * location_;
-  CORBA::Object_ptr object_ref_;
-  CORBA::ULong _result;
-};
-
-TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * location,
-    CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_NOT_USED
-  )
-  : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-    location_ (location),
-    object_ref_ (object_ref)
+      CORBA::Object_ptr object_ref
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    void result (::CORBA::ULong result);
+    
+  private:
+    TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator (const TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator &);
+    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator &);
+    const char * location_;
+    CORBA::Object_ptr object_ref_;
+    
+    ::CORBA::ULong _result;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
+  TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * location,
+      CORBA::Object_ptr object_ref
+      ACE_ENV_ARG_DECL_NOT_USED      
+    )
+      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+      location_ (location),
+      object_ref_ (object_ref)
 {}
 
 Dynamic::ParameterList *
@@ -861,19 +913,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::arg
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
-    (*parameter_list)[len].argument <<= location_;
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= object_ref_;
+  
+  (*parameter_list)[len].argument <<= object_ref_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -885,14 +937,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::exc
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -904,7 +956,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::exc
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -913,27 +965,27 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::res
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::result (CORBA::ULong result)
 {
-  // update the result
+  // Update the result. 
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 ImplementationRepository::_TAO_Locator_Proxy_Impl::_TAO_Locator_Proxy_Impl (void)
@@ -944,6 +996,9 @@ ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::_TAO_Locator_Remote_Pr
 
 // Remote Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_in_location (
     CORBA::Object *_collocated_tao_target_,
     const char * server,
@@ -956,8 +1011,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
     , ImplementationRepository::CannotActivate
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -969,15 +1023,13 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
     }
   };
 
-
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "activate_server_in_location",
@@ -985,38 +1037,39 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
       2,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1024,15 +1077,15 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -1043,7 +1096,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
           TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server) &&
               (_tao_out << location)
@@ -1051,12 +1104,11 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
             {
               TAO_INTERCEPTOR_THROW (
                   CORBA::MARSHAL (
-
+                      
                     )
                 );
-
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata, 2 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -1079,13 +1131,11 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -1101,61 +1151,62 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
-
-
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_location (
     CORBA::Object *_collocated_tao_target_,
     const char * server,
@@ -1167,8 +1218,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
     , ImplementationRepository::NotFound
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -1176,15 +1226,13 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
     }
   };
 
-
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "remove_server_in_location",
@@ -1192,38 +1240,39 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
       2,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1231,15 +1280,15 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -1250,7 +1299,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
           TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server) &&
               (_tao_out << location)
@@ -1258,12 +1307,11 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
             {
               TAO_INTERCEPTOR_THROW (
                   CORBA::MARSHAL (
-
+                      
                     )
                 );
-
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -1286,13 +1334,11 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -1308,61 +1354,62 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
-
-
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_in_location (
     CORBA::Object *_collocated_tao_target_,
     const char * server,
@@ -1374,8 +1421,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
     , ImplementationRepository::NotFound
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -1383,15 +1429,13 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
     }
   };
 
-
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown_server_in_location",
@@ -1399,38 +1443,39 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
       2,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1438,15 +1483,15 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -1457,7 +1502,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
           TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server) &&
               (_tao_out << location)
@@ -1465,12 +1510,11 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
             {
               TAO_INTERCEPTOR_THROW (
                   CORBA::MARSHAL (
-
+                      
                     )
                 );
-
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -1493,13 +1537,11 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -1515,61 +1557,62 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
-
-
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shutting_down_in_location (
     CORBA::Object *_collocated_tao_target_,
     const char * server,
@@ -1581,8 +1624,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
     , ImplementationRepository::NotFound
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -1590,15 +1632,13 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
     }
   };
 
-
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_shutting_down_in_location",
@@ -1606,38 +1646,39 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
       2,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1645,15 +1686,15 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -1664,7 +1705,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
           TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server) &&
               (_tao_out << location)
@@ -1672,12 +1713,11 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
             {
               TAO_INTERCEPTOR_THROW (
                   CORBA::MARSHAL (
-
+                      
                     )
                 );
-
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -1700,13 +1740,11 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -1722,61 +1760,62 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
-
-
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_activator (
     CORBA::Object *_collocated_tao_target_,
     const char * location,
@@ -1788,8 +1827,7 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
     , ImplementationRepository::AlreadyRegistered
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Locator_register_activator_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Locator_register_activator_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/AlreadyRegistered:1.0",
@@ -1797,15 +1835,14 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
     }
   };
 
-  CORBA::ULong _tao_retval = 0;
+CORBA::ULong _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "register_activator",
@@ -1813,38 +1850,39 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
       2,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           location,
-          object_ref ACE_ENV_ARG_PARAMETER
+          object_ref
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1852,15 +1890,15 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
@@ -1871,7 +1909,7 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << location) &&
               (_tao_out << object_ref)
@@ -1879,13 +1917,12 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                   CORBA::MARSHAL (
-
+                      
                     ),
                   _tao_retval
                 );
-
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Locator_register_activator_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
@@ -1909,13 +1946,12 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
-
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-
+          
           if (!(
               (_tao_in >> _tao_retval)
               ))
@@ -1927,12 +1963,12 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
                   _tao_retval
                 );
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA::ULong _tao_retval_info =
             _tao_retval;
           _tao_ri.result (_tao_retval_info);
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -1948,61 +1984,64 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-
+      
       if (_tao_status == PortableInterceptor::LOCATION_FORWARD
           || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
         {
           continue;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
-
+  
   return _tao_retval;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
+
 CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregister_activator (
     CORBA::Object *_collocated_tao_target_,
     const char * location,
@@ -2014,8 +2053,7 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
     , ImplementationRepository::NotFound
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -2023,15 +2061,14 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
     }
   };
 
-  CORBA::ULong _tao_retval = 0;
+CORBA::ULong _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "unregister_activator",
@@ -2039,38 +2076,39 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
       2,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
           location,
-          object_ref ACE_ENV_ARG_PARAMETER
+          object_ref
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -2078,15 +2116,15 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
@@ -2097,7 +2135,7 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << location) &&
               (_tao_out << object_ref)
@@ -2105,13 +2143,12 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                   CORBA::MARSHAL (
-
+                      
                     ),
                   _tao_retval
                 );
-
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Locator_unregister_activator_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
@@ -2135,13 +2172,12 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
-
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-
+          
           if (!(
               (_tao_in >> _tao_retval)
               ))
@@ -2153,12 +2189,12 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
                   _tao_retval
                 );
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA::ULong _tao_retval_info =
             _tao_retval;
           _tao_ri.result (_tao_retval_info);
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -2174,68 +2210,67 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-
+      
       if (_tao_status == PortableInterceptor::LOCATION_FORWARD
           || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
         {
           continue;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
-
+  
   return _tao_retval;
 }
 
-
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -2271,20 +2306,19 @@ ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker::~_TAO_Locator_Remote
 
 ImplementationRepository::_TAO_Locator_Proxy_Impl&
 ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker::select_proxy (
-  ::ImplementationRepository::Locator *
-  ACE_ENV_ARG_DECL_NOT_USED
-)
+    ::ImplementationRepository::Locator *
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
   return this->remote_proxy_impl_;
 }
 
-
 //
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:226
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 ImplementationRepository::Locator::Locator (int collocated)
 {
@@ -2300,17 +2334,17 @@ ImplementationRepository::Locator::ImplementationRepository_Locator_setup_colloc
   else
     this->the_TAO_Locator_Proxy_Broker_ =
       ::ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker::the_TAO_Locator_Remote_Proxy_Broker ();
-
+  
   this->ImplementationRepository_Administration_setup_collocation (collocated);
 }
 
 ImplementationRepository::Locator::~Locator (void)
 {}
 
-void
+void 
 ImplementationRepository::Locator::_tao_any_destructor (void *_tao_void_pointer)
 {
-  Locator *tmp = ACE_static_cast (Locator*, _tao_void_pointer);
+  Locator *tmp = ACE_static_cast (Locator *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
@@ -2324,7 +2358,7 @@ ImplementationRepository::Locator::_narrow (
     {
       return Locator::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -2333,17 +2367,17 @@ ImplementationRepository::Locator::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (Locator::_nil ());
-
+      
       if (is_a == 0)
         {
           return Locator::_nil ();
         }
     }
-
+  
   return Locator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-ImplementationRepository::Locator_ptr
+ImplementationRepository::Locator_ptr 
 ImplementationRepository::Locator::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2353,18 +2387,18 @@ ImplementationRepository::Locator::_unchecked_narrow (
     {
       return Locator::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-
+      
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-
+      
       Locator_ptr default_proxy = Locator::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -2382,7 +2416,7 @@ ImplementationRepository::Locator::_unchecked_narrow (
               Locator::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -2395,10 +2429,10 @@ ImplementationRepository::Locator::_unchecked_narrow (
               Locator::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
       ACE_reinterpret_cast (
           Locator_ptr,
@@ -2418,7 +2452,7 @@ ImplementationRepository::Locator::_duplicate (Locator_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -2457,7 +2491,7 @@ ImplementationRepository::Locator::_is_a (
 void *ImplementationRepository::Locator::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::ImplementationRepository, Locator)::_tao_class_id)
@@ -2490,12 +2524,12 @@ void *ImplementationRepository::Locator::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -2504,6 +2538,9 @@ const char* ImplementationRepository::Locator::_interface_repository_id (void) c
   return "IDL:ImplementationRepository/Locator:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Locator::activate_server_in_location (
     const char * server,
     const char * location
@@ -2515,17 +2552,21 @@ void ImplementationRepository::Locator::activate_server_in_location (
     , ImplementationRepository::CannotActivate
   ))
 {
-  _TAO_Locator_Proxy_Impl &proxy =
+  _TAO_Locator_Proxy_Impl &proxy = 
     this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.activate_server_in_location (
       this,
       server,
-      location ACE_ENV_ARG_PARAMETER
+      location
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Locator::remove_server_in_location (
     const char * server,
     const char * location
@@ -2536,17 +2577,21 @@ void ImplementationRepository::Locator::remove_server_in_location (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Locator_Proxy_Impl &proxy =
+  _TAO_Locator_Proxy_Impl &proxy = 
     this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.remove_server_in_location (
       this,
       server,
-      location ACE_ENV_ARG_PARAMETER
+      location
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Locator::shutdown_server_in_location (
     const char * server,
     const char * location
@@ -2557,17 +2602,21 @@ void ImplementationRepository::Locator::shutdown_server_in_location (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Locator_Proxy_Impl &proxy =
+  _TAO_Locator_Proxy_Impl &proxy = 
     this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.shutdown_server_in_location (
       this,
       server,
-      location ACE_ENV_ARG_PARAMETER
+      location
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 void ImplementationRepository::Locator::server_is_shutting_down_in_location (
     const char * server,
     const char * location
@@ -2578,17 +2627,21 @@ void ImplementationRepository::Locator::server_is_shutting_down_in_location (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Locator_Proxy_Impl &proxy =
+  _TAO_Locator_Proxy_Impl &proxy = 
     this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.server_is_shutting_down_in_location (
       this,
       server,
-      location ACE_ENV_ARG_PARAMETER
+      location
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 CORBA::ULong ImplementationRepository::Locator::register_activator (
     const char * location,
     CORBA::Object_ptr object_ref
@@ -2599,17 +2652,21 @@ CORBA::ULong ImplementationRepository::Locator::register_activator (
     , ImplementationRepository::AlreadyRegistered
   ))
 {
-  _TAO_Locator_Proxy_Impl &proxy =
+  _TAO_Locator_Proxy_Impl &proxy = 
     this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.register_activator (
       this,
       location,
-      object_ref ACE_ENV_ARG_PARAMETER
+      object_ref
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
+
 CORBA::ULong ImplementationRepository::Locator::unregister_activator (
     const char * location,
     CORBA::Object_ptr object_ref
@@ -2620,40 +2677,40 @@ CORBA::ULong ImplementationRepository::Locator::unregister_activator (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Locator_Proxy_Impl &proxy =
+  _TAO_Locator_Proxy_Impl &proxy = 
     this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.unregister_activator (
       this,
       location,
-      object_ref ACE_ENV_ARG_PARAMETER
+      object_ref
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_Locator[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f4c6f63),
-  ACE_NTOHL (0x61746f72),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f4c6f63), 
+  ACE_NTOHL (0x61746f72), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Locator:1.0
-  8,
-  ACE_NTOHL (0x4c6f6361),
+    8,
+  ACE_NTOHL (0x4c6f6361), 
   ACE_NTOHL (0x746f7200),  // name = Locator
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Locator (
     CORBA::tk_objref,
@@ -2672,11 +2729,10 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -2688,26 +2744,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     ImplementationRepository::Locator_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_Locator,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          ImplementationRepository::Locator::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<ImplementationRepository::Locator>::insert (
+      _tao_any,
+      ImplementationRepository::Locator::_tao_any_destructor,
+      ImplementationRepository::_tc_Locator,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -2716,60 +2765,35 @@ operator>>= (
     ImplementationRepository::Locator_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = ImplementationRepository::Locator::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          ImplementationRepository::_tc_Locator
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<ImplementationRepository::Locator>::extract (
+        _tao_any,
+        ImplementationRepository::Locator::_tao_any_destructor,
+        ImplementationRepository::_tc_Locator,
+        _tao_elem
       );
+}
 
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_Locator,
-            1,
-            _tao_elem,
-            ImplementationRepository::Locator::_tao_any_destructor
-          );
-
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = ImplementationRepository::Locator::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-
-  _tao_elem = ImplementationRepository::Locator::_nil ();
-  return 0;
+CORBA::Boolean
+TAO::Any_Impl_T<ImplementationRepository::Locator>::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<ImplementationRepository::Locator,ImplementationRepository::Locator_var>;
+  template class TAO::Any_Impl_T<ImplementationRepository::Locator>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<ImplementationRepository::Locator,ImplementationRepository::Locator_var>
+# pragma instantiate TAO_Object_Manager<ImplementationRepository::Locator, ImplementationRepository::Locator_var>
+# pragma instantiate TAO::Any_Impl_T<ImplementationRepository::Locator>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -2788,12 +2812,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-
+    
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-
+    
     // Narrow to the right type.
     _tao_objref =
       ImplementationRepository::Locator::_unchecked_narrow (
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.h b/TAO/tao/PortableServer/ImR_LocatorC.h
index 08a7e87c8f6..4f11ec6b4c9 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.h
+++ b/TAO/tao/PortableServer/ImR_LocatorC.h
@@ -19,12 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
-#ifndef _TAO_IDL_IMR_LOCATORC_H_
-#define _TAO_IDL_IMR_LOCATORC_H_
+#ifndef _TAO_IDL_ORIG_IMR_LOCATORC_H_
+#define _TAO_IDL_ORIG_IMR_LOCATORC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -60,51 +59,49 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:45
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  ImplementationRepository
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR___PTR_CH_
-
+  
   class Locator;
   typedef Locator *Locator_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR___VAR_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:569
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export Locator_var : public TAO_Base_var
   {
   public:
     Locator_var (void); // default constructor
-    Locator_var (Locator_ptr p) : ptr_ (p) {}
+    Locator_var (Locator_ptr p) : ptr_ (p) {} 
     Locator_var (const Locator_var &); // copy constructor
     ~Locator_var (void); // destructor
-
+    
     Locator_var &operator= (Locator_ptr);
     Locator_var &operator= (const Locator_var &);
     Locator_ptr operator-> (void) const;
-
+    
     operator const Locator_ptr &() const;
     operator Locator_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Locator_ptr in (void) const;
     Locator_ptr &inout (void);
     Locator_ptr &out (void);
     Locator_ptr _retn (void);
     Locator_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Locator_ptr tao_duplicate (Locator_ptr);
@@ -115,7 +112,7 @@ TAO_NAMESPACE  ImplementationRepository
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Locator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -123,17 +120,14 @@ TAO_NAMESPACE  ImplementationRepository
     Locator_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR___OUT_CH_
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:929
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export Locator_out
   {
   public:
@@ -146,27 +140,24 @@ TAO_NAMESPACE  ImplementationRepository
     operator Locator_ptr &();
     Locator_ptr &ptr (void);
     Locator_ptr operator-> (void);
-
+  
   private:
     Locator_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:113
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR_CH_
-
-  // Forward Classes Declaration.
+  
   class _TAO_Locator_Proxy_Impl;
   class _TAO_Locator_Remote_Proxy_Impl;
   class _TAO_Locator_Proxy_Broker;
   class _TAO_Locator_Remote_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Locator
     : public virtual ImplementationRepository::Administration
   {
@@ -174,30 +165,30 @@ TAO_NAMESPACE  ImplementationRepository
     typedef Locator_ptr _ptr_type;
     typedef Locator_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static Locator_ptr _duplicate (Locator_ptr obj);
-
+    
     static Locator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Locator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Locator_ptr _nil (void)
       {
         return (Locator_ptr)0;
       }
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void activate_server_in_location (
         const char * server,
         const char * location
@@ -208,10 +199,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void remove_server_in_location (
         const char * server,
         const char * location
@@ -221,10 +212,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void shutdown_server_in_location (
         const char * server,
         const char * location
@@ -234,10 +225,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void server_is_shutting_down_in_location (
         const char * server,
         const char * location
@@ -247,10 +238,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong register_activator (
         const char * location,
         CORBA::Object_ptr object_ref
@@ -260,10 +251,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::AlreadyRegistered
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong unregister_activator (
         const char * location,
         CORBA::Object_ptr object_ref
@@ -273,61 +264,66 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:269
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_Locator_Proxy_Broker *the_TAO_Locator_Proxy_Broker_;
-
+  
   protected:
     Locator (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode
+    // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Locator_setup_collocation (int collocated);
-
+    
     Locator (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~Locator (void);
-
+    
     friend class _TAO_Locator_Remote_Proxy_Impl;
     friend class _TAO_Locator_ThruPOA_Proxy_Impl;
     friend class _TAO_Locator_Direct_Proxy_Impl;
-
+  
   private:
     Locator (const Locator &);
     void operator= (const Locator &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_PortableServer_Export _TAO_Locator_Proxy_Impl
     : public virtual ImplementationRepository::_TAO_Administration_Proxy_Impl
   {
   public:
-    virtual ~_TAO_Locator_Proxy_Impl (void) { }
+    virtual ~_TAO_Locator_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void activate_server_in_location (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -339,7 +335,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void remove_server_in_location (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -350,7 +349,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void shutdown_server_in_location (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -361,7 +363,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void server_is_shutting_down_in_location (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -372,7 +377,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::ULong register_activator (
         CORBA::Object *_collocated_tao_target_,
         const char * location,
@@ -383,7 +391,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::AlreadyRegistered
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::ULong unregister_activator (
         CORBA::Object *_collocated_tao_target_,
         const char * location,
@@ -394,24 +405,23 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-
-
+  
   protected:
     _TAO_Locator_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_PortableServer_Export _TAO_Locator_Remote_Proxy_Impl
     : public virtual _TAO_Locator_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -419,8 +429,12 @@ TAO_NAMESPACE  ImplementationRepository
   {
   public:
     _TAO_Locator_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_Locator_Remote_Proxy_Impl (void) { }
+    
+    virtual ~_TAO_Locator_Remote_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void activate_server_in_location (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -432,7 +446,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void remove_server_in_location (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -443,7 +460,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void shutdown_server_in_location (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -454,7 +474,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void server_is_shutting_down_in_location (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -465,7 +488,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::ULong register_activator (
         CORBA::Object *_collocated_tao_target_,
         const char * location,
@@ -476,7 +502,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::AlreadyRegistered
       ));
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::ULong unregister_activator (
         CORBA::Object *_collocated_tao_target_,
         const char * location,
@@ -487,27 +516,24 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
-
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_PortableServer_Export _TAO_Locator_Proxy_Broker
   {
   public:
@@ -516,62 +542,60 @@ TAO_NAMESPACE  ImplementationRepository
         Locator *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_Locator_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_PortableServer_Export _TAO_Locator_Remote_Proxy_Broker
     : public virtual _TAO_Locator_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Locator_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Locator_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_Locator_Proxy_Impl &select_proxy (
         Locator *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_Locator_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_Locator_Remote_Proxy_Broker *the_TAO_Locator_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Locator;
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
@@ -579,7 +603,7 @@ TAO_NAMESPACE_CLOSE // module ImplementationRepository
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:79
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80
 
 extern TAO_PortableServer_Export
 ImplementationRepository::_TAO_Locator_Proxy_Broker *
@@ -587,28 +611,31 @@ ImplementationRepository::_TAO_Locator_Proxy_Broker *
     CORBA::Object_ptr obj
   );
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-// Any operators for interface ImplementationRepository::Locator
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Locator_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Locator_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Locator_ptr &);
 
-#ifndef __ACE_INLINE__
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
+#ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Locator_ptr );
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Locator_ptr &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1002
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "ImR_LocatorC.i"
@@ -624,3 +651,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.i b/TAO/tao/PortableServer/ImR_LocatorC.i
index 188f934f304..cc468739215 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.i
+++ b/TAO/tao/PortableServer/ImR_LocatorC.i
@@ -19,8 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR___CI_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR___CI_
@@ -36,11 +37,17 @@ ImplementationRepository::Locator::Locator (
   this->ImplementationRepository_Locator_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+ImplementationRepository::Locator::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.cpp b/TAO/tao/PortableServer/ImR_LocatorS.cpp
index b70622170e8..6f3467feb50 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorS.cpp
@@ -21,13 +21,13 @@
 
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:663
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:670
 
-#ifndef _TAO_IDL_IMR_LOCATORS_CPP_
-#define _TAO_IDL_IMR_LOCATORS_CPP_
+#ifndef _TAO_IDL_ORIG_IMR_LOCATORS_CPP_
+#define _TAO_IDL_ORIG_IMR_LOCATORS_CPP_
 
-#include "ImR_LocatorS.h"
 
+#include "ImR_LocatorS.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
@@ -35,7 +35,6 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/PortableInterceptor.h"
-
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #include "tao/PICurrent.h"
@@ -44,6 +43,7 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -52,8 +52,10 @@
 #include "ImR_LocatorS.i"
 #endif /* !defined INLINE */
 
+
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1694
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
 
 class TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -62,8 +64,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
+
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/doctmp/pgontla/ImR/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -189,9 +192,13 @@ TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable::lookup (const char *s
 static TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable tao_ImplementationRepository_Locator_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location : public TAO_ServerRequestInfo
 {
 public:
@@ -200,36 +207,36 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Locator *tao_impl,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    
-  );
-
-virtual Dynamic::ParameterList * arguments (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual Dynamic::ExceptionList * exceptions (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Any * result (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual char * target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Boolean target_is_a (
-    const char * id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location &
@@ -241,17 +248,21 @@ private:
   
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
+  
   const char * server_;
   const char * location_;
-  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location::TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Locator *tao_impl,
     const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED
+    const char * location
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -271,14 +282,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
   parameter_list->length (2);
   CORBA::ULong len = 0;
   
-    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -315,7 +326,6 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   return safe_exception_list._retn ();
 }
 
-
 CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -351,6 +361,9 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location : public TAO_ServerRequestInfo
 {
 public:
@@ -359,36 +372,36 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Locator *tao_impl,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    
-  );
-
-virtual Dynamic::ParameterList * arguments (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual Dynamic::ExceptionList * exceptions (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Any * result (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual char * target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Boolean target_is_a (
-    const char * id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location &
@@ -400,17 +413,21 @@ private:
   
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
+  
   const char * server_;
   const char * location_;
-  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location::TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Locator *tao_impl,
     const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED
+    const char * location
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -430,14 +447,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
   parameter_list->length (2);
   CORBA::ULong len = 0;
   
-    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -473,7 +490,6 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   return safe_exception_list._retn ();
 }
 
-
 CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -509,6 +525,9 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location : public TAO_ServerRequestInfo
 {
 public:
@@ -517,36 +536,36 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Locator *tao_impl,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    
-  );
-
-virtual Dynamic::ParameterList * arguments (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual Dynamic::ExceptionList * exceptions (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Any * result (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual char * target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Boolean target_is_a (
-    const char * id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &
@@ -558,17 +577,21 @@ private:
   
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
+  
   const char * server_;
   const char * location_;
-  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Locator *tao_impl,
     const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED
+    const char * location
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -588,14 +611,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
   parameter_list->length (2);
   CORBA::ULong len = 0;
   
-    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -631,7 +654,6 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   return safe_exception_list._retn ();
 }
 
-
 CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -667,6 +689,9 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location : public TAO_ServerRequestInfo
 {
 public:
@@ -675,36 +700,36 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Locator *tao_impl,
       const char * server,
-      const char * location ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    
-  );
-
-virtual Dynamic::ParameterList * arguments (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual Dynamic::ExceptionList * exceptions (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Any * result (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual char * target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Boolean target_is_a (
-    const char * id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
+      const char * location
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &
@@ -716,17 +741,21 @@ private:
   
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
+  
   const char * server_;
   const char * location_;
-  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Locator *tao_impl,
     const char * server,
-    const char * location ACE_ENV_ARG_DECL_NOT_USED
+    const char * location
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -746,14 +775,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
   parameter_list->length (2);
   CORBA::ULong len = 0;
   
-    (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= location_;
+  
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -789,7 +818,6 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   return safe_exception_list._retn ();
 }
 
-
 CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -825,6 +853,9 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator : public TAO_ServerRequestInfo
 {
 public:
@@ -833,37 +864,37 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Locator *tao_impl,
       const char * location,
-      CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    
-  );
-
-virtual Dynamic::ParameterList * arguments (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual Dynamic::ExceptionList * exceptions (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Any * result (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual char * target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Boolean target_is_a (
-    const char * id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-void result (CORBA::ULong result);
+      CORBA::Object_ptr object_ref
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  void result (CORBA::ULong result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator (
@@ -876,17 +907,21 @@ private:
   
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
+  
   const char * location_;
-  CORBA::Object_ptr object_ref_;
-  CORBA::ULong _result;
+  CORBA::Object_ptr object_ref_;CORBA::ULong _result;
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Locator *tao_impl,
     const char * location,
-    CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_NOT_USED
+    CORBA::Object_ptr object_ref
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -906,14 +941,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::argum
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
   parameter_list->length (2);
   CORBA::ULong len = 0;
   
-    (*parameter_list)[len].argument <<= location_;
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= object_ref_;
+  
+  (*parameter_list)[len].argument <<= object_ref_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -949,7 +984,6 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::excep
   return safe_exception_list._retn ();
 }
 
-
 CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -996,6 +1030,9 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::resul
    this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator : public TAO_ServerRequestInfo
 {
 public:
@@ -1004,37 +1041,37 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Locator *tao_impl,
       const char * location,
-      CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    
-  );
-
-virtual Dynamic::ParameterList * arguments (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual Dynamic::ExceptionList * exceptions (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Any * result (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual char * target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual CORBA::Boolean target_is_a (
-    const char * id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-void result (CORBA::ULong result);
+      CORBA::Object_ptr object_ref
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  void result (CORBA::ULong result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator (
@@ -1047,17 +1084,21 @@ private:
   
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
+  
   const char * location_;
-  CORBA::Object_ptr object_ref_;
-  CORBA::ULong _result;
+  CORBA::Object_ptr object_ref_;CORBA::ULong _result;
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Locator *tao_impl,
     const char * location,
-    CORBA::Object_ptr object_ref ACE_ENV_ARG_DECL_NOT_USED
+    CORBA::Object_ptr object_ref
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1077,14 +1118,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::arg
   ACE_CHECK_RETURN (0);
   
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
   parameter_list->length (2);
   CORBA::ULong len = 0;
   
-    (*parameter_list)[len].argument <<= location_;
+  (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    (*parameter_list)[len].argument <<= object_ref_;
+  
+  (*parameter_list)[len].argument <<= object_ref_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
   
@@ -1120,7 +1161,6 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::exc
   return safe_exception_list._retn ();
 }
 
-
 CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
@@ -1174,7 +1214,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::res
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::the_TAO_Locator_Strategized_Proxy_Broker (void)
@@ -1186,8 +1226,9 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker *POA_Impleme
 POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::_TAO_Locator_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    this->proxy_cache_[i] = 0;
-  
+    {
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::~_TAO_Locator_Strategized_Proxy_Broker (void)
@@ -1200,7 +1241,6 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::~_TAO_Locat
       // for details..
       this->proxy_cache_[i] = 0;
     }
-  
 }
 
 ImplementationRepository::_TAO_Locator_Proxy_Impl&
@@ -1211,16 +1251,17 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::select_prox
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
   
   if (this->proxy_cache_[strategy] != 0)
-    return *this->proxy_cache_[strategy];
+    {
+      return *this->proxy_cache_[strategy];
+    }
   
   this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
   
   return *this->proxy_cache_[strategy];
-  
 }
 
 void 
@@ -1262,20 +1303,16 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::create_prox
           );
           ACE_CHECK;
           break;
-        
-      }
-    
-  }
+        }
+    }
 }
 
-
 //
 //        End Strategized Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:599
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 ImplementationRepository::_TAO_Locator_Proxy_Broker *
 ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -1302,13 +1339,16 @@ static int ImplementationRepository__TAO_Locator_Proxy_Broker_Stub_Factory_Initi
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::_TAO_Locator_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_in_location (
     CORBA::Object *_collocated_tao_target_,
     const char * server,
@@ -1321,6 +1361,7 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_ser
     , ImplementationRepository::CannotActivate
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -1344,11 +1385,16 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_ser
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->activate_server_in_location (
+        
         server,
-        location ACE_ENV_ARG_PARAMETER
+        location
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server_in_location (
     CORBA::Object *_collocated_tao_target_,
     const char * server,
@@ -1360,6 +1406,7 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_serve
     , ImplementationRepository::NotFound
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -1383,11 +1430,16 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_serve
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->remove_server_in_location (
+        
         server,
-        location ACE_ENV_ARG_PARAMETER
+        location
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server_in_location (
     CORBA::Object *_collocated_tao_target_,
     const char * server,
@@ -1399,6 +1451,7 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_ser
     , ImplementationRepository::NotFound
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -1422,11 +1475,16 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_ser
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->shutdown_server_in_location (
+        
         server,
-        location ACE_ENV_ARG_PARAMETER
+        location
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down_in_location (
     CORBA::Object *_collocated_tao_target_,
     const char * server,
@@ -1438,6 +1496,7 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_sh
     , ImplementationRepository::NotFound
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -1461,11 +1520,16 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_sh
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->server_is_shutting_down_in_location (
+        
         server,
-        location ACE_ENV_ARG_PARAMETER
+        location
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_activator (
     CORBA::Object *_collocated_tao_target_,
     const char * location,
@@ -1502,11 +1566,16 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::regi
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->register_activator (
+        
         location,
-        object_ref ACE_ENV_ARG_PARAMETER
+        object_ref
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unregister_activator (
     CORBA::Object *_collocated_tao_target_,
     const char * location,
@@ -1543,16 +1612,14 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unre
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->unregister_activator (
+        
         location,
-        object_ref ACE_ENV_ARG_PARAMETER
+        object_ref
+        ACE_ENV_ARG_PARAMETER
       );
-}
-
-//
+}//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -1570,14 +1637,15 @@ void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_serv
     CORBA::SystemException
     , ImplementationRepository::NotFound
     , ImplementationRepository::CannotActivate
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
     )->activate_server_in_location (
+          
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
   
 }
@@ -1591,14 +1659,15 @@ void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
     )->remove_server_in_location (
+          
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
   
 }
@@ -1612,14 +1681,15 @@ void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_serv
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
     )->shutdown_server_in_location (
+          
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
   
 }
@@ -1633,14 +1703,15 @@ void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shu
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
     )->server_is_shutting_down_in_location (
+          
           server,
-          location ACE_ENV_ARG_PARAMETER
+          location
+          ACE_ENV_ARG_PARAMETER
         );
   
 }
@@ -1654,14 +1725,15 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::regis
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::AlreadyRegistered
-  ))
-{
+  )){
   return ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
     )->register_activator (
+          
           location,
-          object_ref ACE_ENV_ARG_PARAMETER
+          object_ref
+          ACE_ENV_ARG_PARAMETER
         );
   
 }
@@ -1675,14 +1747,15 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::unreg
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  ))
-{
+  )){
   return ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
     )->unregister_activator (
+          
           location,
-          object_ref ACE_ENV_ARG_PARAMETER
+          object_ref
+          ACE_ENV_ARG_PARAMETER
         );
   
 }
@@ -1692,8 +1765,9 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::unreg
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
+
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:98
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
 
 POA_ImplementationRepository::Locator::Locator (void)
 {
@@ -1710,7 +1784,7 @@ POA_ImplementationRepository::Locator::~Locator (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Locator::activate_server_in_location_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1726,14 +1800,15 @@ void POA_ImplementationRepository::Locator::activate_server_in_location_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
   CORBA::String_var location;
+  
   if (!(
-    (_tao_in >> server.out ()) &&
-    (_tao_in >> location.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> location.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
@@ -1748,8 +1823,11 @@ ACE_THROW (CORBA::MARSHAL ());
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       server.in (),
-      location.in () ACE_ENV_ARG_PARAMETER
+      
+      location.in ()
+      ACE_ENV_ARG_PARAMETER
     );
   
   ACE_TRY
@@ -1767,11 +1845,14 @@ ACE_THROW (CORBA::MARSHAL ());
 #endif /* TAO_HAS_INTERCEPTORS */
             
             _tao_impl->activate_server_in_location (
+                
                 server.in (),
-                location.in () ACE_ENV_ARG_PARAMETER
+                
+                location.in ()
+                ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
-            
+
 #if (TAO_HAS_INTERCEPTORS == 1)
             
           }
@@ -1837,7 +1918,7 @@ ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Locator::remove_server_in_location_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1853,14 +1934,15 @@ void POA_ImplementationRepository::Locator::remove_server_in_location_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
   CORBA::String_var location;
+  
   if (!(
-    (_tao_in >> server.out ()) &&
-    (_tao_in >> location.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> location.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
@@ -1875,8 +1957,11 @@ ACE_THROW (CORBA::MARSHAL ());
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       server.in (),
-      location.in () ACE_ENV_ARG_PARAMETER
+      
+      location.in ()
+      ACE_ENV_ARG_PARAMETER
     );
   
   ACE_TRY
@@ -1894,11 +1979,14 @@ ACE_THROW (CORBA::MARSHAL ());
 #endif /* TAO_HAS_INTERCEPTORS */
             
             _tao_impl->remove_server_in_location (
+                
                 server.in (),
-                location.in () ACE_ENV_ARG_PARAMETER
+                
+                location.in ()
+                ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
-            
+
 #if (TAO_HAS_INTERCEPTORS == 1)
             
           }
@@ -1964,7 +2052,7 @@ ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Locator::shutdown_server_in_location_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1980,14 +2068,15 @@ void POA_ImplementationRepository::Locator::shutdown_server_in_location_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
   CORBA::String_var location;
+  
   if (!(
-    (_tao_in >> server.out ()) &&
-    (_tao_in >> location.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> location.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
@@ -2002,8 +2091,11 @@ ACE_THROW (CORBA::MARSHAL ());
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       server.in (),
-      location.in () ACE_ENV_ARG_PARAMETER
+      
+      location.in ()
+      ACE_ENV_ARG_PARAMETER
     );
   
   ACE_TRY
@@ -2021,11 +2113,14 @@ ACE_THROW (CORBA::MARSHAL ());
 #endif /* TAO_HAS_INTERCEPTORS */
             
             _tao_impl->shutdown_server_in_location (
+                
                 server.in (),
-                location.in () ACE_ENV_ARG_PARAMETER
+                
+                location.in ()
+                ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
-            
+
 #if (TAO_HAS_INTERCEPTORS == 1)
             
           }
@@ -2091,7 +2186,7 @@ ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Locator::server_is_shutting_down_in_location_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2107,14 +2202,15 @@ void POA_ImplementationRepository::Locator::server_is_shutting_down_in_location_
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-    CORBA::String_var server;
+  
+  CORBA::String_var server;
   CORBA::String_var location;
+  
   if (!(
-    (_tao_in >> server.out ()) &&
-    (_tao_in >> location.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> location.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
@@ -2129,8 +2225,11 @@ ACE_THROW (CORBA::MARSHAL ());
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       server.in (),
-      location.in () ACE_ENV_ARG_PARAMETER
+      
+      location.in ()
+      ACE_ENV_ARG_PARAMETER
     );
   
   ACE_TRY
@@ -2148,11 +2247,14 @@ ACE_THROW (CORBA::MARSHAL ());
 #endif /* TAO_HAS_INTERCEPTORS */
             
             _tao_impl->server_is_shutting_down_in_location (
+                
                 server.in (),
-                location.in () ACE_ENV_ARG_PARAMETER
+                
+                location.in ()
+                ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
-            
+
 #if (TAO_HAS_INTERCEPTORS == 1)
             
           }
@@ -2218,7 +2320,7 @@ ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Locator::register_activator_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2236,12 +2338,12 @@ void POA_ImplementationRepository::Locator::register_activator_skel (
   CORBA::ULong _tao_retval = 0;
   CORBA::String_var location;
   CORBA::Object_var object_ref;
+  
   if (!(
-    (_tao_in >> location.out ()) &&
-    (_tao_in >> object_ref.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> location.out ()) &&
+      (_tao_in >> object_ref.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
@@ -2256,8 +2358,11 @@ ACE_THROW (CORBA::MARSHAL ());
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       location.in (),
-      object_ref.in () ACE_ENV_ARG_PARAMETER
+      
+      object_ref.in ()
+      ACE_ENV_ARG_PARAMETER
     );
   
   ACE_TRY
@@ -2275,11 +2380,14 @@ ACE_THROW (CORBA::MARSHAL ());
 #endif /* TAO_HAS_INTERCEPTORS */
             _tao_retval = 
             _tao_impl->register_activator (
+                
                 location.in (),
-                object_ref.in () ACE_ENV_ARG_PARAMETER
+                
+                object_ref.in ()
+                ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
-            
+
 #if (TAO_HAS_INTERCEPTORS == 1)
             
           }
@@ -2345,16 +2453,16 @@ ACE_THROW (CORBA::MARSHAL ());
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   
   if (!(
-(_tao_out << _tao_retval)
+      (_tao_out << _tao_retval)
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Locator::unregister_activator_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2372,12 +2480,12 @@ void POA_ImplementationRepository::Locator::unregister_activator_skel (
   CORBA::ULong _tao_retval = 0;
   CORBA::String_var location;
   CORBA::Object_var object_ref;
+  
   if (!(
-    (_tao_in >> location.out ()) &&
-    (_tao_in >> object_ref.out ())
-  ))
-ACE_THROW (CORBA::MARSHAL ());
-
+      (_tao_in >> location.out ()) &&
+      (_tao_in >> object_ref.out ())
+    ))
+    ACE_THROW (CORBA::MARSHAL ());
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
@@ -2392,8 +2500,11 @@ ACE_THROW (CORBA::MARSHAL ());
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
+      
       location.in (),
-      object_ref.in () ACE_ENV_ARG_PARAMETER
+      
+      object_ref.in ()
+      ACE_ENV_ARG_PARAMETER
     );
   
   ACE_TRY
@@ -2411,11 +2522,14 @@ ACE_THROW (CORBA::MARSHAL ());
 #endif /* TAO_HAS_INTERCEPTORS */
             _tao_retval = 
             _tao_impl->unregister_activator (
+                
                 location.in (),
-                object_ref.in () ACE_ENV_ARG_PARAMETER
+                
+                object_ref.in ()
+                ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
-            
+
 #if (TAO_HAS_INTERCEPTORS == 1)
             
           }
@@ -2481,16 +2595,16 @@ ACE_THROW (CORBA::MARSHAL ());
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
   
   if (!(
-(_tao_out << _tao_retval)
+      (_tao_out << _tao_retval)
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:163
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_ImplementationRepository::Locator::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -2503,6 +2617,7 @@ void POA_ImplementationRepository::Locator::_is_a_skel (
   POA_ImplementationRepository::Locator *_tao_impl = (POA_ImplementationRepository::Locator *) _tao_servant;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
+  
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
   
@@ -2511,6 +2626,7 @@ void POA_ImplementationRepository::Locator::_is_a_skel (
   
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
@@ -2529,6 +2645,7 @@ void POA_ImplementationRepository::Locator::_non_existent_skel (
   
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
@@ -2596,6 +2713,7 @@ void POA_ImplementationRepository::Locator::_component_skel (
   
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << _tao_retval._retn ()))
     ACE_THROW (CORBA::MARSHAL ());
 }
@@ -2659,7 +2777,7 @@ const char* POA_ImplementationRepository::Locator::_interface_repository_id (voi
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:533
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
 
 void POA_ImplementationRepository::Locator::_dispatch (
     TAO_ServerRequest &req,
@@ -2674,7 +2792,7 @@ void POA_ImplementationRepository::Locator::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:479
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
 ImplementationRepository::Locator *
 POA_ImplementationRepository::Locator::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -2714,7 +2832,4 @@ POA_ImplementationRepository::Locator::_this (ACE_ENV_SINGLE_ARG_DECL)
   (void) safe_stub.release ();
   return ::ImplementationRepository::Locator::_unchecked_narrow (obj.in ());
 }
-
-
-
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.h b/TAO/tao/PortableServer/ImR_LocatorS.h
index aa76b25340c..ecb886fefbe 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.h
+++ b/TAO/tao/PortableServer/ImR_LocatorS.h
@@ -19,18 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:433
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:443
 
-#ifndef _TAO_IDL_IMR_LOCATORS_H_
-#define _TAO_IDL_IMR_LOCATORS_H_
+#ifndef _TAO_IDL_ORIG_IMR_LOCATORS_H_
+#define _TAO_IDL_ORIG_IMR_LOCATORS_H_
 
 #include "ace/pre.h"
 #include "ImplRepoS.h"
 #include "ImR_LocatorC.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -53,16 +51,16 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:46
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
 
 TAO_NAMESPACE  POA_ImplementationRepository
 {
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:82
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
   
   class Locator;
   typedef Locator *Locator_ptr;
-  // Forward Classes Declaration
+  
   class _TAO_Locator_ThruPOA_Proxy_Impl;
   class _TAO_Locator_Direct_Proxy_Impl;
   class _TAO_Locator_Strategized_Proxy_Broker;
@@ -72,63 +70,62 @@ TAO_NAMESPACE  POA_ImplementationRepository
   {
   protected:
     Locator (void);
-
+  
   public:
     Locator (const Locator& rhs);
     virtual ~Locator (void);
-
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::ImplementationRepository::Locator *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:47
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void activate_server_in_location (
         const char * server,
@@ -147,8 +144,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:47
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void remove_server_in_location (
         const char * server,
@@ -166,8 +164,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:47
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void shutdown_server_in_location (
         const char * server,
@@ -185,8 +184,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:47
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void server_is_shutting_down_in_location (
         const char * server,
@@ -204,8 +204,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:47
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::ULong register_activator (
         const char * location,
@@ -223,8 +224,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:47
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::ULong unregister_activator (
         const char * location,
@@ -242,9 +244,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void activate_server_skel (
         TAO_ServerRequest &req, 
@@ -252,9 +254,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void activate_server_with_startup_skel (
         TAO_ServerRequest &req, 
@@ -262,9 +264,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void register_server_skel (
         TAO_ServerRequest &req, 
@@ -272,9 +274,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void reregister_server_skel (
         TAO_ServerRequest &req, 
@@ -282,9 +284,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void remove_server_skel (
         TAO_ServerRequest &req, 
@@ -292,9 +294,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void shutdown_server_skel (
         TAO_ServerRequest &req, 
@@ -302,9 +304,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void server_is_running_skel (
         TAO_ServerRequest &req, 
@@ -312,9 +314,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void server_is_shutting_down_skel (
         TAO_ServerRequest &req, 
@@ -322,9 +324,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void find_skel (
         TAO_ServerRequest &req, 
@@ -332,9 +334,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2197
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
     
     static void list_skel (
         TAO_ServerRequest &req, 
@@ -342,17 +344,14 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-
-  };
-
+  };  
   
   ///////////////////////////////////////////////////////////////////////
   //               Strategized Proxy Broker Declaration 
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
   
   class TAO_PortableServer_Export _TAO_Locator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Locator_Proxy_Broker
   {
@@ -389,7 +388,6 @@ TAO_NAMESPACE  POA_ImplementationRepository
     static _TAO_Locator_Strategized_Proxy_Broker *the_TAO_Locator_Strategized_Proxy_Broker (void);
   };
   
-  
   //
   //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
@@ -400,7 +398,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class TAO_PortableServer_Export _TAO_Locator_ThruPOA_Proxy_Impl : 
     public virtual ::ImplementationRepository::_TAO_Locator_Proxy_Impl,
@@ -410,7 +408,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
   public:
     _TAO_Locator_ThruPOA_Proxy_Impl (void);
     
-    virtual ~_TAO_Locator_ThruPOA_Proxy_Impl (void) { }
+    virtual ~_TAO_Locator_ThruPOA_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     virtual void activate_server_in_location (
         CORBA::Object *_collocated_tao_target_,
@@ -424,6 +425,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::CannotActivate
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void remove_server_in_location (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -435,6 +439,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void shutdown_server_in_location (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -446,6 +453,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void server_is_shutting_down_in_location (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -457,6 +467,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::ULong register_activator (
         CORBA::Object *_collocated_tao_target_,
         const char * location,
@@ -468,6 +481,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::AlreadyRegistered
       ));
     
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::ULong unregister_activator (
         CORBA::Object *_collocated_tao_target_,
         const char * location,
@@ -478,15 +494,11 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-    
-    
   };
   
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
@@ -500,7 +512,10 @@ class TAO_PortableServer_Export _TAO_Locator_Direct_Proxy_Impl :
 public:
   _TAO_Locator_Direct_Proxy_Impl (void);
   
-  virtual ~_TAO_Locator_Direct_Proxy_Impl (void) { }
+  virtual ~_TAO_Locator_Direct_Proxy_Impl (void) {}
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void activate_server_in_location (
       CORBA::Object *_collocated_tao_target_,
@@ -514,6 +529,9 @@ public:
       , ImplementationRepository::CannotActivate
     ));
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
   virtual void remove_server_in_location (
       CORBA::Object *_collocated_tao_target_,
       const char * server,
@@ -525,6 +543,9 @@ public:
       , ImplementationRepository::NotFound
     ));
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
   virtual void shutdown_server_in_location (
       CORBA::Object *_collocated_tao_target_,
       const char * server,
@@ -536,6 +557,9 @@ public:
       , ImplementationRepository::NotFound
     ));
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
   virtual void server_is_shutting_down_in_location (
       CORBA::Object *_collocated_tao_target_,
       const char * server,
@@ -547,6 +571,9 @@ public:
       , ImplementationRepository::NotFound
     ));
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
   virtual CORBA::ULong register_activator (
       CORBA::Object *_collocated_tao_target_,
       const char * location,
@@ -558,6 +585,9 @@ public:
       , ImplementationRepository::AlreadyRegistered
     ));
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
   virtual CORBA::ULong unregister_activator (
       CORBA::Object *_collocated_tao_target_,
       const char * location,
@@ -567,9 +597,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
       , ImplementationRepository::NotFound
-    ));
-  
-  };
+    ));};
 
 
 //
@@ -579,14 +607,13 @@ public:
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:81
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
 
-
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:1038
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
 
 #include "ImR_LocatorS_T.h"
 
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.i b/TAO/tao/PortableServer/ImR_LocatorS.i
index 63052669d28..f8328837605 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.i
+++ b/TAO/tao/PortableServer/ImR_LocatorS.i
@@ -19,8 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::activate_server_skel (
     TAO_ServerRequest &req,
@@ -37,8 +38,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::activate_server_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::activate_server_with_startup_skel (
     TAO_ServerRequest &req,
@@ -55,8 +57,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::activate_server_with_star
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::register_server_skel (
     TAO_ServerRequest &req,
@@ -73,8 +76,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::register_server_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::reregister_server_skel (
     TAO_ServerRequest &req,
@@ -91,8 +95,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::reregister_server_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::remove_server_skel (
     TAO_ServerRequest &req,
@@ -109,8 +114,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::remove_server_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::shutdown_server_skel (
     TAO_ServerRequest &req,
@@ -127,8 +133,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::shutdown_server_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::server_is_running_skel (
     TAO_ServerRequest &req,
@@ -145,8 +152,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::server_is_running_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::server_is_shutting_down_skel (
     TAO_ServerRequest &req,
@@ -163,8 +171,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::server_is_shutting_down_s
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::find_skel (
     TAO_ServerRequest &req,
@@ -181,8 +190,9 @@ ACE_INLINE void POA_ImplementationRepository::Locator::find_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:2197
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
 
 ACE_INLINE void POA_ImplementationRepository::Locator::list_skel (
     TAO_ServerRequest &req,
@@ -199,3 +209,4 @@ ACE_INLINE void POA_ImplementationRepository::Locator::list_skel (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
diff --git a/TAO/tao/PortableServer/ImR_LocatorS_T.cpp b/TAO/tao/PortableServer/ImR_LocatorS_T.cpp
index 70efeaba4dc..3b32af55826 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS_T.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorS_T.cpp
@@ -19,12 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:770
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:777
 
-#ifndef _TAO_IDL_IMR_LOCATORS_T_CPP_
-#define _TAO_IDL_IMR_LOCATORS_T_CPP_
+#ifndef _TAO_IDL_ORIG_IMR_LOCATORS_T_CPP_
+#define _TAO_IDL_ORIG_IMR_LOCATORS_T_CPP_
 
 #include "ImR_LocatorS_T.h"
 
diff --git a/TAO/tao/PortableServer/ImR_LocatorS_T.h b/TAO/tao/PortableServer/ImR_LocatorS_T.h
index 252627d8f5b..bf75e581318 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS_T.h
+++ b/TAO/tao/PortableServer/ImR_LocatorS_T.h
@@ -19,14 +19,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:597
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:604
 
-#ifndef _TAO_IDL_IMR_LOCATORS_T_H_
-#define _TAO_IDL_IMR_LOCATORS_T_H_
+#ifndef _TAO_IDL_ORIG_IMR_LOCATORS_T_H_
+#define _TAO_IDL_ORIG_IMR_LOCATORS_T_H_
 
 #include "ace/pre.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -34,11 +34,16 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+
 #if defined (ACE_HAS_USING_KEYWORD)
 TAO_NAMESPACE  POA_ImplementationRepository
 {
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/tie_sh.cpp:89
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -49,9 +54,13 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // the T& ctor
     Locator_tie (T &t, PortableServer::POA_ptr poa);
     // ctor taking a POA
-    Locator_tie (T *tp, CORBA::Boolean release=1);
+    Locator_tie (T *tp, CORBA::Boolean release = 1);
     // ctor taking pointer and an ownership flag
-    Locator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    Locator_tie (
+        T *tp,
+        PortableServer::POA_ptr poa,
+        CORBA::Boolean release = 1
+      );
     // ctor with T*, ownership flag and a POA
     ~Locator_tie (void);
     // dtor
@@ -61,7 +70,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // return the underlying object
     void _tied_object (T &obj);
     // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
+    void _tied_object (T *obj, CORBA::Boolean release = 1);
     // set the underlying object and the ownership flag
     CORBA::Boolean _is_owner (void);
     // do we own it
@@ -72,6 +81,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
     void activate_server_in_location (
         const char * server,
         const char * location
@@ -83,7 +96,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::CannotActivate
       ));
     
-        void remove_server_in_location (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void remove_server_in_location (
         const char * server,
         const char * location
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -93,7 +109,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void shutdown_server_in_location (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void shutdown_server_in_location (
         const char * server,
         const char * location
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -103,7 +122,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void server_is_shutting_down_in_location (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void server_is_shutting_down_in_location (
         const char * server,
         const char * location
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -113,7 +135,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        CORBA::ULong register_activator (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    CORBA::ULong register_activator (
         const char * location,
         CORBA::Object_ptr object_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -123,7 +148,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::AlreadyRegistered
       ));
     
-        CORBA::ULong unregister_activator (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    CORBA::ULong unregister_activator (
         const char * location,
         CORBA::Object_ptr object_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -133,7 +161,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void activate_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -143,7 +174,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::CannotActivate
       ));
     
-        char * activate_server_with_startup (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    char * activate_server_with_startup (
         const char * server,
         CORBA::Long check_startup
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -154,7 +188,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::CannotActivate
       ));
     
-        void register_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void register_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -164,7 +201,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::AlreadyRegistered
       ));
     
-        void reregister_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void reregister_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -173,7 +213,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::SystemException
       ));
     
-        void remove_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -182,7 +225,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void shutdown_server (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -191,7 +237,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        char * server_is_running (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    char * server_is_running (
         const char * server,
         const char * addr,
         ImplementationRepository::ServerObject_ptr server_object
@@ -202,7 +251,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void server_is_shutting_down (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -211,7 +263,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void find (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void find (
         const char * server,
         ImplementationRepository::ServerInformation_out info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -221,7 +276,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
         , ImplementationRepository::NotFound
       ));
     
-        void list (
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void list (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
         ImplementationRepository::ServerInformationIterator_out server_iterator
@@ -230,8 +288,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-      private:
+  
+  private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
@@ -240,26 +298,21 @@ TAO_NAMESPACE  POA_ImplementationRepository
     Locator_tie (const Locator_tie &);
     void operator= (const Locator_tie &);
   };
-
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
 #endif /* ACE_HAS_USING_KEYWORD */
 
-
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:1135
-
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
 
 #if defined (__ACE_INLINE__)
 #include "ImR_LocatorS_T.i"
 #endif /* defined INLINE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ImR_LocatorS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #pragma implementation ("ImR_LocatorS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
diff --git a/TAO/tao/PortableServer/ImR_LocatorS_T.i b/TAO/tao/PortableServer/ImR_LocatorS_T.i
index 7fe2708d636..050e64e1084 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS_T.i
+++ b/TAO/tao/PortableServer/ImR_LocatorS_T.i
@@ -19,14 +19,12 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
 // TAO_IDL - Generated from
-// be/be_visitor_interface/tie_si.cpp:95
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
 
 #if defined (ACE_HAS_USING_KEYWORD)
 
-// TAO_IDL - Generated from be/be_visitor_interface/tie_si.cpp:105
-
-
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Locator_tie<T>::Locator_tie (T &t)
 	: ptr_ (&t),
@@ -58,7 +56,10 @@ POA_ImplementationRepository::Locator_tie<T>::Locator_tie (T *tp, PortableServer
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Locator_tie<T>::~Locator_tie (void)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
 }
 
 template <class T> ACE_INLINE T *
@@ -70,7 +71,11 @@ POA_ImplementationRepository::Locator_tie<T>::_tied_object (void)
 template <class T> ACE_INLINE void
 POA_ImplementationRepository::Locator_tie<T>::_tied_object (T &obj)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -78,7 +83,11 @@ POA_ImplementationRepository::Locator_tie<T>::_tied_object (T &obj)
 template <class T> ACE_INLINE void
 POA_ImplementationRepository::Locator_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -99,11 +108,16 @@ template <class T> ACE_INLINE PortableServer::POA_ptr
 POA_ImplementationRepository::Locator_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
+    {
+      return PortableServer::POA::_duplicate (this->poa_.in ());
+    }
+  
   return this->Locator::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::activate_server_in_location  (
     const char * server,
@@ -117,11 +131,15 @@ void POA_ImplementationRepository::Locator_tie<T>::activate_server_in_location
   ))
 {
   this->ptr_->activate_server_in_location (
-server,
-    location ACE_ENV_ARG_PARAMETER
+    server,
+    location
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::remove_server_in_location  (
     const char * server,
@@ -134,11 +152,15 @@ void POA_ImplementationRepository::Locator_tie<T>::remove_server_in_location  (
   ))
 {
   this->ptr_->remove_server_in_location (
-server,
-    location ACE_ENV_ARG_PARAMETER
+    server,
+    location
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::shutdown_server_in_location  (
     const char * server,
@@ -151,11 +173,15 @@ void POA_ImplementationRepository::Locator_tie<T>::shutdown_server_in_location
   ))
 {
   this->ptr_->shutdown_server_in_location (
-server,
-    location ACE_ENV_ARG_PARAMETER
+    server,
+    location
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down_in_location  (
     const char * server,
@@ -168,11 +194,15 @@ void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down_in_lo
   ))
 {
   this->ptr_->server_is_shutting_down_in_location (
-server,
-    location ACE_ENV_ARG_PARAMETER
+    server,
+    location
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::register_activator  (
     const char * location,
@@ -185,11 +215,15 @@ CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::register_activator  (
   ))
 {
   return this->ptr_->register_activator (
-location,
-    object_ref ACE_ENV_ARG_PARAMETER
+    location,
+    object_ref
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::unregister_activator  (
     const char * location,
@@ -202,11 +236,15 @@ CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::unregister_activator
   ))
 {
   return this->ptr_->unregister_activator (
-location,
-    object_ref ACE_ENV_ARG_PARAMETER
+    location,
+    object_ref
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::activate_server  (
     const char * server
@@ -219,10 +257,14 @@ void POA_ImplementationRepository::Locator_tie<T>::activate_server  (
   ))
 {
   this->ptr_->activate_server (
-server ACE_ENV_ARG_PARAMETER
+    server
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 char * POA_ImplementationRepository::Locator_tie<T>::activate_server_with_startup  (
     const char * server,
@@ -236,11 +278,15 @@ char * POA_ImplementationRepository::Locator_tie<T>::activate_server_with_startu
   ))
 {
   return this->ptr_->activate_server_with_startup (
-server,
-    check_startup ACE_ENV_ARG_PARAMETER
+    server,
+    check_startup
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::register_server  (
     const char * server,
@@ -253,11 +299,15 @@ void POA_ImplementationRepository::Locator_tie<T>::register_server  (
   ))
 {
   this->ptr_->register_server (
-server,
-    options ACE_ENV_ARG_PARAMETER
+    server,
+    options
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::reregister_server  (
     const char * server,
@@ -269,11 +319,15 @@ void POA_ImplementationRepository::Locator_tie<T>::reregister_server  (
   ))
 {
   this->ptr_->reregister_server (
-server,
-    options ACE_ENV_ARG_PARAMETER
+    server,
+    options
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::remove_server  (
     const char * server
@@ -285,10 +339,14 @@ void POA_ImplementationRepository::Locator_tie<T>::remove_server  (
   ))
 {
   this->ptr_->remove_server (
-server ACE_ENV_ARG_PARAMETER
+    server
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::shutdown_server  (
     const char * server
@@ -300,10 +358,14 @@ void POA_ImplementationRepository::Locator_tie<T>::shutdown_server  (
   ))
 {
   this->ptr_->shutdown_server (
-server ACE_ENV_ARG_PARAMETER
+    server
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 char * POA_ImplementationRepository::Locator_tie<T>::server_is_running  (
     const char * server,
@@ -317,12 +379,16 @@ char * POA_ImplementationRepository::Locator_tie<T>::server_is_running  (
   ))
 {
   return this->ptr_->server_is_running (
-server,
+    server,
     addr,
-    server_object ACE_ENV_ARG_PARAMETER
+    server_object
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down  (
     const char * server
@@ -334,10 +400,14 @@ void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down  (
   ))
 {
   this->ptr_->server_is_shutting_down (
-server ACE_ENV_ARG_PARAMETER
+    server
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::find  (
     const char * server,
@@ -350,11 +420,15 @@ void POA_ImplementationRepository::Locator_tie<T>::find  (
   ))
 {
   this->ptr_->find (
-server,
-    info ACE_ENV_ARG_PARAMETER
+    server,
+    info
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Locator_tie<T>::list  (
     CORBA::ULong how_many,
@@ -367,9 +441,10 @@ void POA_ImplementationRepository::Locator_tie<T>::list  (
   ))
 {
   this->ptr_->list (
-how_many,
+    how_many,
     server_list,
-    server_iterator ACE_ENV_ARG_PARAMETER
+    server_iterator
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index dba4a50a85b..1cd5f7f2dc6 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -20,7 +20,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:314
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
 #include "ImplRepoC.h"
@@ -45,7 +45,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int ImplementationRepository::ServerObject::_tao_class_id = 0;
 
@@ -92,8 +92,17 @@ tao_ImplementationRepository_ServerObject_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_ImplementationRepository_ServerObject_marshal (
+    ImplementationRepository::ServerObject_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // ImplementationRepository::ServerObject_var
@@ -143,7 +152,7 @@ ImplementationRepository::ServerObject_var::operator const ::ImplementationRepos
   return this->ptr_;
 }
 
-ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast
+ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -219,7 +228,7 @@ ImplementationRepository::ServerObject_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // ImplementationRepository::ServerObject_out
@@ -281,12 +290,12 @@ ImplementationRepository::ServerObject_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ClientRequestInfo_i
 {
@@ -298,10 +307,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -309,14 +318,14 @@ public:
     TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -329,7 +338,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (ACE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -341,11 +350,11 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (AC
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -354,14 +363,14 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_EN
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ClientRequestInfo_i
 {
@@ -373,10 +382,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -384,14 +393,14 @@ public:
     TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -404,7 +413,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -416,11 +425,11 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -429,7 +438,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (AC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -438,10 +447,10 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (AC
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 ImplementationRepository::_TAO_ServerObject_Proxy_Impl::_TAO_ServerObject_Proxy_Impl (void)
@@ -453,7 +462,7 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::_TAO_ServerObject
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
     CORBA::Object *_collocated_tao_target_
@@ -464,12 +473,12 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "ping",
@@ -477,22 +486,22 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping _tao_ri (
           &_tao_call,
@@ -500,14 +509,14 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -515,15 +524,15 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -533,7 +542,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
             );
           TAO_INTERCEPTOR_CHECK;
 
-
+          
           _invoke_status =
             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -556,11 +565,11 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -576,61 +585,61 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
     CORBA::Object *_collocated_tao_target_
@@ -641,12 +650,12 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown",
@@ -654,22 +663,22 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown _tao_ri (
           &_tao_call,
@@ -677,14 +686,14 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -692,15 +701,15 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -710,7 +719,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
             );
           TAO_INTERCEPTOR_CHECK;
 
-
+          
           _invoke_status =
             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -733,11 +742,11 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -753,65 +762,65 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -858,8 +867,8 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:225
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 ImplementationRepository::ServerObject::ServerObject (int collocated)
 {
@@ -880,7 +889,7 @@ ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_se
 ImplementationRepository::ServerObject::~ServerObject (void)
 {}
 
-void
+void 
 ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerObject *tmp = ACE_static_cast (ServerObject *, _tao_void_pointer);
@@ -897,7 +906,7 @@ ImplementationRepository::ServerObject::_narrow (
     {
       return ServerObject::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -906,17 +915,17 @@ ImplementationRepository::ServerObject::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ServerObject::_nil ());
-
+      
       if (is_a == 0)
         {
           return ServerObject::_nil ();
         }
     }
-
+  
   return ServerObject::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-ImplementationRepository::ServerObject_ptr
+ImplementationRepository::ServerObject_ptr 
 ImplementationRepository::ServerObject::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -926,18 +935,18 @@ ImplementationRepository::ServerObject::_unchecked_narrow (
     {
       return ServerObject::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-
+      
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-
+      
       ServerObject_ptr default_proxy = ServerObject::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -955,7 +964,7 @@ ImplementationRepository::ServerObject::_unchecked_narrow (
               ServerObject::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -968,10 +977,10 @@ ImplementationRepository::ServerObject::_unchecked_narrow (
               ServerObject::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
       ACE_reinterpret_cast (
           ServerObject_ptr,
@@ -991,7 +1000,7 @@ ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1015,13 +1024,18 @@ ImplementationRepository::ServerObject::_is_a (
       return 1; // success using local knowledge
     }
   else
-    return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (value ACE_ENV_ARG_PARAMETER);
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
 }
 
 void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::ImplementationRepository, ServerObject)::_tao_class_id)
@@ -1040,12 +1054,12 @@ void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t t
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -1055,7 +1069,7 @@ const char* ImplementationRepository::ServerObject::_interface_repository_id (vo
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void ImplementationRepository::ServerObject::ping (
     ACE_ENV_SINGLE_ARG_DECL
@@ -1064,10 +1078,10 @@ void ImplementationRepository::ServerObject::ping (
     CORBA::SystemException
   ))
 {
-  _TAO_ServerObject_Proxy_Impl &proxy =
+  _TAO_ServerObject_Proxy_Impl &proxy = 
     this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.ping (
       this
       ACE_ENV_ARG_PARAMETER
@@ -1075,7 +1089,7 @@ void ImplementationRepository::ServerObject::ping (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void ImplementationRepository::ServerObject::shutdown (
     ACE_ENV_SINGLE_ARG_DECL
@@ -1084,10 +1098,10 @@ void ImplementationRepository::ServerObject::shutdown (
     CORBA::SystemException
   ))
 {
-  _TAO_ServerObject_Proxy_Impl &proxy =
+  _TAO_ServerObject_Proxy_Impl &proxy = 
     this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.shutdown (
       this
       ACE_ENV_ARG_PARAMETER
@@ -1095,30 +1109,30 @@ void ImplementationRepository::ServerObject::shutdown (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_ServerObject[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x7665724f),
-  ACE_NTOHL (0x626a6563),
-  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x7665724f), 
+  ACE_NTOHL (0x626a6563), 
+  ACE_NTOHL (0x743a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/ServerObject:1.0
-  13,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724f62),
-  ACE_NTOHL (0x6a656374),
+    13,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724f62), 
+  ACE_NTOHL (0x6a656374), 
   ACE_NTOHL (0x0),  // name = ServerObject
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerObject (
     CORBA::tk_objref,
@@ -1137,8 +1151,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// be/be_visitor_exception/exception_cs.cpp:63
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
   : CORBA::UserException (
@@ -1219,7 +1233,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1232,7 +1246,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1243,33 +1257,33 @@ CORBA::TypeCode_ptr ImplementationRepository::AlreadyRegistered::_type (void) co
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_AlreadyRegistered[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f416c72),
-  ACE_NTOHL (0x65616479),
-  ACE_NTOHL (0x52656769),
-  ACE_NTOHL (0x73746572),
-  ACE_NTOHL (0x65643a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f416c72), 
+  ACE_NTOHL (0x65616479), 
+  ACE_NTOHL (0x52656769), 
+  ACE_NTOHL (0x73746572), 
+  ACE_NTOHL (0x65643a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/AlreadyRegistered:1.0
-  18,
-  ACE_NTOHL (0x416c7265),
-  ACE_NTOHL (0x61647952),
-  ACE_NTOHL (0x65676973),
-  ACE_NTOHL (0x74657265),
+    18,
+  ACE_NTOHL (0x416c7265), 
+  ACE_NTOHL (0x61647952), 
+  ACE_NTOHL (0x65676973), 
+  ACE_NTOHL (0x74657265), 
   ACE_NTOHL (0x64000000),  // name = AlreadyRegistered
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_AlreadyRegistered (
     CORBA::tk_except,
@@ -1288,8 +1302,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// be/be_visitor_exception/exception_cs.cpp:63
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::CannotActivate::CannotActivate (void)
   : CORBA::UserException (
@@ -1372,7 +1386,7 @@ void ImplementationRepository::CannotActivate::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1385,19 +1399,18 @@ void ImplementationRepository::CannotActivate::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/exception_ctor.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
 
 ImplementationRepository::CannotActivate::CannotActivate (
     const char * _tao_reason
-  )
-  : CORBA::UserException (
+  )  : CORBA::UserException (
         "IDL:ImplementationRepository/CannotActivate:1.0",
         "CannotActivate"
       )
@@ -1412,34 +1425,34 @@ CORBA::TypeCode_ptr ImplementationRepository::CannotActivate::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_CannotActivate[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f43616e),
-  ACE_NTOHL (0x6e6f7441),
-  ACE_NTOHL (0x63746976),
-  ACE_NTOHL (0x6174653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f43616e), 
+  ACE_NTOHL (0x6e6f7441), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x6174653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/CannotActivate:1.0
-  15,
-  ACE_NTOHL (0x43616e6e),
-  ACE_NTOHL (0x6f744163),
-  ACE_NTOHL (0x74697661),
+    15,
+  ACE_NTOHL (0x43616e6e), 
+  ACE_NTOHL (0x6f744163), 
+  ACE_NTOHL (0x74697661), 
   ACE_NTOHL (0x74650000),  // name = CannotActivate
   1, // member count
-  7,
-  ACE_NTOHL (0x72656173),
+    7,
+  ACE_NTOHL (0x72656173), 
   ACE_NTOHL (0x6f6e0000),  // name = reason
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -1460,8 +1473,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// be/be_visitor_exception/exception_cs.cpp:63
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::NotFound::NotFound (void)
   : CORBA::UserException (
@@ -1542,7 +1555,7 @@ void ImplementationRepository::NotFound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1555,7 +1568,7 @@ void ImplementationRepository::NotFound::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1566,29 +1579,29 @@ CORBA::TypeCode_ptr ImplementationRepository::NotFound::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_NotFound[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f4e6f74),
-  ACE_NTOHL (0x466f756e),
-  ACE_NTOHL (0x643a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f4e6f74), 
+  ACE_NTOHL (0x466f756e), 
+  ACE_NTOHL (0x643a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/NotFound:1.0
-  9,
-  ACE_NTOHL (0x4e6f7446),
-  ACE_NTOHL (0x6f756e64),
+    9,
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
   ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_NotFound (
     CORBA::tk_except,
@@ -1608,42 +1621,42 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f456e76),
-  ACE_NTOHL (0x69726f6e),
-  ACE_NTOHL (0x6d656e74),
-  ACE_NTOHL (0x56617269),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f456e76), 
+  ACE_NTOHL (0x69726f6e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x56617269), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-  20,
-  ACE_NTOHL (0x456e7669),
-  ACE_NTOHL (0x726f6e6d),
-  ACE_NTOHL (0x656e7456),
-  ACE_NTOHL (0x61726961),
+    20,
+  ACE_NTOHL (0x456e7669), 
+  ACE_NTOHL (0x726f6e6d), 
+  ACE_NTOHL (0x656e7456), 
+  ACE_NTOHL (0x61726961), 
   ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
   2, // member count
-  5,
-  ACE_NTOHL (0x6e616d65),
+    5,
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   6,
-  ACE_NTOHL (0x76616c75),
+  ACE_NTOHL (0x76616c75), 
   ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -1664,8 +1677,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
 
 void ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -1674,27 +1687,27 @@ void ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_Address[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f416464),
-  ACE_NTOHL (0x72657373),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f416464), 
+  ACE_NTOHL (0x72657373), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
-  8,
-  ACE_NTOHL (0x41646472),
+    8,
+  ACE_NTOHL (0x41646472), 
   ACE_NTOHL (0x65737300),  // name = Address
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -1715,8 +1728,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// 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)
 
@@ -1728,23 +1741,23 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
 {
   ImplementationRepository::EnvironmentVariable* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
     {
       ImplementationRepository::EnvironmentVariable *old =
         ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
           tmp[i] = old[i];
         }
-
+      
       if (this->release_)
         {
           _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (old);
         }
     }
-
+  
   this->buffer_ = tmp;
 }
 
@@ -1755,12 +1768,12 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
     {
       return;
     }
-
+  
   ImplementationRepository::EnvironmentVariable *tmp =
     ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
 ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void)
 {
@@ -1769,13 +1782,13 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
 
 // *************************************************************
 // ImplementationRepository::EnvironmentList
@@ -1785,14 +1798,14 @@ ImplementationRepository::EnvironmentList::EnvironmentList (void)
 {}
 
 ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max)
-  :
+  : 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 
@@ -1802,26 +1815,26 @@ ImplementationRepository::EnvironmentList::EnvironmentList (
     ImplementationRepository::EnvironmentVariable *buffer,
     CORBA::Boolean release
   )
-  :
+  : 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 
 ImplementationRepository::EnvironmentList::EnvironmentList (const EnvironmentList &seq)
-  :
+  : 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 
@@ -1837,67 +1850,67 @@ void ImplementationRepository::EnvironmentList::_tao_any_destructor (void *_tao_
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f456e76),
-  ACE_NTOHL (0x69726f6e),
-  ACE_NTOHL (0x6d656e74),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f456e76), 
+  ACE_NTOHL (0x69726f6e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
-  16,
-  ACE_NTOHL (0x456e7669),
-  ACE_NTOHL (0x726f6e6d),
-  ACE_NTOHL (0x656e744c),
+    16,
+  ACE_NTOHL (0x456e7669), 
+  ACE_NTOHL (0x726f6e6d), 
+  ACE_NTOHL (0x656e744c), 
   ACE_NTOHL (0x69737400),  // name = EnvironmentList
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   148, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     132, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       53,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f456e76),
-      ACE_NTOHL (0x69726f6e),
-      ACE_NTOHL (0x6d656e74),
-      ACE_NTOHL (0x56617269),
-      ACE_NTOHL (0x61626c65),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f456e76), 
+      ACE_NTOHL (0x69726f6e), 
+      ACE_NTOHL (0x6d656e74), 
+      ACE_NTOHL (0x56617269), 
+      ACE_NTOHL (0x61626c65), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-      20,
-      ACE_NTOHL (0x456e7669),
-      ACE_NTOHL (0x726f6e6d),
-      ACE_NTOHL (0x656e7456),
-      ACE_NTOHL (0x61726961),
+            20,
+      ACE_NTOHL (0x456e7669), 
+      ACE_NTOHL (0x726f6e6d), 
+      ACE_NTOHL (0x656e7456), 
+      ACE_NTOHL (0x61726961), 
       ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
       2, // member count
-      5,
-      ACE_NTOHL (0x6e616d65),
+            5,
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       6,
-      ACE_NTOHL (0x76616c75),
+      ACE_NTOHL (0x76616c75), 
       ACE_NTOHL (0x65000000),  // name = value
-      CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
 
     0U,
@@ -1922,45 +1935,45 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_ActivationMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f416374),
-  ACE_NTOHL (0x69766174),
-  ACE_NTOHL (0x696f6e4d),
-  ACE_NTOHL (0x6f64653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f416374), 
+  ACE_NTOHL (0x69766174), 
+  ACE_NTOHL (0x696f6e4d), 
+  ACE_NTOHL (0x6f64653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
-15,
-  ACE_NTOHL (0x41637469),
-  ACE_NTOHL (0x76617469),
-  ACE_NTOHL (0x6f6e4d6f),
+  15,
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76617469), 
+  ACE_NTOHL (0x6f6e4d6f), 
   ACE_NTOHL (0x64650000),  // name = ActivationMode
   4, // member count
-7,
-  ACE_NTOHL (0x4e4f524d),
+  7,
+  ACE_NTOHL (0x4e4f524d), 
   ACE_NTOHL (0x414c0000),  // name = NORMAL
-7,
-  ACE_NTOHL (0x4d414e55),
+  7,
+  ACE_NTOHL (0x4d414e55), 
   ACE_NTOHL (0x414c0000),  // name = MANUAL
-11,
-  ACE_NTOHL (0x5045525f),
-  ACE_NTOHL (0x434c4945),
+  11,
+  ACE_NTOHL (0x5045525f), 
+  ACE_NTOHL (0x434c4945), 
   ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
-11,
-  ACE_NTOHL (0x4155544f),
-  ACE_NTOHL (0x5f535441),
+  11,
+  ACE_NTOHL (0x4155544f), 
+  ACE_NTOHL (0x5f535441), 
   ACE_NTOHL (0x52540000),  // name = AUTO_START
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ActivationMode (
     CORBA::tk_enum,
@@ -1980,159 +1993,159 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f537461),
-  ACE_NTOHL (0x72747570),
-  ACE_NTOHL (0x4f707469),
-  ACE_NTOHL (0x6f6e733a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f537461), 
+  ACE_NTOHL (0x72747570), 
+  ACE_NTOHL (0x4f707469), 
+  ACE_NTOHL (0x6f6e733a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
-  15,
-  ACE_NTOHL (0x53746172),
-  ACE_NTOHL (0x7475704f),
-  ACE_NTOHL (0x7074696f),
+    15,
+  ACE_NTOHL (0x53746172), 
+  ACE_NTOHL (0x7475704f), 
+  ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e730000),  // name = StartupOptions
   5, // member count
-  13,
-  ACE_NTOHL (0x636f6d6d),
-  ACE_NTOHL (0x616e645f),
-  ACE_NTOHL (0x6c696e65),
+    13,
+  ACE_NTOHL (0x636f6d6d), 
+  ACE_NTOHL (0x616e645f), 
+  ACE_NTOHL (0x6c696e65), 
   ACE_NTOHL (0x0),  // name = command_line
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   12,
-  ACE_NTOHL (0x656e7669),
-  ACE_NTOHL (0x726f6e6d),
+  ACE_NTOHL (0x656e7669), 
+  ACE_NTOHL (0x726f6e6d), 
   ACE_NTOHL (0x656e7400),  // name = environment
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   236, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     49,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f456e76),
-    ACE_NTOHL (0x69726f6e),
-    ACE_NTOHL (0x6d656e74),
-    ACE_NTOHL (0x4c697374),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f456e76), 
+    ACE_NTOHL (0x69726f6e), 
+    ACE_NTOHL (0x6d656e74), 
+    ACE_NTOHL (0x4c697374), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
-    16,
-    ACE_NTOHL (0x456e7669),
-    ACE_NTOHL (0x726f6e6d),
-    ACE_NTOHL (0x656e744c),
+        16,
+    ACE_NTOHL (0x456e7669), 
+    ACE_NTOHL (0x726f6e6d), 
+    ACE_NTOHL (0x656e744c), 
     ACE_NTOHL (0x69737400),  // name = EnvironmentList
-    CORBA::tk_sequence, // typecode kind
+        CORBA::tk_sequence, // typecode kind
     148, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
       132, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         53,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x496d706c),
-        ACE_NTOHL (0x656d656e),
-        ACE_NTOHL (0x74617469),
-        ACE_NTOHL (0x6f6e5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x2f456e76),
-        ACE_NTOHL (0x69726f6e),
-        ACE_NTOHL (0x6d656e74),
-        ACE_NTOHL (0x56617269),
-        ACE_NTOHL (0x61626c65),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x496d706c), 
+        ACE_NTOHL (0x656d656e), 
+        ACE_NTOHL (0x74617469), 
+        ACE_NTOHL (0x6f6e5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x2f456e76), 
+        ACE_NTOHL (0x69726f6e), 
+        ACE_NTOHL (0x6d656e74), 
+        ACE_NTOHL (0x56617269), 
+        ACE_NTOHL (0x61626c65), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-        20,
-        ACE_NTOHL (0x456e7669),
-        ACE_NTOHL (0x726f6e6d),
-        ACE_NTOHL (0x656e7456),
-        ACE_NTOHL (0x61726961),
+                20,
+        ACE_NTOHL (0x456e7669), 
+        ACE_NTOHL (0x726f6e6d), 
+        ACE_NTOHL (0x656e7456), 
+        ACE_NTOHL (0x61726961), 
         ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
         2, // member count
-        5,
-        ACE_NTOHL (0x6e616d65),
+                5,
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
         6,
-        ACE_NTOHL (0x76616c75),
+        ACE_NTOHL (0x76616c75), 
         ACE_NTOHL (0x65000000),  // name = value
-        CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   18,
-  ACE_NTOHL (0x776f726b),
-  ACE_NTOHL (0x696e675f),
-  ACE_NTOHL (0x64697265),
-  ACE_NTOHL (0x63746f72),
+  ACE_NTOHL (0x776f726b), 
+  ACE_NTOHL (0x696e675f), 
+  ACE_NTOHL (0x64697265), 
+  ACE_NTOHL (0x63746f72), 
   ACE_NTOHL (0x79000000),  // name = working_directory
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   11,
-  ACE_NTOHL (0x61637469),
-  ACE_NTOHL (0x76617469),
+  ACE_NTOHL (0x61637469), 
+  ACE_NTOHL (0x76617469), 
   ACE_NTOHL (0x6f6e0000),  // name = activation
-  CORBA::tk_enum, // typecode kind
+    CORBA::tk_enum, // typecode kind
   136, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     48,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f416374),
-    ACE_NTOHL (0x69766174),
-    ACE_NTOHL (0x696f6e4d),
-    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f416374), 
+    ACE_NTOHL (0x69766174), 
+    ACE_NTOHL (0x696f6e4d), 
+    ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
-15,
-    ACE_NTOHL (0x41637469),
-    ACE_NTOHL (0x76617469),
-    ACE_NTOHL (0x6f6e4d6f),
+    15,
+    ACE_NTOHL (0x41637469), 
+    ACE_NTOHL (0x76617469), 
+    ACE_NTOHL (0x6f6e4d6f), 
     ACE_NTOHL (0x64650000),  // name = ActivationMode
     4, // member count
-7,
-    ACE_NTOHL (0x4e4f524d),
+    7,
+    ACE_NTOHL (0x4e4f524d), 
     ACE_NTOHL (0x414c0000),  // name = NORMAL
-7,
-    ACE_NTOHL (0x4d414e55),
+    7,
+    ACE_NTOHL (0x4d414e55), 
     ACE_NTOHL (0x414c0000),  // name = MANUAL
-11,
-    ACE_NTOHL (0x5045525f),
-    ACE_NTOHL (0x434c4945),
+    11,
+    ACE_NTOHL (0x5045525f), 
+    ACE_NTOHL (0x434c4945), 
     ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
-11,
-    ACE_NTOHL (0x4155544f),
-    ACE_NTOHL (0x5f535441),
+    11,
+    ACE_NTOHL (0x4155544f), 
+    ACE_NTOHL (0x5f535441), 
     ACE_NTOHL (0x52540000),  // name = AUTO_START
-
+    
   9,
-  ACE_NTOHL (0x6c6f6361),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x6c6f6361), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = location
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -2153,8 +2166,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
 
 void ImplementationRepository::StartupOptions::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -2163,223 +2176,223 @@ void ImplementationRepository::StartupOptions::_tao_any_destructor (void *_tao_v
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x76657249),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x76657249), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
-  18,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6572496e),
-  ACE_NTOHL (0x666f726d),
-  ACE_NTOHL (0x6174696f),
+    18,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e000000),  // name = ServerInformation
   4, // member count
-  15,
-  ACE_NTOHL (0x6c6f6769),
-  ACE_NTOHL (0x63616c5f),
-  ACE_NTOHL (0x73657276),
+    15,
+  ACE_NTOHL (0x6c6f6769), 
+  ACE_NTOHL (0x63616c5f), 
+  ACE_NTOHL (0x73657276), 
   ACE_NTOHL (0x65720000),  // name = logical_server
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   7,
-  ACE_NTOHL (0x73657276),
+  ACE_NTOHL (0x73657276), 
   ACE_NTOHL (0x65720000),  // name = server
-  CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   8,
-  ACE_NTOHL (0x73746172),
+  ACE_NTOHL (0x73746172), 
   ACE_NTOHL (0x74757000),  // name = startup
-  CORBA::tk_struct, // typecode kind
+    CORBA::tk_struct, // typecode kind
   584, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     48,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f537461),
-    ACE_NTOHL (0x72747570),
-    ACE_NTOHL (0x4f707469),
-    ACE_NTOHL (0x6f6e733a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f537461), 
+    ACE_NTOHL (0x72747570), 
+    ACE_NTOHL (0x4f707469), 
+    ACE_NTOHL (0x6f6e733a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
-    15,
-    ACE_NTOHL (0x53746172),
-    ACE_NTOHL (0x7475704f),
-    ACE_NTOHL (0x7074696f),
+        15,
+    ACE_NTOHL (0x53746172), 
+    ACE_NTOHL (0x7475704f), 
+    ACE_NTOHL (0x7074696f), 
     ACE_NTOHL (0x6e730000),  // name = StartupOptions
     5, // member count
-    13,
-    ACE_NTOHL (0x636f6d6d),
-    ACE_NTOHL (0x616e645f),
-    ACE_NTOHL (0x6c696e65),
+        13,
+    ACE_NTOHL (0x636f6d6d), 
+    ACE_NTOHL (0x616e645f), 
+    ACE_NTOHL (0x6c696e65), 
     ACE_NTOHL (0x0),  // name = command_line
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
     12,
-    ACE_NTOHL (0x656e7669),
-    ACE_NTOHL (0x726f6e6d),
+    ACE_NTOHL (0x656e7669), 
+    ACE_NTOHL (0x726f6e6d), 
     ACE_NTOHL (0x656e7400),  // name = environment
-    CORBA::tk_alias, // typecode kind for typedefs
+        CORBA::tk_alias, // typecode kind for typedefs
     236, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       49,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f456e76),
-      ACE_NTOHL (0x69726f6e),
-      ACE_NTOHL (0x6d656e74),
-      ACE_NTOHL (0x4c697374),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f456e76), 
+      ACE_NTOHL (0x69726f6e), 
+      ACE_NTOHL (0x6d656e74), 
+      ACE_NTOHL (0x4c697374), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
-      16,
-      ACE_NTOHL (0x456e7669),
-      ACE_NTOHL (0x726f6e6d),
-      ACE_NTOHL (0x656e744c),
+            16,
+      ACE_NTOHL (0x456e7669), 
+      ACE_NTOHL (0x726f6e6d), 
+      ACE_NTOHL (0x656e744c), 
       ACE_NTOHL (0x69737400),  // name = EnvironmentList
-      CORBA::tk_sequence, // typecode kind
+            CORBA::tk_sequence, // typecode kind
       148, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_struct, // typecode kind
         132, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           53,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x496d706c),
-          ACE_NTOHL (0x656d656e),
-          ACE_NTOHL (0x74617469),
-          ACE_NTOHL (0x6f6e5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x2f456e76),
-          ACE_NTOHL (0x69726f6e),
-          ACE_NTOHL (0x6d656e74),
-          ACE_NTOHL (0x56617269),
-          ACE_NTOHL (0x61626c65),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x496d706c), 
+          ACE_NTOHL (0x656d656e), 
+          ACE_NTOHL (0x74617469), 
+          ACE_NTOHL (0x6f6e5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x2f456e76), 
+          ACE_NTOHL (0x69726f6e), 
+          ACE_NTOHL (0x6d656e74), 
+          ACE_NTOHL (0x56617269), 
+          ACE_NTOHL (0x61626c65), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-          20,
-          ACE_NTOHL (0x456e7669),
-          ACE_NTOHL (0x726f6e6d),
-          ACE_NTOHL (0x656e7456),
-          ACE_NTOHL (0x61726961),
+                    20,
+          ACE_NTOHL (0x456e7669), 
+          ACE_NTOHL (0x726f6e6d), 
+          ACE_NTOHL (0x656e7456), 
+          ACE_NTOHL (0x61726961), 
           ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
           2, // member count
-          5,
-          ACE_NTOHL (0x6e616d65),
+                    5,
+          ACE_NTOHL (0x6e616d65), 
           ACE_NTOHL (0x0),  // name = name
-          CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
           6,
-          ACE_NTOHL (0x76616c75),
+          ACE_NTOHL (0x76616c75), 
           ACE_NTOHL (0x65000000),  // name = value
-          CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         0U,
 
 
     18,
-    ACE_NTOHL (0x776f726b),
-    ACE_NTOHL (0x696e675f),
-    ACE_NTOHL (0x64697265),
-    ACE_NTOHL (0x63746f72),
+    ACE_NTOHL (0x776f726b), 
+    ACE_NTOHL (0x696e675f), 
+    ACE_NTOHL (0x64697265), 
+    ACE_NTOHL (0x63746f72), 
     ACE_NTOHL (0x79000000),  // name = working_directory
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
     11,
-    ACE_NTOHL (0x61637469),
-    ACE_NTOHL (0x76617469),
+    ACE_NTOHL (0x61637469), 
+    ACE_NTOHL (0x76617469), 
     ACE_NTOHL (0x6f6e0000),  // name = activation
-    CORBA::tk_enum, // typecode kind
+        CORBA::tk_enum, // typecode kind
     136, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
       48,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f416374),
-      ACE_NTOHL (0x69766174),
-      ACE_NTOHL (0x696f6e4d),
-      ACE_NTOHL (0x6f64653a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f416374), 
+      ACE_NTOHL (0x69766174), 
+      ACE_NTOHL (0x696f6e4d), 
+      ACE_NTOHL (0x6f64653a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
-15,
-      ACE_NTOHL (0x41637469),
-      ACE_NTOHL (0x76617469),
-      ACE_NTOHL (0x6f6e4d6f),
+      15,
+      ACE_NTOHL (0x41637469), 
+      ACE_NTOHL (0x76617469), 
+      ACE_NTOHL (0x6f6e4d6f), 
       ACE_NTOHL (0x64650000),  // name = ActivationMode
       4, // member count
-7,
-      ACE_NTOHL (0x4e4f524d),
+      7,
+      ACE_NTOHL (0x4e4f524d), 
       ACE_NTOHL (0x414c0000),  // name = NORMAL
-7,
-      ACE_NTOHL (0x4d414e55),
+      7,
+      ACE_NTOHL (0x4d414e55), 
       ACE_NTOHL (0x414c0000),  // name = MANUAL
-11,
-      ACE_NTOHL (0x5045525f),
-      ACE_NTOHL (0x434c4945),
+      11,
+      ACE_NTOHL (0x5045525f), 
+      ACE_NTOHL (0x434c4945), 
       ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
-11,
-      ACE_NTOHL (0x4155544f),
-      ACE_NTOHL (0x5f535441),
+      11,
+      ACE_NTOHL (0x4155544f), 
+      ACE_NTOHL (0x5f535441), 
       ACE_NTOHL (0x52540000),  // name = AUTO_START
-
+      
     9,
-    ACE_NTOHL (0x6c6f6361),
-    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x6c6f6361), 
+    ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x0),  // name = location
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   9,
-  ACE_NTOHL (0x6c6f6361),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x6c6f6361), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = location
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f416464),
-    ACE_NTOHL (0x72657373),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f416464), 
+    ACE_NTOHL (0x72657373), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
-    8,
-    ACE_NTOHL (0x41646472),
+        8,
+    ACE_NTOHL (0x41646472), 
     ACE_NTOHL (0x65737300),  // name = Address
-    CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -2401,8 +2414,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
 
 void ImplementationRepository::ServerInformation::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -2410,8 +2423,8 @@ void ImplementationRepository::ServerInformation::_tao_any_destructor (void *_ta
   delete tmp;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// 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)
 
@@ -2423,23 +2436,23 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
 {
   ImplementationRepository::ServerInformation* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
     {
       ImplementationRepository::ServerInformation *old =
         ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
           tmp[i] = old[i];
         }
-
+      
       if (this->release_)
         {
           _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (old);
         }
     }
-
+  
   this->buffer_ = tmp;
 }
 
@@ -2450,12 +2463,12 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
     {
       return;
     }
-
+  
   ImplementationRepository::ServerInformation *tmp =
     ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
 ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void)
 {
@@ -2464,13 +2477,13 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
 
 // *************************************************************
 // ImplementationRepository::ServerInformationList
@@ -2480,14 +2493,14 @@ ImplementationRepository::ServerInformationList::ServerInformationList (void)
 {}
 
 ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max)
-  :
+  : 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 
@@ -2497,26 +2510,26 @@ ImplementationRepository::ServerInformationList::ServerInformationList (
     ImplementationRepository::ServerInformation *buffer,
     CORBA::Boolean release
   )
-  :
+  : 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 
 ImplementationRepository::ServerInformationList::ServerInformationList (const ServerInformationList &seq)
-  :
+  : 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 
@@ -2532,251 +2545,251 @@ void ImplementationRepository::ServerInformationList::_tao_any_destructor (void
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x76657249),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
-  ACE_NTOHL (0x6f6e4c69),
-  ACE_NTOHL (0x73743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x76657249), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e4c69), 
+  ACE_NTOHL (0x73743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationList:1.0
-  22,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6572496e),
-  ACE_NTOHL (0x666f726d),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e4c6973),
+    22,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e4c6973), 
   ACE_NTOHL (0x74000000),  // name = ServerInformationList
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   852, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     836, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       51,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f536572),
-      ACE_NTOHL (0x76657249),
-      ACE_NTOHL (0x6e666f72),
-      ACE_NTOHL (0x6d617469),
-      ACE_NTOHL (0x6f6e3a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f536572), 
+      ACE_NTOHL (0x76657249), 
+      ACE_NTOHL (0x6e666f72), 
+      ACE_NTOHL (0x6d617469), 
+      ACE_NTOHL (0x6f6e3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
-      18,
-      ACE_NTOHL (0x53657276),
-      ACE_NTOHL (0x6572496e),
-      ACE_NTOHL (0x666f726d),
-      ACE_NTOHL (0x6174696f),
+            18,
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x6572496e), 
+      ACE_NTOHL (0x666f726d), 
+      ACE_NTOHL (0x6174696f), 
       ACE_NTOHL (0x6e000000),  // name = ServerInformation
       4, // member count
-      15,
-      ACE_NTOHL (0x6c6f6769),
-      ACE_NTOHL (0x63616c5f),
-      ACE_NTOHL (0x73657276),
+            15,
+      ACE_NTOHL (0x6c6f6769), 
+      ACE_NTOHL (0x63616c5f), 
+      ACE_NTOHL (0x73657276), 
       ACE_NTOHL (0x65720000),  // name = logical_server
-      CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       7,
-      ACE_NTOHL (0x73657276),
+      ACE_NTOHL (0x73657276), 
       ACE_NTOHL (0x65720000),  // name = server
-      CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       8,
-      ACE_NTOHL (0x73746172),
+      ACE_NTOHL (0x73746172), 
       ACE_NTOHL (0x74757000),  // name = startup
-      CORBA::tk_struct, // typecode kind
+            CORBA::tk_struct, // typecode kind
       584, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         48,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x496d706c),
-        ACE_NTOHL (0x656d656e),
-        ACE_NTOHL (0x74617469),
-        ACE_NTOHL (0x6f6e5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x2f537461),
-        ACE_NTOHL (0x72747570),
-        ACE_NTOHL (0x4f707469),
-        ACE_NTOHL (0x6f6e733a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x496d706c), 
+        ACE_NTOHL (0x656d656e), 
+        ACE_NTOHL (0x74617469), 
+        ACE_NTOHL (0x6f6e5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x2f537461), 
+        ACE_NTOHL (0x72747570), 
+        ACE_NTOHL (0x4f707469), 
+        ACE_NTOHL (0x6f6e733a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
-        15,
-        ACE_NTOHL (0x53746172),
-        ACE_NTOHL (0x7475704f),
-        ACE_NTOHL (0x7074696f),
+                15,
+        ACE_NTOHL (0x53746172), 
+        ACE_NTOHL (0x7475704f), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = StartupOptions
         5, // member count
-        13,
-        ACE_NTOHL (0x636f6d6d),
-        ACE_NTOHL (0x616e645f),
-        ACE_NTOHL (0x6c696e65),
+                13,
+        ACE_NTOHL (0x636f6d6d), 
+        ACE_NTOHL (0x616e645f), 
+        ACE_NTOHL (0x6c696e65), 
         ACE_NTOHL (0x0),  // name = command_line
-        CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
         12,
-        ACE_NTOHL (0x656e7669),
-        ACE_NTOHL (0x726f6e6d),
+        ACE_NTOHL (0x656e7669), 
+        ACE_NTOHL (0x726f6e6d), 
         ACE_NTOHL (0x656e7400),  // name = environment
-        CORBA::tk_alias, // typecode kind for typedefs
+                CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           49,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x496d706c),
-          ACE_NTOHL (0x656d656e),
-          ACE_NTOHL (0x74617469),
-          ACE_NTOHL (0x6f6e5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x2f456e76),
-          ACE_NTOHL (0x69726f6e),
-          ACE_NTOHL (0x6d656e74),
-          ACE_NTOHL (0x4c697374),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x496d706c), 
+          ACE_NTOHL (0x656d656e), 
+          ACE_NTOHL (0x74617469), 
+          ACE_NTOHL (0x6f6e5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x2f456e76), 
+          ACE_NTOHL (0x69726f6e), 
+          ACE_NTOHL (0x6d656e74), 
+          ACE_NTOHL (0x4c697374), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
-          16,
-          ACE_NTOHL (0x456e7669),
-          ACE_NTOHL (0x726f6e6d),
-          ACE_NTOHL (0x656e744c),
+                    16,
+          ACE_NTOHL (0x456e7669), 
+          ACE_NTOHL (0x726f6e6d), 
+          ACE_NTOHL (0x656e744c), 
           ACE_NTOHL (0x69737400),  // name = EnvironmentList
-          CORBA::tk_sequence, // typecode kind
+                    CORBA::tk_sequence, // typecode kind
           148, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
             132, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               53,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x496d706c),
-              ACE_NTOHL (0x656d656e),
-              ACE_NTOHL (0x74617469),
-              ACE_NTOHL (0x6f6e5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x2f456e76),
-              ACE_NTOHL (0x69726f6e),
-              ACE_NTOHL (0x6d656e74),
-              ACE_NTOHL (0x56617269),
-              ACE_NTOHL (0x61626c65),
-              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x496d706c), 
+              ACE_NTOHL (0x656d656e), 
+              ACE_NTOHL (0x74617469), 
+              ACE_NTOHL (0x6f6e5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x2f456e76), 
+              ACE_NTOHL (0x69726f6e), 
+              ACE_NTOHL (0x6d656e74), 
+              ACE_NTOHL (0x56617269), 
+              ACE_NTOHL (0x61626c65), 
+              ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-              20,
-              ACE_NTOHL (0x456e7669),
-              ACE_NTOHL (0x726f6e6d),
-              ACE_NTOHL (0x656e7456),
-              ACE_NTOHL (0x61726961),
+                            20,
+              ACE_NTOHL (0x456e7669), 
+              ACE_NTOHL (0x726f6e6d), 
+              ACE_NTOHL (0x656e7456), 
+              ACE_NTOHL (0x61726961), 
               ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
               2, // member count
-              5,
-              ACE_NTOHL (0x6e616d65),
+                            5,
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
               6,
-              ACE_NTOHL (0x76616c75),
+              ACE_NTOHL (0x76616c75), 
               ACE_NTOHL (0x65000000),  // name = value
-              CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             0U,
 
 
         18,
-        ACE_NTOHL (0x776f726b),
-        ACE_NTOHL (0x696e675f),
-        ACE_NTOHL (0x64697265),
-        ACE_NTOHL (0x63746f72),
+        ACE_NTOHL (0x776f726b), 
+        ACE_NTOHL (0x696e675f), 
+        ACE_NTOHL (0x64697265), 
+        ACE_NTOHL (0x63746f72), 
         ACE_NTOHL (0x79000000),  // name = working_directory
-        CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
         11,
-        ACE_NTOHL (0x61637469),
-        ACE_NTOHL (0x76617469),
+        ACE_NTOHL (0x61637469), 
+        ACE_NTOHL (0x76617469), 
         ACE_NTOHL (0x6f6e0000),  // name = activation
-        CORBA::tk_enum, // typecode kind
+                CORBA::tk_enum, // typecode kind
         136, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           48,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x496d706c),
-          ACE_NTOHL (0x656d656e),
-          ACE_NTOHL (0x74617469),
-          ACE_NTOHL (0x6f6e5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x2f416374),
-          ACE_NTOHL (0x69766174),
-          ACE_NTOHL (0x696f6e4d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x496d706c), 
+          ACE_NTOHL (0x656d656e), 
+          ACE_NTOHL (0x74617469), 
+          ACE_NTOHL (0x6f6e5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x2f416374), 
+          ACE_NTOHL (0x69766174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
-15,
-          ACE_NTOHL (0x41637469),
-          ACE_NTOHL (0x76617469),
-          ACE_NTOHL (0x6f6e4d6f),
+          15,
+          ACE_NTOHL (0x41637469), 
+          ACE_NTOHL (0x76617469), 
+          ACE_NTOHL (0x6f6e4d6f), 
           ACE_NTOHL (0x64650000),  // name = ActivationMode
           4, // member count
-7,
-          ACE_NTOHL (0x4e4f524d),
+          7,
+          ACE_NTOHL (0x4e4f524d), 
           ACE_NTOHL (0x414c0000),  // name = NORMAL
-7,
-          ACE_NTOHL (0x4d414e55),
+          7,
+          ACE_NTOHL (0x4d414e55), 
           ACE_NTOHL (0x414c0000),  // name = MANUAL
-11,
-          ACE_NTOHL (0x5045525f),
-          ACE_NTOHL (0x434c4945),
+          11,
+          ACE_NTOHL (0x5045525f), 
+          ACE_NTOHL (0x434c4945), 
           ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
-11,
-          ACE_NTOHL (0x4155544f),
-          ACE_NTOHL (0x5f535441),
+          11,
+          ACE_NTOHL (0x4155544f), 
+          ACE_NTOHL (0x5f535441), 
           ACE_NTOHL (0x52540000),  // name = AUTO_START
-
+          
         9,
-        ACE_NTOHL (0x6c6f6361),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x6c6f6361), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = location
-        CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       9,
-      ACE_NTOHL (0x6c6f6361),
-      ACE_NTOHL (0x74696f6e),
+      ACE_NTOHL (0x6c6f6361), 
+      ACE_NTOHL (0x74696f6e), 
       ACE_NTOHL (0x0),  // name = location
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         41,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x496d706c),
-        ACE_NTOHL (0x656d656e),
-        ACE_NTOHL (0x74617469),
-        ACE_NTOHL (0x6f6e5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x2f416464),
-        ACE_NTOHL (0x72657373),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x496d706c), 
+        ACE_NTOHL (0x656d656e), 
+        ACE_NTOHL (0x74617469), 
+        ACE_NTOHL (0x6f6e5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x2f416464), 
+        ACE_NTOHL (0x72657373), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
-        8,
-        ACE_NTOHL (0x41646472),
+                8,
+        ACE_NTOHL (0x41646472), 
         ACE_NTOHL (0x65737300),  // name = Address
-        CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
 
@@ -2802,7 +2815,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int ImplementationRepository::Administration::_tao_class_id = 0;
 
@@ -2849,8 +2862,17 @@ tao_ImplementationRepository_Administration_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_ImplementationRepository_Administration_marshal (
+    ImplementationRepository::Administration_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // ImplementationRepository::Administration_var
@@ -2900,7 +2922,7 @@ ImplementationRepository::Administration_var::operator const ::ImplementationRep
   return this->ptr_;
 }
 
-ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast
+ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2976,7 +2998,7 @@ ImplementationRepository::Administration_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // ImplementationRepository::Administration_out
@@ -3038,12 +3060,12 @@ ImplementationRepository::Administration_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ClientRequestInfo_i
 {
@@ -3056,10 +3078,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3068,15 +3090,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
     const char * server_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server)
@@ -3090,15 +3112,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3110,15 +3132,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound,
     ImplementationRepository::_tc_CannotActivate
   };
-
+  
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -3130,7 +3152,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::e
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3139,14 +3161,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup : public TAO_ClientRequestInfo_i
 {
@@ -3160,33 +3182,33 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (char * result);
-
+    
   private:
     TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &);
     const char * server_;
     const CORBA::Long & check_startup_;
-
+    
     char * _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
       const CORBA::Long & check_startup
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server),
@@ -3201,19 +3223,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_wi
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (2);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= check_startup_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3225,15 +3247,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_wi
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound,
     ImplementationRepository::_tc_CannotActivate
   };
-
+  
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -3245,7 +3267,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_wi
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3254,22 +3276,22 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_wi
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (char * result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ClientRequestInfo_i
 {
@@ -3283,10 +3305,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3296,16 +3318,16 @@ public:
     const char * server_;
     const ImplementationRepository::StartupOptions & options_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
       const ImplementationRepository::StartupOptions & options
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server),
@@ -3320,19 +3342,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (2);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3344,14 +3366,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = 
   {
     ImplementationRepository::_tc_AlreadyRegistered
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3363,7 +3385,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::e
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3372,14 +3394,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ClientRequestInfo_i
 {
@@ -3393,10 +3415,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3406,16 +3428,16 @@ public:
     const char * server_;
     const ImplementationRepository::StartupOptions & options_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
       const ImplementationRepository::StartupOptions & options
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server),
@@ -3430,19 +3452,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (2);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3454,11 +3476,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3467,14 +3489,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ClientRequestInfo_i
 {
@@ -3487,10 +3509,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3499,15 +3521,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
     const char * server_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server)
@@ -3521,15 +3543,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arg
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3541,14 +3563,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exc
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3560,7 +3582,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exc
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3569,14 +3591,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::res
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ClientRequestInfo_i
 {
@@ -3589,10 +3611,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3601,15 +3623,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
     const char * server_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server)
@@ -3623,15 +3645,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3643,14 +3665,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3662,7 +3684,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::e
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3671,14 +3693,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ClientRequestInfo_i
 {
@@ -3693,35 +3715,35 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (char * result);
-
+    
   private:
     TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running &);
     const char * server_;
     const char * addr_;
     ImplementationRepository::ServerObject_ptr server_object_;
-
+    
     char * _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
       const char * addr,
       ImplementationRepository::ServerObject_ptr server_object
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server),
@@ -3737,23 +3759,23 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (3);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= addr_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->server_object_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3765,14 +3787,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3784,7 +3806,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3793,22 +3815,22 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ClientRequestInfo_i
 {
@@ -3821,10 +3843,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3833,15 +3855,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
     const char * server_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server)
@@ -3855,15 +3877,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3875,14 +3897,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3894,7 +3916,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3903,14 +3925,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_find : public TAO_ClientRequestInfo_i
 {
@@ -3923,10 +3945,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3935,15 +3957,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
     const char * server_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_Administration_find::TAO_ClientRequestInfo_ImplementationRepository_Administration_find (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server)
@@ -3957,15 +3979,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3977,14 +3999,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3996,7 +4018,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4005,14 +4027,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_Administration_list : public TAO_ClientRequestInfo_i
 {
@@ -4020,38 +4042,38 @@ public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::ULong & how_many
+      const CORBA::ULong & how_many      
 
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
     TAO_ClientRequestInfo_ImplementationRepository_Administration_list (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
-    const CORBA::ULong & how_many_;
+    const CORBA::ULong & how_many_;    
 
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::ULong & how_many
+      const CORBA::ULong & how_many      
 
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      how_many_ (how_many)
+      how_many_ (how_many)  
 
 {}
 
@@ -4063,15 +4085,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+    
 
   return safe_parameter_list._retn ();
 }
@@ -4084,11 +4106,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4097,7 +4119,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -4106,10 +4128,10 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (ACE_
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 ImplementationRepository::_TAO_Administration_Proxy_Impl::_TAO_Administration_Proxy_Impl (void)
@@ -4121,7 +4143,7 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::_TAO_Administra
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server (
     CORBA::Object *_collocated_tao_target_,
@@ -4134,7 +4156,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
     , ImplementationRepository::CannotActivate
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -4147,12 +4169,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
   };
 
 TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "activate_server",
@@ -4160,22 +4182,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server _tao_ri (
           &_tao_call,
@@ -4184,14 +4206,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4199,15 +4221,15 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -4218,18 +4240,18 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server)
               ))
             {
               TAO_INTERCEPTOR_THROW (
                   CORBA::MARSHAL (
-
+                      
                     )
                 );
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -4252,11 +4274,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -4272,61 +4294,61 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server_with_startup (
     CORBA::Object *_collocated_tao_target_,
@@ -4340,7 +4362,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate
     , ImplementationRepository::CannotActivate
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -4354,12 +4376,12 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate
 
 CORBA::String_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "activate_server_with_startup",
@@ -4367,22 +4389,22 @@ CORBA::String_var _tao_retval;
       2,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup _tao_ri (
           &_tao_call,
@@ -4392,14 +4414,14 @@ CORBA::String_var _tao_retval;
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4407,15 +4429,15 @@ CORBA::String_var _tao_retval;
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
@@ -4426,7 +4448,7 @@ CORBA::String_var _tao_retval;
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server) &&
               (_tao_out << check_startup)
@@ -4434,12 +4456,12 @@ CORBA::String_var _tao_retval;
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                   CORBA::MARSHAL (
-
+                      
                     ),
                   0
                 );
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata, 2 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
@@ -4463,12 +4485,12 @@ CORBA::String_var _tao_retval;
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-
+          
           if (!(
               (_tao_in >> _tao_retval.inout ())
               ))
@@ -4480,13 +4502,13 @@ CORBA::String_var _tao_retval;
                   0
                 );
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
           char * _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
@@ -4502,63 +4524,63 @@ CORBA::String_var _tao_retval;
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
-
+  
   return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_server (
     CORBA::Object *_collocated_tao_target_,
@@ -4571,7 +4593,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
     , ImplementationRepository::AlreadyRegistered
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/AlreadyRegistered:1.0",
@@ -4580,12 +4602,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
   };
 
 TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "register_server",
@@ -4593,22 +4615,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       2,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server _tao_ri (
           &_tao_call,
@@ -4618,14 +4640,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4633,15 +4655,15 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -4652,7 +4674,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server) &&
               (_tao_out << options)
@@ -4660,11 +4682,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
             {
               TAO_INTERCEPTOR_THROW (
                   CORBA::MARSHAL (
-
+                      
                     )
                 );
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -4687,11 +4709,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -4707,61 +4729,61 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister_server (
     CORBA::Object *_collocated_tao_target_,
@@ -4774,12 +4796,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "reregister_server",
@@ -4787,22 +4809,22 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
       2,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server _tao_ri (
           &_tao_call,
@@ -4812,14 +4834,14 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4827,15 +4849,15 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -4846,7 +4868,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
           TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server) &&
               (_tao_out << options)
@@ -4854,11 +4876,11 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
             {
               TAO_INTERCEPTOR_THROW (
                   CORBA::MARSHAL (
-
+                      
                     )
                 );
             }
-
+          
           _invoke_status =
             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -4881,11 +4903,11 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -4901,61 +4923,61 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server (
     CORBA::Object *_collocated_tao_target_,
@@ -4967,7 +4989,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -4976,12 +4998,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
   };
 
 TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "remove_server",
@@ -4989,22 +5011,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server _tao_ri (
           &_tao_call,
@@ -5013,14 +5035,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5028,15 +5050,15 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -5047,18 +5069,18 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server)
               ))
             {
               TAO_INTERCEPTOR_THROW (
                   CORBA::MARSHAL (
-
+                      
                     )
                 );
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -5081,11 +5103,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -5101,61 +5123,61 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server (
     CORBA::Object *_collocated_tao_target_,
@@ -5167,7 +5189,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -5176,12 +5198,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
   };
 
 TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown_server",
@@ -5189,22 +5211,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server _tao_ri (
           &_tao_call,
@@ -5213,14 +5235,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5228,15 +5250,15 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -5247,18 +5269,18 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server)
               ))
             {
               TAO_INTERCEPTOR_THROW (
                   CORBA::MARSHAL (
-
+                      
                     )
                 );
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -5281,11 +5303,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -5301,61 +5323,61 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_running (
     CORBA::Object *_collocated_tao_target_,
@@ -5369,7 +5391,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -5379,12 +5401,12 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
 
 CORBA::String_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_running",
@@ -5392,22 +5414,22 @@ CORBA::String_var _tao_retval;
       3,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running _tao_ri (
           &_tao_call,
@@ -5418,14 +5440,14 @@ CORBA::String_var _tao_retval;
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5433,15 +5455,15 @@ CORBA::String_var _tao_retval;
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
@@ -5452,7 +5474,7 @@ CORBA::String_var _tao_retval;
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server) &&
               (_tao_out << addr) &&
@@ -5461,12 +5483,12 @@ CORBA::String_var _tao_retval;
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                   CORBA::MARSHAL (
-
+                      
                     ),
                   0
                 );
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
@@ -5490,12 +5512,12 @@ CORBA::String_var _tao_retval;
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-
+          
           if (!(
               (_tao_in >> _tao_retval.inout ())
               ))
@@ -5507,13 +5529,13 @@ CORBA::String_var _tao_retval;
                   0
                 );
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
           char * _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
@@ -5529,63 +5551,63 @@ CORBA::String_var _tao_retval;
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
-
+  
   return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_shutting_down (
     CORBA::Object *_collocated_tao_target_,
@@ -5597,7 +5619,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -5606,12 +5628,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
   };
 
 TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_shutting_down",
@@ -5619,22 +5641,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down _tao_ri (
           &_tao_call,
@@ -5643,14 +5665,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5658,15 +5680,15 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -5677,18 +5699,18 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server)
               ))
             {
               TAO_INTERCEPTOR_THROW (
                   CORBA::MARSHAL (
-
+                      
                     )
                 );
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -5711,11 +5733,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -5731,61 +5753,61 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
     CORBA::Object *_collocated_tao_target_,
@@ -5798,7 +5820,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] =
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = 
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -5807,7 +5829,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
   };
 
 TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
@@ -5816,7 +5838,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       info.ptr (),
       ImplementationRepository::ServerInformation
     );
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "find",
@@ -5824,22 +5846,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_find _tao_ri (
           &_tao_call,
@@ -5848,14 +5870,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5863,15 +5885,15 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -5882,18 +5904,18 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << server)
               ))
             {
               TAO_INTERCEPTOR_THROW (
                   CORBA::MARSHAL (
-
+                      
                     )
                 );
             }
-
+          
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -5916,12 +5938,12 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-
+          
           if (!((_tao_in >> *info.ptr ())
               ))
             {
@@ -5931,9 +5953,9 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
                     )
                 );
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -5949,61 +5971,61 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
     CORBA::Object *_collocated_tao_target_,
@@ -6017,7 +6039,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
@@ -6026,7 +6048,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
       server_list.ptr (),
       ImplementationRepository::ServerInformationList
     );
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "list",
@@ -6034,39 +6056,39 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_list _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
-          how_many
+          how_many          
 
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -6074,15 +6096,15 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -6093,18 +6115,18 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
           TAO_INTERCEPTOR_CHECK;
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << how_many)
               ))
             {
               TAO_INTERCEPTOR_THROW (
                   CORBA::MARSHAL (
-
+                      
                     )
                 );
             }
-
+          
           _invoke_status =
             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -6127,12 +6149,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-
+          
           if (!((_tao_in >> *server_list.ptr ()) &&
               (_tao_in >> server_iterator.ptr ())
               ))
@@ -6143,9 +6165,9 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
                     )
                 );
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -6161,65 +6183,65 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -6266,8 +6288,8 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::select_proxy
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:225
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 ImplementationRepository::Administration::Administration (int collocated)
 {
@@ -6288,7 +6310,7 @@ ImplementationRepository::Administration::ImplementationRepository_Administratio
 ImplementationRepository::Administration::~Administration (void)
 {}
 
-void
+void 
 ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer)
 {
   Administration *tmp = ACE_static_cast (Administration *, _tao_void_pointer);
@@ -6305,7 +6327,7 @@ ImplementationRepository::Administration::_narrow (
     {
       return Administration::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -6314,17 +6336,17 @@ ImplementationRepository::Administration::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (Administration::_nil ());
-
+      
       if (is_a == 0)
         {
           return Administration::_nil ();
         }
     }
-
+  
   return Administration::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-ImplementationRepository::Administration_ptr
+ImplementationRepository::Administration_ptr 
 ImplementationRepository::Administration::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -6334,18 +6356,18 @@ ImplementationRepository::Administration::_unchecked_narrow (
     {
       return Administration::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-
+      
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-
+      
       Administration_ptr default_proxy = Administration::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -6363,7 +6385,7 @@ ImplementationRepository::Administration::_unchecked_narrow (
               Administration::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -6376,10 +6398,10 @@ ImplementationRepository::Administration::_unchecked_narrow (
               Administration::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
       ACE_reinterpret_cast (
           Administration_ptr,
@@ -6399,7 +6421,7 @@ ImplementationRepository::Administration::_duplicate (Administration_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -6423,13 +6445,18 @@ ImplementationRepository::Administration::_is_a (
       return 1; // success using local knowledge
     }
   else
-    return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (value ACE_ENV_ARG_PARAMETER);
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
 }
 
 void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::ImplementationRepository, Administration)::_tao_class_id)
@@ -6448,12 +6475,12 @@ void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -6463,7 +6490,7 @@ const char* ImplementationRepository::Administration::_interface_repository_id (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void ImplementationRepository::Administration::activate_server (
     const char * server
@@ -6475,10 +6502,10 @@ void ImplementationRepository::Administration::activate_server (
     , ImplementationRepository::CannotActivate
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.activate_server (
       this,
       server
@@ -6487,7 +6514,7 @@ void ImplementationRepository::Administration::activate_server (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 char * ImplementationRepository::Administration::activate_server_with_startup (
     const char * server,
@@ -6500,10 +6527,10 @@ char * ImplementationRepository::Administration::activate_server_with_startup (
     , ImplementationRepository::CannotActivate
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.activate_server_with_startup (
       this,
       server,
@@ -6513,7 +6540,7 @@ char * ImplementationRepository::Administration::activate_server_with_startup (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void ImplementationRepository::Administration::register_server (
     const char * server,
@@ -6525,10 +6552,10 @@ void ImplementationRepository::Administration::register_server (
     , ImplementationRepository::AlreadyRegistered
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.register_server (
       this,
       server,
@@ -6538,7 +6565,7 @@ void ImplementationRepository::Administration::register_server (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void ImplementationRepository::Administration::reregister_server (
     const char * server,
@@ -6549,10 +6576,10 @@ void ImplementationRepository::Administration::reregister_server (
     CORBA::SystemException
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.reregister_server (
       this,
       server,
@@ -6562,7 +6589,7 @@ void ImplementationRepository::Administration::reregister_server (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void ImplementationRepository::Administration::remove_server (
     const char * server
@@ -6573,10 +6600,10 @@ void ImplementationRepository::Administration::remove_server (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.remove_server (
       this,
       server
@@ -6585,7 +6612,7 @@ void ImplementationRepository::Administration::remove_server (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void ImplementationRepository::Administration::shutdown_server (
     const char * server
@@ -6596,10 +6623,10 @@ void ImplementationRepository::Administration::shutdown_server (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.shutdown_server (
       this,
       server
@@ -6608,7 +6635,7 @@ void ImplementationRepository::Administration::shutdown_server (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 char * ImplementationRepository::Administration::server_is_running (
     const char * server,
@@ -6621,10 +6648,10 @@ char * ImplementationRepository::Administration::server_is_running (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.server_is_running (
       this,
       server,
@@ -6635,7 +6662,7 @@ char * ImplementationRepository::Administration::server_is_running (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void ImplementationRepository::Administration::server_is_shutting_down (
     const char * server
@@ -6646,10 +6673,10 @@ void ImplementationRepository::Administration::server_is_shutting_down (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.server_is_shutting_down (
       this,
       server
@@ -6658,7 +6685,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void ImplementationRepository::Administration::find (
     const char * server,
@@ -6670,10 +6697,10 @@ void ImplementationRepository::Administration::find (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.find (
       this,
       server,
@@ -6683,7 +6710,7 @@ void ImplementationRepository::Administration::find (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void ImplementationRepository::Administration::list (
     CORBA::ULong how_many,
@@ -6695,10 +6722,10 @@ void ImplementationRepository::Administration::list (
     CORBA::SystemException
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.list (
       this,
       how_many,
@@ -6709,30 +6736,30 @@ void ImplementationRepository::Administration::list (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_Administration[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f41646d),
-  ACE_NTOHL (0x696e6973),
-  ACE_NTOHL (0x74726174),
-  ACE_NTOHL (0x696f6e3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f41646d), 
+  ACE_NTOHL (0x696e6973), 
+  ACE_NTOHL (0x74726174), 
+  ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/Administration:1.0
-  15,
-  ACE_NTOHL (0x41646d69),
-  ACE_NTOHL (0x6e697374),
-  ACE_NTOHL (0x72617469),
+    15,
+  ACE_NTOHL (0x41646d69), 
+  ACE_NTOHL (0x6e697374), 
+  ACE_NTOHL (0x72617469), 
   ACE_NTOHL (0x6f6e0000),  // name = Administration
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration (
     CORBA::tk_objref,
@@ -6752,7 +6779,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int ImplementationRepository::ServerInformationIterator::_tao_class_id = 0;
 
@@ -6799,8 +6826,17 @@ tao_ImplementationRepository_ServerInformationIterator_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_ImplementationRepository_ServerInformationIterator_marshal (
+    ImplementationRepository::ServerInformationIterator_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // ImplementationRepository::ServerInformationIterator_var
@@ -6850,7 +6886,7 @@ ImplementationRepository::ServerInformationIterator_var::operator const ::Implem
   return this->ptr_;
 }
 
-ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast
+ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -6926,7 +6962,7 @@ ImplementationRepository::ServerInformationIterator_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // ImplementationRepository::ServerInformationIterator_out
@@ -6988,12 +7024,12 @@ ImplementationRepository::ServerInformationIterator_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ClientRequestInfo_i
 {
@@ -7006,31 +7042,31 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-
+    
   private:
     TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
     const CORBA::ULong & how_many_;
-
+    
     ::CORBA::Boolean _result;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & how_many
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       how_many_ (how_many)
@@ -7044,15 +7080,15 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
+  
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -7064,11 +7100,11 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -7077,22 +7113,22 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void
+void 
 TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
 {
-  // Update the result.
+  // Update the result. 
   this->_result = result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
 class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ClientRequestInfo_i
 {
@@ -7104,10 +7140,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -7115,14 +7151,14 @@ public:
     TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:378
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
+  
   TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED      
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -7135,7 +7171,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -7147,11 +7183,11 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -7160,7 +7196,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -7169,10 +7205,10 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl::_TAO_ServerInformationIterator_Proxy_Impl (void)
@@ -7184,7 +7220,7 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::_TAO
 // Remote Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::next_n (
     CORBA::Object *_collocated_tao_target_,
@@ -7198,18 +7234,18 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-
+    
   ACE_NEW_RETURN (
       server_list.ptr (),
       ImplementationRepository::ServerInformationList,
       0
     );
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "next_n",
@@ -7217,22 +7253,22 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
       1,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n _tao_ri (
           &_tao_call,
@@ -7241,14 +7277,14 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7256,15 +7292,15 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
@@ -7275,19 +7311,19 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-
+          
           if (!(
               (_tao_out << how_many)
               ))
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                   CORBA::MARSHAL (
-
+                      
                     ),
                   _tao_retval
                 );
             }
-
+          
           _invoke_status =
             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
@@ -7311,12 +7347,12 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-
+          
           if (!(
               (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) &&
               (_tao_in >> *server_list.ptr ())
@@ -7329,12 +7365,12 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
                   _tao_retval
                 );
             }
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA::Boolean _tao_retval_info =
             _tao_retval;
           _tao_ri.result (_tao_retval_info);
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -7350,63 +7386,63 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-
+      
       if (_tao_status == PortableInterceptor::LOCATION_FORWARD
           || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
         {
           continue;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
-
+  
   return _tao_retval;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63
 
 void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::destroy (
     CORBA::Object *_collocated_tao_target_
@@ -7417,12 +7453,12 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-
+  
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-
+    
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "destroy",
@@ -7430,22 +7466,22 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
       0,
       istub->orb_core ()
     );
-
+  
   int _invoke_status;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy _tao_ri (
           &_tao_call,
@@ -7453,14 +7489,14 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
-
+      
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-
+      
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7468,15 +7504,15 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-
+          
 #endif /* TAO_HAS_INTERCEPTORS */
-
+          
           _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
@@ -7486,7 +7522,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
             );
           TAO_INTERCEPTOR_CHECK;
 
-
+          
           _invoke_status =
             _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
@@ -7509,11 +7545,11 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
                     );
                   ACE_TRY_CHECK;
                 )
-
+              
               continue;
             }
 #if TAO_HAS_INTERCEPTORS == 1
-
+          
           _tao_ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
               &_tao_ri
@@ -7529,65 +7565,65 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-
+      
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-
+          
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-
+          
           PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-
+          
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+      
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
       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;
         }
-
+      
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+      
       break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
 //           Remote & Base  Proxy Broker Implementation
@@ -7634,8 +7670,8 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::se
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:225
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 ImplementationRepository::ServerInformationIterator::ServerInformationIterator (int collocated)
 {
@@ -7656,7 +7692,7 @@ ImplementationRepository::ServerInformationIterator::ImplementationRepository_Se
 ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
 {}
 
-void
+void 
 ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerInformationIterator *tmp = ACE_static_cast (ServerInformationIterator *, _tao_void_pointer);
@@ -7673,7 +7709,7 @@ ImplementationRepository::ServerInformationIterator::_narrow (
     {
       return ServerInformationIterator::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -7682,17 +7718,17 @@ ImplementationRepository::ServerInformationIterator::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ServerInformationIterator::_nil ());
-
+      
       if (is_a == 0)
         {
           return ServerInformationIterator::_nil ();
         }
     }
-
+  
   return ServerInformationIterator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator_ptr 
 ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -7702,18 +7738,18 @@ ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
     {
       return ServerInformationIterator::_nil ();
     }
-
+  
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-
+      
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-
+      
       ServerInformationIterator_ptr default_proxy = ServerInformationIterator::_nil ();
-
+      
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -7731,7 +7767,7 @@ ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
               ServerInformationIterator::_nil ()
             );
         }
-
+      
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -7744,10 +7780,10 @@ ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
               ServerInformationIterator::_nil ()
             );
         }
-
+      
       return default_proxy;
     }
-  else
+  else 
     return
       ACE_reinterpret_cast (
           ServerInformationIterator_ptr,
@@ -7767,7 +7803,7 @@ ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformati
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -7791,13 +7827,18 @@ ImplementationRepository::ServerInformationIterator::_is_a (
       return 1; // success using local knowledge
     }
   else
-    return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (value ACE_ENV_ARG_PARAMETER);
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
 }
 
 void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::ImplementationRepository, ServerInformationIterator)::_tao_class_id)
@@ -7816,12 +7857,12 @@ void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -7831,7 +7872,7 @@ const char* ImplementationRepository::ServerInformationIterator::_interface_repo
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     CORBA::ULong how_many,
@@ -7842,10 +7883,10 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     CORBA::SystemException
   ))
 {
-  _TAO_ServerInformationIterator_Proxy_Impl &proxy =
+  _TAO_ServerInformationIterator_Proxy_Impl &proxy = 
     this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.next_n (
       this,
       how_many,
@@ -7855,7 +7896,7 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 void ImplementationRepository::ServerInformationIterator::destroy (
     ACE_ENV_SINGLE_ARG_DECL
@@ -7864,10 +7905,10 @@ void ImplementationRepository::ServerInformationIterator::destroy (
     CORBA::SystemException
   ))
 {
-  _TAO_ServerInformationIterator_Proxy_Impl &proxy =
+  _TAO_ServerInformationIterator_Proxy_Impl &proxy = 
     this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   proxy.destroy (
       this
       ACE_ENV_ARG_PARAMETER
@@ -7875,36 +7916,36 @@ void ImplementationRepository::ServerInformationIterator::destroy (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x76657249),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
-  ACE_NTOHL (0x6f6e4974),
-  ACE_NTOHL (0x65726174),
-  ACE_NTOHL (0x6f723a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x76657249), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e4974), 
+  ACE_NTOHL (0x65726174), 
+  ACE_NTOHL (0x6f723a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationIterator:1.0
-  26,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6572496e),
-  ACE_NTOHL (0x666f726d),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e497465),
-  ACE_NTOHL (0x7261746f),
+    26,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e497465), 
+  ACE_NTOHL (0x7261746f), 
   ACE_NTOHL (0x72000000),  // name = ServerInformationIterator
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationIterator (
     CORBA::tk_objref,
@@ -7924,9 +7965,9 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -7938,26 +7979,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     ImplementationRepository::ServerObject_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerObject,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          ImplementationRepository::ServerObject::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<ImplementationRepository::ServerObject>::insert (
+      _tao_any,
+      ImplementationRepository::ServerObject::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerObject,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -7966,60 +8000,26 @@ operator>>= (
     ImplementationRepository::ServerObject_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = ImplementationRepository::ServerObject::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          ImplementationRepository::_tc_ServerObject
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<ImplementationRepository::ServerObject>::extract (
+        _tao_any,
+        ImplementationRepository::ServerObject::_tao_any_destructor,
+        ImplementationRepository::_tc_ServerObject,
+        _tao_elem
       );
-
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_ServerObject,
-            1,
-            _tao_elem,
-            ImplementationRepository::ServerObject::_tao_any_destructor
-          );
-
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = ImplementationRepository::ServerObject::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-
-  _tao_elem = ImplementationRepository::ServerObject::_nil ();
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var>;
+  template class TAO::Any_Impl_T<ImplementationRepository::ServerObject>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var>
+# pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerObject, ImplementationRepository::ServerObject_var>
+# pragma instantiate TAO::Any_Impl_T<ImplementationRepository::ServerObject>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -8027,16 +8027,12 @@ void operator<<= (
     const ImplementationRepository::AlreadyRegistered &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_AlreadyRegistered,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::insert_copy (
+      _tao_any,
+      ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
+      ImplementationRepository::_tc_AlreadyRegistered,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -8045,28 +8041,22 @@ void operator<<= (
     ImplementationRepository::AlreadyRegistered *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_AlreadyRegistered,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::AlreadyRegistered::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::insert (
+      _tao_any,
+      ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
+      ImplementationRepository::_tc_AlreadyRegistered,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,ImplementationRepository::AlreadyRegistered *&_tao_elem
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::AlreadyRegistered *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const ImplementationRepository::AlreadyRegistered*&,
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::AlreadyRegistered *&,
       _tao_elem
     );
 }
@@ -8077,85 +8067,24 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::AlreadyRegistered *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          ImplementationRepository::_tc_AlreadyRegistered
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = (ImplementationRepository::AlreadyRegistered *)_tao_any.value ();
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::AlreadyRegistered *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::AlreadyRegistered,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        CORBA::String_var interface_repository_id;
-
-        if (!(stream >> interface_repository_id.out ()))
-          {
-            return 0;
-          }
-
-        if (ACE_OS::strcmp (
-                interface_repository_id.in (),
-                "IDL:ImplementationRepository/AlreadyRegistered:1.0")
-              )
-          {
-            return 0;
-          }
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_AlreadyRegistered,
-                1,
-                tmp,
-                ImplementationRepository::AlreadyRegistered::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::extract (
+        _tao_any,
+        ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
+        ImplementationRepository::_tc_AlreadyRegistered,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -8163,16 +8092,12 @@ void operator<<= (
     const ImplementationRepository::CannotActivate &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_CannotActivate,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::insert_copy (
+      _tao_any,
+      ImplementationRepository::CannotActivate::_tao_any_destructor,
+      ImplementationRepository::_tc_CannotActivate,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -8181,28 +8106,22 @@ void operator<<= (
     ImplementationRepository::CannotActivate *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_CannotActivate,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::CannotActivate::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::insert (
+      _tao_any,
+      ImplementationRepository::CannotActivate::_tao_any_destructor,
+      ImplementationRepository::_tc_CannotActivate,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,ImplementationRepository::CannotActivate *&_tao_elem
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::CannotActivate *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const ImplementationRepository::CannotActivate*&,
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::CannotActivate *&,
       _tao_elem
     );
 }
@@ -8213,85 +8132,24 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::CannotActivate *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          ImplementationRepository::_tc_CannotActivate
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = (ImplementationRepository::CannotActivate *)_tao_any.value ();
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::CannotActivate *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::CannotActivate,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        CORBA::String_var interface_repository_id;
-
-        if (!(stream >> interface_repository_id.out ()))
-          {
-            return 0;
-          }
-
-        if (ACE_OS::strcmp (
-                interface_repository_id.in (),
-                "IDL:ImplementationRepository/CannotActivate:1.0")
-              )
-          {
-            return 0;
-          }
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_CannotActivate,
-                1,
-                tmp,
-                ImplementationRepository::CannotActivate::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::extract (
+        _tao_any,
+        ImplementationRepository::CannotActivate::_tao_any_destructor,
+        ImplementationRepository::_tc_CannotActivate,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -8299,16 +8157,12 @@ void operator<<= (
     const ImplementationRepository::NotFound &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_NotFound,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::insert_copy (
+      _tao_any,
+      ImplementationRepository::NotFound::_tao_any_destructor,
+      ImplementationRepository::_tc_NotFound,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -8317,28 +8171,22 @@ void operator<<= (
     ImplementationRepository::NotFound *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_NotFound,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::NotFound::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::insert (
+      _tao_any,
+      ImplementationRepository::NotFound::_tao_any_destructor,
+      ImplementationRepository::_tc_NotFound,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,ImplementationRepository::NotFound *&_tao_elem
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::NotFound *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const ImplementationRepository::NotFound*&,
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::NotFound *&,
       _tao_elem
     );
 }
@@ -8349,85 +8197,24 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::NotFound *&_tao_elem
   )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          ImplementationRepository::_tc_NotFound
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = (ImplementationRepository::NotFound *)_tao_any.value ();
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::NotFound *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::NotFound,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        CORBA::String_var interface_repository_id;
-
-        if (!(stream >> interface_repository_id.out ()))
-          {
-            return 0;
-          }
-
-        if (ACE_OS::strcmp (
-                interface_repository_id.in (),
-                "IDL:ImplementationRepository/NotFound:1.0")
-              )
-          {
-            return 0;
-          }
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_NotFound,
-                1,
-                tmp,
-                ImplementationRepository::NotFound::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::extract (
+        _tao_any,
+        ImplementationRepository::NotFound::_tao_any_destructor,
+        ImplementationRepository::_tc_NotFound,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>
+#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
 
 // Copying insertion.
 void operator<<= (
@@ -8435,16 +8222,12 @@ void operator<<= (
     const ImplementationRepository::EnvironmentVariable &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_EnvironmentVariable,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::insert_copy (
+      _tao_any,
+      ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
+      ImplementationRepository::_tc_EnvironmentVariable,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -8453,19 +8236,12 @@ void operator<<= (
     ImplementationRepository::EnvironmentVariable *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_EnvironmentVariable,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::EnvironmentVariable::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::insert (
+      _tao_any,
+      ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
+      ImplementationRepository::_tc_EnvironmentVariable,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -8486,75 +8262,24 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::EnvironmentVariable *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          ImplementationRepository::_tc_EnvironmentVariable
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const ImplementationRepository::EnvironmentVariable*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::EnvironmentVariable *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::EnvironmentVariable,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_EnvironmentVariable,
-                1,
-                ACE_static_cast (void *, tmp),
-                ImplementationRepository::EnvironmentVariable::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::extract (
+        _tao_any,
+        ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
+        ImplementationRepository::_tc_EnvironmentVariable,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>
+#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
 
 // Copying insertion.
 void operator<<= (
@@ -8562,16 +8287,12 @@ void operator<<= (
     const ImplementationRepository::EnvironmentList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_EnvironmentList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::insert_copy (
+      _tao_any,
+      ImplementationRepository::EnvironmentList::_tao_any_destructor,
+      ImplementationRepository::_tc_EnvironmentList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -8580,19 +8301,12 @@ void operator<<= (
     ImplementationRepository::EnvironmentList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_EnvironmentList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::EnvironmentList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::insert (
+      _tao_any,
+      ImplementationRepository::EnvironmentList::_tao_any_destructor,
+      ImplementationRepository::_tc_EnvironmentList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -8601,8 +8315,8 @@ CORBA::Boolean operator>>= (
     ImplementationRepository::EnvironmentList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const ImplementationRepository::EnvironmentList*&,
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::EnvironmentList *&,
       _tao_elem
     );
 }
@@ -8613,118 +8327,52 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::EnvironmentList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          ImplementationRepository::_tc_EnvironmentList
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const ImplementationRepository::EnvironmentList*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::EnvironmentList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::EnvironmentList,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_EnvironmentList,
-                1,
-                ACE_static_cast (void *, tmp),
-                ImplementationRepository::EnvironmentList::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::extract (
+        _tao_any,
+        ImplementationRepository::EnvironmentList::_tao_any_destructor,
+        ImplementationRepository::_tc_EnvironmentList,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
 
-void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ActivationMode _tao_elem)
+void operator<<= (
+    CORBA::Any &_tao_any,
+    ImplementationRepository::ActivationMode _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::insert (
+      _tao_any,
       ImplementationRepository::_tc_ActivationMode,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::ActivationMode &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    ImplementationRepository::ActivationMode &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result = type->equivalent (ImplementationRepository::_tc_ActivationMode ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!_tao_result)
-      return 0; // not equivalent
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::extract (
+        _tao_any,
+        ImplementationRepository::_tc_ActivationMode,
+        _tao_elem 
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>
+#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
 
 // Copying insertion.
 void operator<<= (
@@ -8732,16 +8380,12 @@ void operator<<= (
     const ImplementationRepository::StartupOptions &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_StartupOptions,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::insert_copy (
+      _tao_any,
+      ImplementationRepository::StartupOptions::_tao_any_destructor,
+      ImplementationRepository::_tc_StartupOptions,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -8750,19 +8394,12 @@ void operator<<= (
     ImplementationRepository::StartupOptions *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_StartupOptions,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::StartupOptions::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::insert (
+      _tao_any,
+      ImplementationRepository::StartupOptions::_tao_any_destructor,
+      ImplementationRepository::_tc_StartupOptions,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -8783,75 +8420,24 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::StartupOptions *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          ImplementationRepository::_tc_StartupOptions
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const ImplementationRepository::StartupOptions*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::StartupOptions *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::StartupOptions,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_StartupOptions,
-                1,
-                ACE_static_cast (void *, tmp),
-                ImplementationRepository::StartupOptions::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::extract (
+        _tao_any,
+        ImplementationRepository::StartupOptions::_tao_any_destructor,
+        ImplementationRepository::_tc_StartupOptions,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>
+#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
 
 // Copying insertion.
 void operator<<= (
@@ -8859,16 +8445,12 @@ void operator<<= (
     const ImplementationRepository::ServerInformation &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerInformation,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::insert_copy (
+      _tao_any,
+      ImplementationRepository::ServerInformation::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformation,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -8877,19 +8459,12 @@ void operator<<= (
     ImplementationRepository::ServerInformation *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerInformation,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::ServerInformation::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::insert (
+      _tao_any,
+      ImplementationRepository::ServerInformation::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformation,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -8910,75 +8485,24 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::ServerInformation *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          ImplementationRepository::_tc_ServerInformation
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (_tao_result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const ImplementationRepository::ServerInformation*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::ServerInformation *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::ServerInformation,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_ServerInformation,
-                1,
-                ACE_static_cast (void *, tmp),
-                ImplementationRepository::ServerInformation::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::extract (
+        _tao_any,
+        ImplementationRepository::ServerInformation::_tao_any_destructor,
+        ImplementationRepository::_tc_ServerInformation,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>
+#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
 
 // Copying insertion.
 void operator<<= (
@@ -8986,16 +8510,12 @@ void operator<<= (
     const ImplementationRepository::ServerInformationList &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerInformationList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::insert_copy (
+      _tao_any,
+      ImplementationRepository::ServerInformationList::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformationList,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -9004,19 +8524,12 @@ void operator<<= (
     ImplementationRepository::ServerInformationList *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerInformationList,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          ImplementationRepository::ServerInformationList::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::insert (
+      _tao_any,
+      ImplementationRepository::ServerInformationList::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformationList,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -9025,8 +8538,8 @@ CORBA::Boolean operator>>= (
     ImplementationRepository::ServerInformationList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const ImplementationRepository::ServerInformationList*&,
+  return _tao_any >>= ACE_const_cast (
+      const ImplementationRepository::ServerInformationList *&,
       _tao_elem
     );
 }
@@ -9037,77 +8550,19 @@ CORBA::Boolean operator>>= (
     const ImplementationRepository::ServerInformationList *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          ImplementationRepository::_tc_ServerInformationList
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const ImplementationRepository::ServerInformationList*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        ImplementationRepository::ServerInformationList *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            ImplementationRepository::ServerInformationList,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                ImplementationRepository::_tc_ServerInformationList,
-                1,
-                ACE_static_cast (void *, tmp),
-                ImplementationRepository::ServerInformationList::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::extract (
+        _tao_any,
+        ImplementationRepository::ServerInformationList::_tao_any_destructor,
+        ImplementationRepository::_tc_ServerInformationList,
+        _tao_elem
+      );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -9119,26 +8574,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     ImplementationRepository::Administration_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_Administration,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          ImplementationRepository::Administration::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<ImplementationRepository::Administration>::insert (
+      _tao_any,
+      ImplementationRepository::Administration::_tao_any_destructor,
+      ImplementationRepository::_tc_Administration,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -9147,62 +8595,28 @@ operator>>= (
     ImplementationRepository::Administration_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = ImplementationRepository::Administration::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          ImplementationRepository::_tc_Administration
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<ImplementationRepository::Administration>::extract (
+        _tao_any,
+        ImplementationRepository::Administration::_tao_any_destructor,
+        ImplementationRepository::_tc_Administration,
+        _tao_elem
       );
-
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_Administration,
-            1,
-            _tao_elem,
-            ImplementationRepository::Administration::_tao_any_destructor
-          );
-
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = ImplementationRepository::Administration::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-
-  _tao_elem = ImplementationRepository::Administration::_nil ();
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var>;
+  template class TAO::Any_Impl_T<ImplementationRepository::Administration>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var>
+# pragma instantiate TAO_Object_Manager<ImplementationRepository::Administration, ImplementationRepository::Administration_var>
+# pragma instantiate TAO::Any_Impl_T<ImplementationRepository::Administration>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
@@ -9214,26 +8628,19 @@ operator<<= (
   _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     ImplementationRepository::ServerInformationIterator_ptr *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          ImplementationRepository::_tc_ServerInformationIterator,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          *_tao_elem,
-          ImplementationRepository::ServerInformationIterator::_tao_any_destructor
-        );
-    }
+  TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::insert (
+      _tao_any,
+      ImplementationRepository::ServerInformationIterator::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformationIterator,
+      *_tao_elem
+    );
 }
 
 CORBA::Boolean
@@ -9242,60 +8649,26 @@ operator>>= (
     ImplementationRepository::ServerInformationIterator_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = ImplementationRepository::ServerInformationIterator::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          ImplementationRepository::_tc_ServerInformationIterator
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::extract (
+        _tao_any,
+        ImplementationRepository::ServerInformationIterator::_tao_any_destructor,
+        ImplementationRepository::_tc_ServerInformationIterator,
+        _tao_elem
       );
-
-    if (stream >> _tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            ImplementationRepository::_tc_ServerInformationIterator,
-            1,
-            _tao_elem,
-            ImplementationRepository::ServerInformationIterator::_tao_any_destructor
-          );
-
-        return 1;
-      }
-  }
-  ACE_CATCHANY
-  {
-    _tao_elem = ImplementationRepository::ServerInformationIterator::_nil ();
-    return 0;
-  }
-  ACE_ENDTRY;
-
-  _tao_elem = ImplementationRepository::ServerInformationIterator::_nil ();
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var>;
+  template class TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var>
+# pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerInformationIterator, ImplementationRepository::ServerInformationIterator_var>
+# pragma instantiate TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -9314,12 +8687,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-
+    
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-
+    
     // Narrow to the right type.
     _tao_objref =
       ImplementationRepository::ServerObject::_unchecked_narrow (
@@ -9338,7 +8711,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -9346,20 +8719,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -9369,7 +8742,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -9379,32 +8752,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -9412,20 +8785,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -9435,7 +8808,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -9445,32 +8818,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -9489,12 +8862,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-
+    
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-
+    
     // Narrow to the right type.
     _tao_objref =
       ImplementationRepository::Administration::_unchecked_narrow (
@@ -9513,7 +8886,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -9532,12 +8905,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-
+    
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-
+    
     // Narrow to the right type.
     _tao_objref =
       ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index b885d40ddc9..f5695778688 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -20,20 +20,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOC_H_
 #define _TAO_IDL_ORIG_IMPLREPOC_H_
 
 #include "ace/pre.h"
-
 #include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 #include "portableserver_export.h"
 
 #include "tao/Exception.h"
@@ -65,17 +63,17 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
 TAO_NAMESPACE  ImplementationRepository
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___PTR_CH_
-
+  
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
 
@@ -83,31 +81,31 @@ TAO_NAMESPACE  ImplementationRepository
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:571
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export ServerObject_var : public TAO_Base_var
   {
   public:
     ServerObject_var (void); // default constructor
-    ServerObject_var (ServerObject_ptr p) : ptr_ (p) {}
+    ServerObject_var (ServerObject_ptr p) : ptr_ (p) {} 
     ServerObject_var (const ServerObject_var &); // copy constructor
     ~ServerObject_var (void); // destructor
-
+    
     ServerObject_var &operator= (ServerObject_ptr);
     ServerObject_var &operator= (const ServerObject_var &);
     ServerObject_ptr operator-> (void) const;
-
+    
     operator const ServerObject_ptr &() const;
     operator ServerObject_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServerObject_ptr in (void) const;
     ServerObject_ptr &inout (void);
     ServerObject_ptr &out (void);
     ServerObject_ptr _retn (void);
     ServerObject_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerObject_ptr tao_duplicate (ServerObject_ptr);
@@ -118,7 +116,7 @@ TAO_NAMESPACE  ImplementationRepository
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServerObject_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -130,10 +128,10 @@ TAO_NAMESPACE  ImplementationRepository
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export ServerObject_out
   {
   public:
@@ -146,24 +144,24 @@ TAO_NAMESPACE  ImplementationRepository
     operator ServerObject_ptr &();
     ServerObject_ptr &ptr (void);
     ServerObject_ptr operator-> (void);
-
+  
   private:
     ServerObject_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
-
+  
   class _TAO_ServerObject_Proxy_Impl;
   class _TAO_ServerObject_Remote_Proxy_Impl;
   class _TAO_ServerObject_Proxy_Broker;
   class _TAO_ServerObject_Remote_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export ServerObject
     : public virtual CORBA::Object
   {
@@ -171,105 +169,106 @@ TAO_NAMESPACE  ImplementationRepository
     typedef ServerObject_ptr _ptr_type;
     typedef ServerObject_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServerObject_ptr _duplicate (ServerObject_ptr obj);
-
+    
     static ServerObject_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerObject_ptr _nil (void)
       {
         return (ServerObject_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void ping (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void shutdown (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ServerObject_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_;
-
+  
   protected:
     ServerObject (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated);
-
+    
     ServerObject (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ServerObject (void);
-
+    
     friend class _TAO_ServerObject_Remote_Proxy_Impl;
     friend class _TAO_ServerObject_ThruPOA_Proxy_Impl;
     friend class _TAO_ServerObject_Direct_Proxy_Impl;
-
+  
   private:
     ServerObject (const ServerObject &);
     void operator= (const ServerObject &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_ServerObject_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void ping (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -277,10 +276,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void shutdown (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -288,35 +287,35 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_ServerObject_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl
     : public virtual _TAO_ServerObject_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_ServerObject_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void ping (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -324,10 +323,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void shutdown (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -336,23 +335,23 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker
   {
   public:
@@ -361,76 +360,76 @@ TAO_NAMESPACE  ImplementationRepository
         ServerObject *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_ServerObject_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Broker
     : public virtual _TAO_ServerObject_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ServerObject_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
         ServerObject *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_ServerObject_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ServerObject_Remote_Proxy_Broker *the_TAO_ServerObject_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerObject;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_exception/exception_ch.cpp:51
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_
-
+  
   class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException
   {
   public:
-
+    
     AlreadyRegistered (void);
     AlreadyRegistered (const AlreadyRegistered &);
     ~AlreadyRegistered (void);
 
     AlreadyRegistered &operator= (const AlreadyRegistered &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static AlreadyRegistered *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -442,44 +441,44 @@ TAO_NAMESPACE  ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:125
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AlreadyRegistered;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_exception/exception_ch.cpp:51
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_
-
+  
   class TAO_PortableServer_Export CannotActivate : public CORBA::UserException
   {
   public:
-
+    
     TAO_String_Manager reason;
     CannotActivate (void);
     CannotActivate (const CannotActivate &);
     ~CannotActivate (void);
 
     CannotActivate &operator= (const CannotActivate &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static CannotActivate *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -491,50 +490,50 @@ TAO_NAMESPACE  ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ctor.cpp:66
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+    
     CannotActivate (
         const char * _tao_reason
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:125
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CannotActivate;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_exception/exception_ch.cpp:51
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_
-
+  
   class TAO_PortableServer_Export NotFound : public CORBA::UserException
   {
   public:
-
+    
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -546,42 +545,42 @@ TAO_NAMESPACE  ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:125
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class EnvironmentVariable_var;
-
+  
   struct TAO_PortableServer_Export EnvironmentVariable
   {
     typedef EnvironmentVariable_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager value;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_PortableServer_Export EnvironmentVariable_var
   {
   public:
@@ -589,33 +588,33 @@ TAO_NAMESPACE  ImplementationRepository
     EnvironmentVariable_var (EnvironmentVariable *);
     EnvironmentVariable_var (const EnvironmentVariable_var &);
     ~EnvironmentVariable_var (void);
-
+    
     EnvironmentVariable_var &operator= (EnvironmentVariable *);
     EnvironmentVariable_var &operator= (const EnvironmentVariable_var &);
     EnvironmentVariable *operator-> (void);
     const EnvironmentVariable *operator-> (void) const;
-
+    
     operator const EnvironmentVariable &() const;
     operator EnvironmentVariable &();
     operator EnvironmentVariable &() const;
-
+    
     // Variable-size types only.
     operator EnvironmentVariable *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const EnvironmentVariable &in (void) const;
     EnvironmentVariable &inout (void);
     EnvironmentVariable *&out (void);
     EnvironmentVariable *_retn (void);
     EnvironmentVariable *ptr (void) const;
-
+  
   private:
     EnvironmentVariable *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_PortableServer_Export EnvironmentVariable_out
   {
   public:
@@ -627,44 +626,44 @@ TAO_NAMESPACE  ImplementationRepository
     operator EnvironmentVariable *&();
     EnvironmentVariable *&ptr (void);
     EnvironmentVariable *operator-> (void);
-
+    
   private:
     EnvironmentVariable *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const EnvironmentVariable_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentVariable;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:368
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
+  
   typedef char * Address;
   typedef CORBA::String_var Address_var;
   typedef CORBA::String_out Address_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Address;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+  
+  // 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_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
-
+  
   class TAO_PortableServer_Export _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void);
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -678,15 +677,15 @@ TAO_NAMESPACE  ImplementationRepository
         const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void);
-
+    
     // = Accessors.
     EnvironmentVariable &operator[] (CORBA::ULong i);
     const EnvironmentVariable &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static EnvironmentVariable *allocbuf (CORBA::ULong size);
     static void freebuf (EnvironmentVariable *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -702,47 +701,47 @@ TAO_NAMESPACE  ImplementationRepository
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class EnvironmentList;
   class EnvironmentList_var;
-
+  
   // *************************************************************
   // ImplementationRepository::EnvironmentList
   // *************************************************************
-
-  class TAO_PortableServer_Export EnvironmentList : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_PortableServer_Export EnvironmentList : 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_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<EnvironmentVariable>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     EnvironmentList (void);
     EnvironmentList (CORBA::ULong max);
     EnvironmentList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        EnvironmentVariable *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        EnvironmentVariable *buffer, 
         CORBA::Boolean release = 0
       );
     EnvironmentList (const EnvironmentList &);
     ~EnvironmentList (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef EnvironmentList_var _var_type;
   };
 
@@ -750,14 +749,14 @@ TAO_NAMESPACE  ImplementationRepository
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class ImplementationRepository::EnvironmentList_var
   // *************************************************************
-
+  
   class TAO_PortableServer_Export EnvironmentList_var
   {
   public:
@@ -765,29 +764,29 @@ TAO_NAMESPACE  ImplementationRepository
     EnvironmentList_var (EnvironmentList *);
     EnvironmentList_var (const EnvironmentList_var &);
     ~EnvironmentList_var (void);
-
+    
     EnvironmentList_var &operator= (EnvironmentList *);
     EnvironmentList_var &operator= (const EnvironmentList_var &);
     EnvironmentList *operator-> (void);
     const EnvironmentList *operator-> (void) const;
-
+    
     operator const EnvironmentList &() const;
     operator EnvironmentList &();
     operator EnvironmentList &() const;
-
+    
     // Variable-size base types only.
     operator EnvironmentList *&();
-
+    
     EnvironmentVariable & operator[] (CORBA::ULong index);
     const EnvironmentVariable & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const EnvironmentList &in (void) const;
     EnvironmentList &inout (void);
     EnvironmentList *&out (void);
     EnvironmentList *_retn (void);
     EnvironmentList *ptr (void) const;
-
+  
   private:
     EnvironmentList *ptr_;
   };
@@ -796,10 +795,10 @@ TAO_NAMESPACE  ImplementationRepository
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_PortableServer_Export EnvironmentList_out
   {
   public:
@@ -812,7 +811,7 @@ TAO_NAMESPACE  ImplementationRepository
     EnvironmentList *&ptr (void);
     EnvironmentList *operator-> (void);
     EnvironmentVariable & operator[] (CORBA::ULong index);
-
+  
   private:
     EnvironmentList *&ptr_;
     // Assignment from T_var not allowed.
@@ -820,15 +819,15 @@ TAO_NAMESPACE  ImplementationRepository
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentList;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_enum/enum_ch.cpp:57
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum ActivationMode
   {
     NORMAL,
@@ -836,23 +835,23 @@ TAO_NAMESPACE  ImplementationRepository
     PER_CLIENT,
     AUTO_START
   };
-
+  
   typedef ActivationMode &ActivationMode_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ActivationMode;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class StartupOptions_var;
-
+  
   struct TAO_PortableServer_Export StartupOptions
   {
     typedef StartupOptions_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager command_line;
     ImplementationRepository::EnvironmentList environment;
@@ -860,10 +859,10 @@ TAO_NAMESPACE  ImplementationRepository
     ImplementationRepository::ActivationMode activation;
     TAO_String_Manager location;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_PortableServer_Export StartupOptions_var
   {
   public:
@@ -871,33 +870,33 @@ TAO_NAMESPACE  ImplementationRepository
     StartupOptions_var (StartupOptions *);
     StartupOptions_var (const StartupOptions_var &);
     ~StartupOptions_var (void);
-
+    
     StartupOptions_var &operator= (StartupOptions *);
     StartupOptions_var &operator= (const StartupOptions_var &);
     StartupOptions *operator-> (void);
     const StartupOptions *operator-> (void) const;
-
+    
     operator const StartupOptions &() const;
     operator StartupOptions &();
     operator StartupOptions &() const;
-
+    
     // Variable-size types only.
     operator StartupOptions *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const StartupOptions &in (void) const;
     StartupOptions &inout (void);
     StartupOptions *&out (void);
     StartupOptions *_retn (void);
     StartupOptions *ptr (void) const;
-
+  
   private:
     StartupOptions *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_PortableServer_Export StartupOptions_out
   {
   public:
@@ -909,37 +908,37 @@ TAO_NAMESPACE  ImplementationRepository
     operator StartupOptions *&();
     StartupOptions *&ptr (void);
     StartupOptions *operator-> (void);
-
+    
   private:
     StartupOptions *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const StartupOptions_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StartupOptions;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class ServerInformation_var;
-
+  
   struct TAO_PortableServer_Export ServerInformation
   {
     typedef ServerInformation_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager logical_server;
     TAO_String_Manager server;
     ImplementationRepository::StartupOptions startup;
     TAO_String_Manager location;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_PortableServer_Export ServerInformation_var
   {
   public:
@@ -947,33 +946,33 @@ TAO_NAMESPACE  ImplementationRepository
     ServerInformation_var (ServerInformation *);
     ServerInformation_var (const ServerInformation_var &);
     ~ServerInformation_var (void);
-
+    
     ServerInformation_var &operator= (ServerInformation *);
     ServerInformation_var &operator= (const ServerInformation_var &);
     ServerInformation *operator-> (void);
     const ServerInformation *operator-> (void) const;
-
+    
     operator const ServerInformation &() const;
     operator ServerInformation &();
     operator ServerInformation &() const;
-
+    
     // Variable-size types only.
     operator ServerInformation *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ServerInformation &in (void) const;
     ServerInformation &inout (void);
     ServerInformation *&out (void);
     ServerInformation *_retn (void);
     ServerInformation *ptr (void) const;
-
+  
   private:
     ServerInformation *ptr_;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_PortableServer_Export ServerInformation_out
   {
   public:
@@ -985,32 +984,32 @@ TAO_NAMESPACE  ImplementationRepository
     operator ServerInformation *&();
     ServerInformation *&ptr (void);
     ServerInformation *operator-> (void);
-
+    
   private:
     ServerInformation *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ServerInformation_var &);
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformation;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+  
+  // 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_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
-
+  
   class TAO_PortableServer_Export _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void);
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -1024,15 +1023,15 @@ TAO_NAMESPACE  ImplementationRepository
         const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void);
-
+    
     // = Accessors.
     ServerInformation &operator[] (CORBA::ULong i);
     const ServerInformation &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static ServerInformation *allocbuf (CORBA::ULong size);
     static void freebuf (ServerInformation *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -1048,47 +1047,47 @@ TAO_NAMESPACE  ImplementationRepository
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ServerInformationList;
   class ServerInformationList_var;
-
+  
   // *************************************************************
   // ImplementationRepository::ServerInformationList
   // *************************************************************
-
-  class TAO_PortableServer_Export ServerInformationList : public
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:51
+  
+  class TAO_PortableServer_Export ServerInformationList : 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_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ServerInformation>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ServerInformationList (void);
     ServerInformationList (CORBA::ULong max);
     ServerInformationList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ServerInformation *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ServerInformation *buffer, 
         CORBA::Boolean release = 0
       );
     ServerInformationList (const ServerInformationList &);
     ~ServerInformationList (void);
-
+    
     static void _tao_any_destructor (void*);
-
+    
     typedef ServerInformationList_var _var_type;
   };
 
@@ -1096,14 +1095,14 @@ TAO_NAMESPACE  ImplementationRepository
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class ImplementationRepository::ServerInformationList_var
   // *************************************************************
-
+  
   class TAO_PortableServer_Export ServerInformationList_var
   {
   public:
@@ -1111,29 +1110,29 @@ TAO_NAMESPACE  ImplementationRepository
     ServerInformationList_var (ServerInformationList *);
     ServerInformationList_var (const ServerInformationList_var &);
     ~ServerInformationList_var (void);
-
+    
     ServerInformationList_var &operator= (ServerInformationList *);
     ServerInformationList_var &operator= (const ServerInformationList_var &);
     ServerInformationList *operator-> (void);
     const ServerInformationList *operator-> (void) const;
-
+    
     operator const ServerInformationList &() const;
     operator ServerInformationList &();
     operator ServerInformationList &() const;
-
+    
     // Variable-size base types only.
     operator ServerInformationList *&();
-
+    
     ServerInformation & operator[] (CORBA::ULong index);
     const ServerInformation & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ServerInformationList &in (void) const;
     ServerInformationList &inout (void);
     ServerInformationList *&out (void);
     ServerInformationList *_retn (void);
     ServerInformationList *ptr (void) const;
-
+  
   private:
     ServerInformationList *ptr_;
   };
@@ -1142,10 +1141,10 @@ TAO_NAMESPACE  ImplementationRepository
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_PortableServer_Export ServerInformationList_out
   {
   public:
@@ -1158,7 +1157,7 @@ TAO_NAMESPACE  ImplementationRepository
     ServerInformationList *&ptr (void);
     ServerInformationList *operator-> (void);
     ServerInformation & operator[] (CORBA::ULong index);
-
+  
   private:
     ServerInformationList *&ptr_;
     // Assignment from T_var not allowed.
@@ -1166,51 +1165,51 @@ TAO_NAMESPACE  ImplementationRepository
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationList;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class ServerInformationIterator;
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_
-
+  
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:571
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var
   {
   public:
     ServerInformationIterator_var (void); // default constructor
-    ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {}
+    ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} 
     ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
     ~ServerInformationIterator_var (void); // destructor
-
+    
     ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
     ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
     ServerInformationIterator_ptr operator-> (void) const;
-
+    
     operator const ServerInformationIterator_ptr &() const;
     operator ServerInformationIterator_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServerInformationIterator_ptr in (void) const;
     ServerInformationIterator_ptr &inout (void);
     ServerInformationIterator_ptr &out (void);
     ServerInformationIterator_ptr _retn (void);
     ServerInformationIterator_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerInformationIterator_ptr tao_duplicate (ServerInformationIterator_ptr);
@@ -1221,7 +1220,7 @@ TAO_NAMESPACE  ImplementationRepository
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServerInformationIterator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1233,10 +1232,10 @@ TAO_NAMESPACE  ImplementationRepository
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export ServerInformationIterator_out
   {
   public:
@@ -1249,19 +1248,19 @@ TAO_NAMESPACE  ImplementationRepository
     operator ServerInformationIterator_ptr &();
     ServerInformationIterator_ptr &ptr (void);
     ServerInformationIterator_ptr operator-> (void);
-
+  
   private:
     ServerInformationIterator_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_
-
+  
   class Administration;
   typedef Administration *Administration_ptr;
 
@@ -1269,31 +1268,31 @@ TAO_NAMESPACE  ImplementationRepository
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:571
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export Administration_var : public TAO_Base_var
   {
   public:
     Administration_var (void); // default constructor
-    Administration_var (Administration_ptr p) : ptr_ (p) {}
+    Administration_var (Administration_ptr p) : ptr_ (p) {} 
     Administration_var (const Administration_var &); // copy constructor
     ~Administration_var (void); // destructor
-
+    
     Administration_var &operator= (Administration_ptr);
     Administration_var &operator= (const Administration_var &);
     Administration_ptr operator-> (void) const;
-
+    
     operator const Administration_ptr &() const;
     operator Administration_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Administration_ptr in (void) const;
     Administration_ptr &inout (void);
     Administration_ptr &out (void);
     Administration_ptr _retn (void);
     Administration_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Administration_ptr tao_duplicate (Administration_ptr);
@@ -1304,7 +1303,7 @@ TAO_NAMESPACE  ImplementationRepository
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Administration_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1316,10 +1315,10 @@ TAO_NAMESPACE  ImplementationRepository
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export Administration_out
   {
   public:
@@ -1332,24 +1331,24 @@ TAO_NAMESPACE  ImplementationRepository
     operator Administration_ptr &();
     Administration_ptr &ptr (void);
     Administration_ptr operator-> (void);
-
+  
   private:
     Administration_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
-
+  
   class _TAO_Administration_Proxy_Impl;
   class _TAO_Administration_Remote_Proxy_Impl;
   class _TAO_Administration_Proxy_Broker;
   class _TAO_Administration_Remote_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Administration
     : public virtual CORBA::Object
   {
@@ -1357,30 +1356,30 @@ TAO_NAMESPACE  ImplementationRepository
     typedef Administration_ptr _ptr_type;
     typedef Administration_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static Administration_ptr _duplicate (Administration_ptr obj);
-
+    
     static Administration_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Administration_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Administration_ptr _nil (void)
       {
         return (Administration_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1390,10 +1389,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * activate_server_with_startup (
         const char * server,
         CORBA::Long check_startup
@@ -1404,10 +1403,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void register_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
@@ -1417,10 +1416,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::AlreadyRegistered
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void reregister_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
@@ -1429,10 +1428,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1441,10 +1440,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1453,10 +1452,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * server_is_running (
         const char * server,
         const char * addr,
@@ -1467,10 +1466,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1479,10 +1478,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void find (
         const char * server,
         ImplementationRepository::ServerInformation_out info
@@ -1492,10 +1491,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void list (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
@@ -1505,65 +1504,66 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
-
+  
   protected:
     Administration (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Administration_setup_collocation (int collocated);
-
+    
     Administration (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~Administration (void);
-
+    
     friend class _TAO_Administration_Remote_Proxy_Impl;
     friend class _TAO_Administration_ThruPOA_Proxy_Impl;
     friend class _TAO_Administration_Direct_Proxy_Impl;
-
+  
   private:
     Administration (const Administration &);
     void operator= (const Administration &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_PortableServer_Export _TAO_Administration_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_Administration_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void activate_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1574,10 +1574,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual char * activate_server_with_startup (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1589,10 +1589,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void register_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1603,10 +1603,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::AlreadyRegistered
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void reregister_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1616,10 +1616,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void remove_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1629,10 +1629,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void shutdown_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1642,10 +1642,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual char * server_is_running (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1657,10 +1657,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void server_is_shutting_down (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1670,10 +1670,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void find (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1684,10 +1684,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void list (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong how_many,
@@ -1698,35 +1698,35 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_Administration_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl
     : public virtual _TAO_Administration_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_Administration_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Administration_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void activate_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1737,10 +1737,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual char * activate_server_with_startup (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1752,10 +1752,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void register_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1766,10 +1766,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::AlreadyRegistered
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void reregister_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1779,10 +1779,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void remove_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1792,10 +1792,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void shutdown_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1805,10 +1805,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual char * server_is_running (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1820,10 +1820,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void server_is_shutting_down (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1833,10 +1833,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void find (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1847,10 +1847,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void list (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong how_many,
@@ -1862,23 +1862,23 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker
   {
   public:
@@ -1887,64 +1887,64 @@ TAO_NAMESPACE  ImplementationRepository
         Administration *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_Administration_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker
     : public virtual _TAO_Administration_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Administration_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Administration_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_Administration_Proxy_Impl &select_proxy (
         Administration *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_Administration_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_Administration_Remote_Proxy_Broker *the_TAO_Administration_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Administration;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_
-
+  
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
 
@@ -1952,31 +1952,31 @@ TAO_NAMESPACE  ImplementationRepository
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:571
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var
   {
   public:
     ServerInformationIterator_var (void); // default constructor
-    ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {}
+    ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} 
     ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
     ~ServerInformationIterator_var (void); // destructor
-
+    
     ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
     ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
     ServerInformationIterator_ptr operator-> (void) const;
-
+    
     operator const ServerInformationIterator_ptr &() const;
     operator ServerInformationIterator_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServerInformationIterator_ptr in (void) const;
     ServerInformationIterator_ptr &inout (void);
     ServerInformationIterator_ptr &out (void);
     ServerInformationIterator_ptr _retn (void);
     ServerInformationIterator_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerInformationIterator_ptr tao_duplicate (ServerInformationIterator_ptr);
@@ -1987,7 +1987,7 @@ TAO_NAMESPACE  ImplementationRepository
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServerInformationIterator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1999,10 +1999,10 @@ TAO_NAMESPACE  ImplementationRepository
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export ServerInformationIterator_out
   {
   public:
@@ -2015,24 +2015,24 @@ TAO_NAMESPACE  ImplementationRepository
     operator ServerInformationIterator_ptr &();
     ServerInformationIterator_ptr &ptr (void);
     ServerInformationIterator_ptr operator-> (void);
-
+  
   private:
     ServerInformationIterator_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
-
+  
   class _TAO_ServerInformationIterator_Proxy_Impl;
   class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
   class _TAO_ServerInformationIterator_Proxy_Broker;
   class _TAO_ServerInformationIterator_Remote_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export ServerInformationIterator
     : public virtual CORBA::Object
   {
@@ -2040,30 +2040,30 @@ TAO_NAMESPACE  ImplementationRepository
     typedef ServerInformationIterator_ptr _ptr_type;
     typedef ServerInformationIterator_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
-
+    
     static ServerInformationIterator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerInformationIterator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerInformationIterator_ptr _nil (void)
       {
         return (ServerInformationIterator_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean next_n (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list
@@ -2072,75 +2072,76 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
-
+  
   protected:
     ServerInformationIterator (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated);
-
+    
     ServerInformationIterator (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ServerInformationIterator (void);
-
+    
     friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
     friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
     friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
-
+  
   private:
     ServerInformationIterator (const ServerInformationIterator &);
     void operator= (const ServerInformationIterator &);
   };
-
+  
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
+  
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_ServerInformationIterator_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual CORBA::Boolean next_n (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong how_many,
@@ -2150,10 +2151,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
+    
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2161,35 +2162,35 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+  
   protected:
     _TAO_ServerInformationIterator_Proxy_Impl (void);
   };
-
+  
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
+  
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl
     : public virtual _TAO_ServerInformationIterator_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_ServerInformationIterator_Remote_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::Boolean next_n (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong how_many,
@@ -2199,10 +2200,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2211,23 +2212,23 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
       ));
   };
-
+  
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
+  
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
+  // the right proxy for performing a call. In the new 
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
+  //                 Base Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
+  
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker
   {
   public:
@@ -2236,60 +2237,60 @@ TAO_NAMESPACE  ImplementationRepository
         ServerInformationIterator *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
   protected:
     _TAO_ServerInformationIterator_Proxy_Broker (void);
-
+    
   };
-
+  
   //
-  //              End Base Proxy Broker Declaration
+  //              End Base Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+    
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
+  //                 Remote Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
+  
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker
     : public virtual _TAO_ServerInformationIterator_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-
+    
     virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
         ServerInformationIterator *object
         ACE_ENV_ARG_DECL
       );
-
+    
   private:
     _TAO_ServerInformationIterator_Remote_Proxy_Impl remote_proxy_impl_;
-
+  
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ServerInformationIterator_Remote_Proxy_Broker *the_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
   };
-
+  
   //
-  //              End Remote Proxy Broker Declaration
+  //              End Remote Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationIterator;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
@@ -2297,7 +2298,7 @@ TAO_NAMESPACE_CLOSE // module ImplementationRepository
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80
 
 extern TAO_PortableServer_Export
 ImplementationRepository::_TAO_ServerObject_Proxy_Broker *
@@ -2318,14 +2319,14 @@ ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker *
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::AlreadyRegistered &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::AlreadyRegistered*); // noncopying version
@@ -2333,7 +2334,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::AlreadyRegistered *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::CannotActivate &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::CannotActivate*); // noncopying version
@@ -2341,7 +2342,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::CannotActivate *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::NotFound &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::NotFound*); // noncopying version
@@ -2349,7 +2350,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::NotFound *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
@@ -2357,7 +2358,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
@@ -2365,13 +2366,13 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_ch.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
@@ -2379,7 +2380,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
@@ -2387,7 +2388,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
@@ -2395,56 +2396,56 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::AlreadyRegistered &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::AlreadyRegistered &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::CannotActivate &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::CannotActivate &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::NotFound &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::NotFound &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
@@ -2461,25 +2462,25 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ch.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
@@ -2496,24 +2497,24 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "ImplRepoC.i"
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index d2ed1cb120b..ba41ad76b93 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -21,7 +21,7 @@
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_
@@ -37,10 +37,17 @@ ImplementationRepository::ServerObject::ServerObject (
   this->ImplementationRepository_ServerObject_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+ImplementationRepository::ServerObject::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class ImplementationRepository::EnvironmentVariable_var
@@ -103,7 +110,7 @@ ImplementationRepository::EnvironmentVariable_var::operator= (const ::Implementa
               EnvironmentVariable (*_tao_struct_var.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               EnvironmentVariable *tmp = deep_copy;
@@ -113,7 +120,7 @@ ImplementationRepository::EnvironmentVariable_var::operator= (const ::Implementa
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -136,20 +143,20 @@ ImplementationRepository::EnvironmentVariable_var::operator const ::Implementati
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast
+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast
+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast
+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast 
 {
   return this->ptr_;
 }
@@ -190,7 +197,7 @@ ImplementationRepository::EnvironmentVariable_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class ImplementationRepository::EnvironmentVariable_out
@@ -232,7 +239,7 @@ ImplementationRepository::EnvironmentVariable_out::operator= (EnvironmentVariabl
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ImplementationRepository::EnvironmentVariable_out::operator ::ImplementationRepository::EnvironmentVariable *&() // cast
 {
   return this->ptr_;
@@ -250,8 +257,8 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+// 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)
 
@@ -279,7 +286,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
 }
 
 ACE_INLINE
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum)
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (maximum))
 {
 }
@@ -307,12 +314,12 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
         _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->maximum_);
       ImplementationRepository::EnvironmentVariable * const tmp2 =
         ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
           tmp1[i] = tmp2[i];
         }
-
+      
       this->buffer_ = tmp1;
     }
   else
@@ -331,7 +338,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
     {
       return *this;
     }
-
+  
   if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -339,9 +346,9 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
           // Free the old buffer.
           ImplementationRepository::EnvironmentVariable *tmp =
             ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
-
+          
           _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
-
+          
           this->buffer_ =
             _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_);
         }
@@ -351,19 +358,19 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
       this->buffer_ =
         _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_);
     }
-
+  
   TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+  
   ImplementationRepository::EnvironmentVariable *tmp1 =
     ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
   ImplementationRepository::EnvironmentVariable * const tmp2 =
     ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tmp1[i] = tmp2[i];
     }
-
+  
   return *this;
 }
 
@@ -395,7 +402,7 @@ ImplementationRepository::EnvironmentVariable *
 ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (CORBA::Boolean orphan)
 {
   ImplementationRepository::EnvironmentVariable *result = 0;
-
+  
   if (orphan == 0)
     {
       // We retain ownership.
@@ -425,7 +432,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
           this->release_ = 0;
         }
     }
-
+  
   return result;
 }
 
@@ -447,27 +454,27 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
 {
   this->maximum_ = max;
   this->length_ = length;
-
+  
   if (this->buffer_ && this->release_ == 1)
     {
       ImplementationRepository::EnvironmentVariable *tmp =
         ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable*, this->buffer_);
       _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
     }
-
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class ImplementationRepository::EnvironmentList_var
@@ -530,7 +537,7 @@ ImplementationRepository::EnvironmentList_var::operator= (const ::Implementation
               EnvironmentList (*p.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               EnvironmentList *tmp = deep_copy;
@@ -540,7 +547,7 @@ ImplementationRepository::EnvironmentList_var::operator= (const ::Implementation
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -565,20 +572,20 @@ ImplementationRepository::EnvironmentList_var::operator const ::ImplementationRe
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast
+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast
+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast
+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast 
 {
   return this->ptr_;
 }
@@ -636,8 +643,8 @@ ImplementationRepository::EnvironmentList_var::ptr (void) const
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
 
 // *************************************************************
 // Inline operations for class ImplementationRepository::EnvironmentList_out
@@ -709,7 +716,7 @@ ImplementationRepository::EnvironmentList_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class ImplementationRepository::StartupOptions_var
@@ -772,7 +779,7 @@ ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationR
               StartupOptions (*_tao_struct_var.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               StartupOptions *tmp = deep_copy;
@@ -782,7 +789,7 @@ ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationR
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -805,20 +812,20 @@ ImplementationRepository::StartupOptions_var::operator const ::ImplementationRep
 }
 
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast
+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast
+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast
+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast 
 {
   return this->ptr_;
 }
@@ -859,7 +866,7 @@ ImplementationRepository::StartupOptions_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class ImplementationRepository::StartupOptions_out
@@ -901,7 +908,7 @@ ImplementationRepository::StartupOptions_out::operator= (StartupOptions *_tao_st
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ImplementationRepository::StartupOptions_out::operator ::ImplementationRepository::StartupOptions *&() // cast
 {
   return this->ptr_;
@@ -920,7 +927,7 @@ ImplementationRepository::StartupOptions_out::operator-> (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:194
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
 
 // *************************************************************
 // Inline operations for class ImplementationRepository::ServerInformation_var
@@ -983,7 +990,7 @@ ImplementationRepository::ServerInformation_var::operator= (const ::Implementati
               ServerInformation (*_tao_struct_var.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               ServerInformation *tmp = deep_copy;
@@ -993,7 +1000,7 @@ ImplementationRepository::ServerInformation_var::operator= (const ::Implementati
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -1016,20 +1023,20 @@ ImplementationRepository::ServerInformation_var::operator const ::Implementation
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast
+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast
+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast
+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast 
 {
   return this->ptr_;
 }
@@ -1070,7 +1077,7 @@ ImplementationRepository::ServerInformation_var::ptr (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_structure.cpp:523
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
 
 // *************************************************************
 // Inline operations for class ImplementationRepository::ServerInformation_out
@@ -1112,7 +1119,7 @@ ImplementationRepository::ServerInformation_out::operator= (ServerInformation *_
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ImplementationRepository::ServerInformation_out::operator ::ImplementationRepository::ServerInformation *&() // cast
 {
   return this->ptr_;
@@ -1130,8 +1137,8 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+// 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)
 
@@ -1159,7 +1166,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
 }
 
 ACE_INLINE
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum)
+ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (maximum))
 {
 }
@@ -1187,12 +1194,12 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
         _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->maximum_);
       ImplementationRepository::ServerInformation * const tmp2 =
         ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
           tmp1[i] = tmp2[i];
         }
-
+      
       this->buffer_ = tmp1;
     }
   else
@@ -1211,7 +1218,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
     {
       return *this;
     }
-
+  
   if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -1219,9 +1226,9 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
           // Free the old buffer.
           ImplementationRepository::ServerInformation *tmp =
             ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
-
+          
           _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
-
+          
           this->buffer_ =
             _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_);
         }
@@ -1231,19 +1238,19 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
       this->buffer_ =
         _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_);
     }
-
+  
   TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+  
   ImplementationRepository::ServerInformation *tmp1 =
     ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
   ImplementationRepository::ServerInformation * const tmp2 =
     ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tmp1[i] = tmp2[i];
     }
-
+  
   return *this;
 }
 
@@ -1275,7 +1282,7 @@ ImplementationRepository::ServerInformation *
 ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (CORBA::Boolean orphan)
 {
   ImplementationRepository::ServerInformation *result = 0;
-
+  
   if (orphan == 0)
     {
       // We retain ownership.
@@ -1305,7 +1312,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
           this->release_ = 0;
         }
     }
-
+  
   return result;
 }
 
@@ -1327,27 +1334,27 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
 {
   this->maximum_ = max;
   this->length_ = length;
-
+  
   if (this->buffer_ && this->release_ == 1)
     {
       ImplementationRepository::ServerInformation *tmp =
         ACE_reinterpret_cast (ImplementationRepository::ServerInformation*, this->buffer_);
       _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
     }
-
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:226
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
 
 // *************************************************************
 // Inline operations for class ImplementationRepository::ServerInformationList_var
@@ -1410,7 +1417,7 @@ ImplementationRepository::ServerInformationList_var::operator= (const ::Implemen
               ServerInformationList (*p.ptr_),
               *this
             );
-
+          
           if (deep_copy != 0)
             {
               ServerInformationList *tmp = deep_copy;
@@ -1420,7 +1427,7 @@ ImplementationRepository::ServerInformationList_var::operator= (const ::Implemen
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -1445,20 +1452,20 @@ ImplementationRepository::ServerInformationList_var::operator const ::Implementa
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast
+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast
+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast 
 {
   return *this->ptr_;
 }
 
 // Variable-size types only.
 ACE_INLINE
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast
+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast 
 {
   return this->ptr_;
 }
@@ -1516,8 +1523,8 @@ ImplementationRepository::ServerInformationList_var::ptr (void) const
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
 
 // *************************************************************
 // Inline operations for class ImplementationRepository::ServerInformationList_out
@@ -1589,7 +1596,7 @@ ImplementationRepository::ServerInformationList_out::operator[] (CORBA::ULong in
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_
@@ -1605,10 +1612,17 @@ ImplementationRepository::Administration::Administration (
   this->ImplementationRepository_Administration_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+ImplementationRepository::Administration::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_
@@ -1624,10 +1638,17 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
   this->ImplementationRepository_ServerInformationIterator_setup_collocation (_tao_collocated);
 }
 
+ACE_INLINE
+CORBA::Boolean
+ImplementationRepository::ServerInformationIterator::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -1640,7 +1661,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1669,7 +1690,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1718,7 +1739,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1747,7 +1768,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1788,7 +1809,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_
@@ -1806,7 +1827,7 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ci.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
 
 ACE_INLINE
 CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ActivationMode &_tao_enumval)
@@ -1820,17 +1841,17 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::Activat
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (ImplementationRepository::ActivationMode, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1877,7 +1898,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1922,7 +1943,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_
@@ -1940,7 +1961,7 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -1953,7 +1974,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index 23ba7b864dc..6cb4c01c726 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -21,12 +21,11 @@
 
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:670
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:670
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOS_CPP_
 #define _TAO_IDL_ORIG_IMPLREPOS_CPP_
 
-
 #include "ImplRepoS.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Operation_Table.h"
@@ -55,7 +54,7 @@
 
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1731
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
 
 class TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -66,7 +65,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/home/boris/cvs-ace/range/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -165,12 +164,12 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch
 static TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable tao_ImplementationRepository_ServerObject_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ServerRequestInfo
 {
@@ -223,7 +222,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
     TAO_ServerRequest &_tao_server_request,
@@ -299,7 +298,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo
 {
@@ -352,7 +351,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
     TAO_ServerRequest &_tao_server_request,
@@ -434,7 +433,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_is_
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TAO_ServerObject_Strategized_Proxy_Broker (void)
@@ -532,7 +531,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:598
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 ImplementationRepository::_TAO_ServerObject_Proxy_Broker *
 ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -559,7 +558,7 @@ static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::_TAO_ServerObject_ThruPOA_Proxy_Impl (void)
 {}
@@ -567,7 +566,7 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::_TAO_ServerO
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
     CORBA::Object *_collocated_tao_target_
@@ -607,7 +606,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown (
     CORBA::Object *_collocated_tao_target_
@@ -695,7 +694,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:98
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
 
 POA_ImplementationRepository::ServerObject::ServerObject (void)
 {
@@ -711,7 +710,7 @@ POA_ImplementationRepository::ServerObject::~ServerObject (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::ServerObject::ping_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -829,7 +828,7 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::ServerObject::shutdown_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -947,7 +946,7 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:163
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_ImplementationRepository::ServerObject::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -1110,7 +1109,7 @@ const char* POA_ImplementationRepository::ServerObject::_interface_repository_id
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:532
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
 
 void POA_ImplementationRepository::ServerObject::_dispatch (
     TAO_ServerRequest &req,
@@ -1125,7 +1124,7 @@ void POA_ImplementationRepository::ServerObject::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:478
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
 ImplementationRepository::ServerObject *
 POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -1167,7 +1166,7 @@ POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1731
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
 
 class TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -1178,7 +1177,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/home/boris/cvs-ace/range/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1290,12 +1289,12 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const
 static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_ImplementationRepository_Administration_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ServerRequestInfo
 {
@@ -1350,7 +1349,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
     TAO_ServerRequest &_tao_server_request,
@@ -1452,7 +1451,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::t
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup : public TAO_ServerRequestInfo
 {
@@ -1511,7 +1510,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (
     TAO_ServerRequest &_tao_server_request,
@@ -1630,7 +1629,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo
 {
@@ -1687,7 +1686,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
     TAO_ServerRequest &_tao_server_request,
@@ -1794,7 +1793,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::t
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo
 {
@@ -1851,7 +1850,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
     TAO_ServerRequest &_tao_server_request,
@@ -1943,7 +1942,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo
 {
@@ -1998,7 +1997,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
     TAO_ServerRequest &_tao_server_request,
@@ -2099,7 +2098,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::tar
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo
 {
@@ -2154,7 +2153,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
     TAO_ServerRequest &_tao_server_request,
@@ -2255,7 +2254,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::t
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo
 {
@@ -2316,7 +2315,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
     TAO_ServerRequest &_tao_server_request,
@@ -2440,7 +2439,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ServerRequestInfo
 {
@@ -2495,7 +2494,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
     TAO_ServerRequest &_tao_server_request,
@@ -2596,7 +2595,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo
 {
@@ -2651,7 +2650,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
     TAO_ServerRequest &_tao_server_request,
@@ -2752,7 +2751,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_is_a
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo
 {
@@ -2809,7 +2808,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
     TAO_ServerRequest &_tao_server_request,
@@ -2904,7 +2903,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_is_a
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_TAO_Administration_Strategized_Proxy_Broker (void)
@@ -3002,7 +3001,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:598
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 ImplementationRepository::_TAO_Administration_Proxy_Broker *
 ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -3029,7 +3028,7 @@ static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factor
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Administration_ThruPOA_Proxy_Impl (void)
 {}
@@ -3037,7 +3036,7 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Admin
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server (
     CORBA::Object *_collocated_tao_target_,
@@ -3081,7 +3080,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup (
     CORBA::Object *_collocated_tao_target_,
@@ -3128,7 +3127,7 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::act
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server (
     CORBA::Object *_collocated_tao_target_,
@@ -3173,7 +3172,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server (
     CORBA::Object *_collocated_tao_target_,
@@ -3217,7 +3216,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server (
     CORBA::Object *_collocated_tao_target_,
@@ -3260,7 +3259,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server (
     CORBA::Object *_collocated_tao_target_,
@@ -3303,7 +3302,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running (
     CORBA::Object *_collocated_tao_target_,
@@ -3351,7 +3350,7 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down (
     CORBA::Object *_collocated_tao_target_,
@@ -3394,7 +3393,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
     CORBA::Object *_collocated_tao_target_,
@@ -3439,7 +3438,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list (
     CORBA::Object *_collocated_tao_target_,
@@ -3482,7 +3481,9 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list
         server_iterator
         ACE_ENV_ARG_PARAMETER
       );
-}//
+}
+
+//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////
@@ -3713,9 +3714,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:98
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
 
 POA_ImplementationRepository::Administration::Administration (void)
 {
@@ -3731,7 +3731,7 @@ POA_ImplementationRepository::Administration::~Administration (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::activate_server_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3859,7 +3859,7 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::activate_server_with_startup_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4002,7 +4002,7 @@ void POA_ImplementationRepository::Administration::activate_server_with_startup_
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::register_server_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4136,7 +4136,7 @@ void POA_ImplementationRepository::Administration::register_server_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::reregister_server_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4270,7 +4270,7 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::remove_server_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4398,7 +4398,7 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::shutdown_server_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4526,7 +4526,7 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::server_is_running_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4675,7 +4675,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::server_is_shutting_down_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4803,7 +4803,7 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::find_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4940,7 +4940,7 @@ void POA_ImplementationRepository::Administration::find_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::Administration::list_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -5083,7 +5083,7 @@ void POA_ImplementationRepository::Administration::list_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:163
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_ImplementationRepository::Administration::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -5246,7 +5246,7 @@ const char* POA_ImplementationRepository::Administration::_interface_repository_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:532
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
 
 void POA_ImplementationRepository::Administration::_dispatch (
     TAO_ServerRequest &req,
@@ -5261,7 +5261,7 @@ void POA_ImplementationRepository::Administration::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:478
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
 ImplementationRepository::Administration *
 POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -5303,7 +5303,7 @@ POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1731
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
 
 class TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -5314,7 +5314,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/home/boris/cvs-ace/range/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -5412,12 +5412,12 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo
 static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable tao_ImplementationRepository_ServerInformationIterator_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ServerRequestInfo
 {
@@ -5474,7 +5474,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
     TAO_ServerRequest &_tao_server_request,
@@ -5571,7 +5571,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ServerRequestInfo
 {
@@ -5624,7 +5624,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
     TAO_ServerRequest &_tao_server_request,
@@ -5706,7 +5706,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
@@ -5804,7 +5804,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:598
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker *
 ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -5831,7 +5831,7 @@ static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void)
 {}
@@ -5839,7 +5839,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl:
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n (
     CORBA::Object *_collocated_tao_target_,
@@ -5884,7 +5884,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
 
 void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy (
     CORBA::Object *_collocated_tao_target_
@@ -5921,7 +5921,9 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_
         
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
-}//
+}
+
+//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////
@@ -5974,9 +5976,8 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_I
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:98
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
 
 POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void)
 {
@@ -5992,7 +5993,7 @@ POA_ImplementationRepository::ServerInformationIterator::~ServerInformationItera
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -6133,7 +6134,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:100
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -6251,7 +6252,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:163
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -6414,7 +6415,7 @@ const char* POA_ImplementationRepository::ServerInformationIterator::_interface_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:532
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
 
 void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
     TAO_ServerRequest &req,
@@ -6429,7 +6430,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:478
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
 ImplementationRepository::ServerInformationIterator *
 POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -6469,4 +6470,5 @@ POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_A
   (void) safe_stub.release ();
   return ::ImplementationRepository::ServerInformationIterator::_unchecked_narrow (obj.in ());
 }
+
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index 34891555b47..6b6e2c69d47 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -20,7 +20,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:443
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:443
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOS_H_
 #define _TAO_IDL_ORIG_IMPLREPOS_H_
@@ -50,12 +50,12 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
 
 TAO_NAMESPACE  POA_ImplementationRepository
 {
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:86
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
   
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
@@ -124,7 +124,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void ping (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -141,7 +141,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void shutdown (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -163,7 +163,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
   
   class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Broker
   {
@@ -210,7 +210,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : 
     public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
@@ -222,7 +222,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     virtual void ping (
         CORBA::Object *_collocated_tao_target_
@@ -233,7 +233,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     virtual void shutdown (
         CORBA::Object *_collocated_tao_target_
@@ -261,7 +261,7 @@ public:
   virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) {}
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void ping (
       CORBA::Object *_collocated_tao_target_
@@ -272,7 +272,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void shutdown (
       CORBA::Object *_collocated_tao_target_
@@ -288,7 +288,7 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:86
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
 
 class Administration;
 typedef Administration *Administration_ptr;
@@ -357,7 +357,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
   
   virtual void activate_server (
       const char * server
@@ -377,7 +377,7 @@ public:
     );
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
   
   virtual char * activate_server_with_startup (
       const char * server,
@@ -398,7 +398,7 @@ public:
     );
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
   
   virtual void register_server (
       const char * server,
@@ -418,7 +418,7 @@ public:
     );
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
   
   virtual void reregister_server (
       const char * server,
@@ -437,7 +437,7 @@ public:
     );
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
   
   virtual void remove_server (
       const char * server
@@ -456,7 +456,7 @@ public:
     );
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
   
   virtual void shutdown_server (
       const char * server
@@ -475,7 +475,7 @@ public:
     );
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
   
   virtual char * server_is_running (
       const char * server,
@@ -496,7 +496,7 @@ public:
     );
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
   
   virtual void server_is_shutting_down (
       const char * server
@@ -515,7 +515,7 @@ public:
     );
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
   
   virtual void find (
       const char * server,
@@ -535,7 +535,7 @@ public:
     );
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
   
   virtual void list (
       CORBA::ULong how_many,
@@ -560,7 +560,7 @@ public:
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
 
 class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Broker
 {
@@ -607,7 +607,7 @@ public:
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
 
 class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl : 
   public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl,
@@ -619,7 +619,7 @@ public:
   virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) {}
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void activate_server (
       CORBA::Object *_collocated_tao_target_,
@@ -633,7 +633,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual char * activate_server_with_startup (
       CORBA::Object *_collocated_tao_target_,
@@ -648,7 +648,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void register_server (
       CORBA::Object *_collocated_tao_target_,
@@ -662,7 +662,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void reregister_server (
       CORBA::Object *_collocated_tao_target_,
@@ -675,7 +675,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void remove_server (
       CORBA::Object *_collocated_tao_target_,
@@ -688,7 +688,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void shutdown_server (
       CORBA::Object *_collocated_tao_target_,
@@ -701,7 +701,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual char * server_is_running (
       CORBA::Object *_collocated_tao_target_,
@@ -716,7 +716,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void server_is_shutting_down (
       CORBA::Object *_collocated_tao_target_,
@@ -729,7 +729,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void find (
       CORBA::Object *_collocated_tao_target_,
@@ -743,7 +743,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void list (
       CORBA::Object *_collocated_tao_target_,
@@ -774,7 +774,7 @@ public:
   virtual ~_TAO_Administration_Direct_Proxy_Impl (void) {}
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void activate_server (
       CORBA::Object *_collocated_tao_target_,
@@ -788,7 +788,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual char * activate_server_with_startup (
       CORBA::Object *_collocated_tao_target_,
@@ -803,7 +803,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void register_server (
       CORBA::Object *_collocated_tao_target_,
@@ -817,7 +817,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void reregister_server (
       CORBA::Object *_collocated_tao_target_,
@@ -830,7 +830,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void remove_server (
       CORBA::Object *_collocated_tao_target_,
@@ -843,7 +843,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void shutdown_server (
       CORBA::Object *_collocated_tao_target_,
@@ -856,7 +856,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual char * server_is_running (
       CORBA::Object *_collocated_tao_target_,
@@ -871,7 +871,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void server_is_shutting_down (
       CORBA::Object *_collocated_tao_target_,
@@ -884,7 +884,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void find (
       CORBA::Object *_collocated_tao_target_,
@@ -898,7 +898,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void list (
       CORBA::Object *_collocated_tao_target_,
@@ -917,7 +917,7 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:86
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
 
 class ServerInformationIterator;
 typedef ServerInformationIterator *ServerInformationIterator_ptr;
@@ -986,7 +986,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
   
   virtual CORBA::Boolean next_n (
       CORBA::ULong how_many,
@@ -1005,7 +1005,7 @@ public:
     );
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
   
   virtual void destroy (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1027,7 +1027,7 @@ public:
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
 
 class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker
 {
@@ -1074,7 +1074,7 @@ public:
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
 
 class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : 
   public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl,
@@ -1086,7 +1086,7 @@ public:
   virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) {}
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual CORBA::Boolean next_n (
       CORBA::Object *_collocated_tao_target_,
@@ -1099,7 +1099,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void destroy (
       CORBA::Object *_collocated_tao_target_
@@ -1127,7 +1127,7 @@ public:
   virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) {}
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual CORBA::Boolean next_n (
       CORBA::Object *_collocated_tao_target_,
@@ -1140,7 +1140,7 @@ public:
     ));
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
   virtual void destroy (
       CORBA::Object *_collocated_tao_target_
@@ -1158,13 +1158,13 @@ public:
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:1044
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
 
 #include "ImplRepoS_T.h"
 
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.cpp b/TAO/tao/PortableServer/ImplRepoS_T.cpp
index 23710f574e7..c02c3ce9c7c 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS_T.cpp
@@ -20,7 +20,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:777
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:777
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOS_T_CPP_
 #define _TAO_IDL_ORIG_IMPLREPOS_T_CPP_
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h
index cd28c10c9ad..72533274cde 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.h
+++ b/TAO/tao/PortableServer/ImplRepoS_T.h
@@ -20,7 +20,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:604
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:604
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOS_T_H_
 #define _TAO_IDL_ORIG_IMPLREPOS_T_H_
@@ -36,14 +36,14 @@
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_root/root_sth.cpp:116
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
 
 #if defined (ACE_HAS_USING_KEYWORD)
 TAO_NAMESPACE  POA_ImplementationRepository
 {
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/tie_sh.cpp:87
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -83,7 +83,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     void ping (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -93,7 +93,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     void shutdown (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -113,7 +113,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/tie_sh.cpp:87
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -153,7 +153,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     void activate_server (
         const char * server
@@ -166,7 +166,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     char * activate_server_with_startup (
         const char * server,
@@ -180,7 +180,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     void register_server (
         const char * server,
@@ -193,7 +193,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     void reregister_server (
         const char * server,
@@ -205,7 +205,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     void remove_server (
         const char * server
@@ -217,7 +217,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     void shutdown_server (
         const char * server
@@ -229,7 +229,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     char * server_is_running (
         const char * server,
@@ -243,7 +243,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     void server_is_shutting_down (
         const char * server
@@ -255,7 +255,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     void find (
         const char * server,
@@ -268,7 +268,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     void list (
         CORBA::ULong how_many,
@@ -291,7 +291,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/tie_sh.cpp:87
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -331,7 +331,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean next_n (
         CORBA::ULong how_many,
@@ -343,7 +343,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/tie_sh.cpp:60
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -366,7 +366,7 @@ TAO_NAMESPACE_CLOSE // module ImplementationRepository
 #endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:1141
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
 
 #if defined (__ACE_INLINE__)
 #include "ImplRepoS_T.i"
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i
index 1553b9a0cdc..7f714d333b3 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.i
+++ b/TAO/tao/PortableServer/ImplRepoS_T.i
@@ -21,7 +21,7 @@
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/tie_si.cpp:96
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
 
 #if defined (ACE_HAS_USING_KEYWORD)
 
@@ -116,7 +116,7 @@ POA_ImplementationRepository::ServerObject_tie<T>::_default_POA (ACE_ENV_SINGLE_
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::ServerObject_tie<T>::ping  (
@@ -132,7 +132,7 @@ void POA_ImplementationRepository::ServerObject_tie<T>::ping  (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::ServerObject_tie<T>::shutdown  (
@@ -150,7 +150,7 @@ void POA_ImplementationRepository::ServerObject_tie<T>::shutdown  (
 #endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/tie_si.cpp:96
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
 
 #if defined (ACE_HAS_USING_KEYWORD)
 
@@ -245,7 +245,7 @@ POA_ImplementationRepository::Administration_tie<T>::_default_POA (ACE_ENV_SINGL
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::activate_server  (
@@ -265,7 +265,7 @@ void POA_ImplementationRepository::Administration_tie<T>::activate_server  (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 char * POA_ImplementationRepository::Administration_tie<T>::activate_server_with_startup  (
@@ -287,7 +287,7 @@ char * POA_ImplementationRepository::Administration_tie<T>::activate_server_with
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::register_server  (
@@ -308,7 +308,7 @@ void POA_ImplementationRepository::Administration_tie<T>::register_server  (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::reregister_server  (
@@ -328,7 +328,7 @@ void POA_ImplementationRepository::Administration_tie<T>::reregister_server  (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::remove_server  (
@@ -347,7 +347,7 @@ void POA_ImplementationRepository::Administration_tie<T>::remove_server  (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::shutdown_server  (
@@ -366,7 +366,7 @@ void POA_ImplementationRepository::Administration_tie<T>::shutdown_server  (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 char * POA_ImplementationRepository::Administration_tie<T>::server_is_running  (
@@ -389,7 +389,7 @@ char * POA_ImplementationRepository::Administration_tie<T>::server_is_running  (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_down  (
@@ -408,7 +408,7 @@ void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_dow
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::find  (
@@ -429,7 +429,7 @@ void POA_ImplementationRepository::Administration_tie<T>::find  (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::list  (
@@ -453,7 +453,7 @@ void POA_ImplementationRepository::Administration_tie<T>::list  (
 #endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/tie_si.cpp:96
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
 
 #if defined (ACE_HAS_USING_KEYWORD)
 
@@ -548,7 +548,7 @@ POA_ImplementationRepository::ServerInformationIterator_tie<T>::_default_POA (AC
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::next_n  (
@@ -568,7 +568,7 @@ CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::n
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/tie_si.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::ServerInformationIterator_tie<T>::destroy  (
@@ -584,4 +584,3 @@ void POA_ImplementationRepository::ServerInformationIterator_tie<T>::destroy  (
 }
 
 #endif /* ACE_HAS_USING_KEYWORD */
-
diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile
index d1b0dfe7439..18d982ede20 100644
--- a/TAO/tao/PortableServer/Makefile
+++ b/TAO/tao/PortableServer/Makefile
@@ -163,12 +163,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -181,13 +178,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -197,6 +194,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -215,28 +230,48 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   Object_Adapter.h Key_Adapters.h $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -244,33 +279,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -357,12 +365,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -375,13 +380,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -391,6 +396,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -409,36 +432,58 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -453,13 +498,11 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -476,16 +519,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -497,21 +543,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -524,14 +555,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -575,10 +598,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -612,7 +655,8 @@ endif
   POA.i
 
 .obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp POA.h \
-  $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
@@ -661,7 +705,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -690,7 +735,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -725,6 +771,37 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -733,15 +810,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
@@ -750,33 +829,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -818,16 +870,20 @@ endif
   POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -839,8 +895,6 @@ endif
   POAManager.i \
   POA_Cached_Policies.h \
   POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
@@ -861,10 +915,12 @@ endif
   ImplRepoS_T.cpp \
   ImplRepoS.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   IORInfo.h \
@@ -878,9 +934,10 @@ endif
   $(TAO_ROOT)/tao/Acceptor_Filter.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -938,8 +995,6 @@ endif
   $(TAO_ROOT)/tao/Stub.i \
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
@@ -980,14 +1035,29 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Acceptor_Filter.i \
-  $(TAO_ROOT)/tao/Transport_Acceptor.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -1000,18 +1070,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1021,6 +1086,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1039,32 +1122,37 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Acceptor_Filter.i \
+  $(TAO_ROOT)/tao/Transport_Acceptor.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -1072,10 +1160,16 @@ endif
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Transport_Acceptor.inl
 
@@ -1134,12 +1228,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -1152,13 +1243,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1168,6 +1259,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1186,28 +1295,48 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -1215,33 +1344,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -1274,16 +1376,20 @@ endif
   Object_Adapter.i POA.h POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1293,8 +1399,6 @@ endif
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
   POA_Cached_Policies.h POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i \
@@ -1302,16 +1406,19 @@ endif
   $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -1375,8 +1482,6 @@ endif
   $(TAO_ROOT)/tao/Stub.i \
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
@@ -1427,7 +1532,8 @@ endif
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1452,7 +1558,8 @@ endif
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -1463,7 +1570,8 @@ endif
   $(ACE_ROOT)/ace/Init_ACE.i \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
@@ -1471,7 +1579,8 @@ endif
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -1529,7 +1638,8 @@ endif
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1542,22 +1652,29 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -1621,12 +1738,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -1639,13 +1753,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1655,6 +1769,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1673,28 +1805,48 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -1702,33 +1854,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -1792,12 +1917,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -1810,13 +1932,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1826,6 +1948,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1844,42 +1984,66 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   poa_macros.h $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1896,33 +2060,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -1950,8 +2087,6 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \
   Object_Adapter.i POA_Cached_Policies.h POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i \
@@ -1959,16 +2094,19 @@ endif
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -2068,12 +2206,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -2086,13 +2221,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2102,6 +2237,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -2120,28 +2273,48 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -2149,33 +2322,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -2251,12 +2397,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -2269,13 +2412,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2285,6 +2428,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -2303,28 +2464,48 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.h \
@@ -2338,33 +2519,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -2391,16 +2545,20 @@ endif
   Object_Adapter.i POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -2410,8 +2568,6 @@ endif
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
   POA_Cached_Policies.h POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i Operation_Table.h \
@@ -2430,16 +2586,19 @@ endif
   $(ACE_ROOT)/ace/Timeprobe.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -2496,7 +2655,8 @@ endif
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
 .obj/ThruPOA_Object_Proxy_Impl.o .obj/ThruPOA_Object_Proxy_Impl.so .shobj/ThruPOA_Object_Proxy_Impl.o .shobj/ThruPOA_Object_Proxy_Impl.so: ThruPOA_Object_Proxy_Impl.cpp POA.h \
-  $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
@@ -2545,7 +2705,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2574,7 +2735,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2606,6 +2768,37 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -2614,15 +2807,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -2630,33 +2825,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -2689,16 +2857,20 @@ endif
   Object_Adapter.i POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -2708,23 +2880,24 @@ endif
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
   POA_Cached_Policies.h POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i \
   ThruPOA_Object_Proxy_Impl.h $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -2834,12 +3007,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -2852,13 +3022,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2868,6 +3038,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -2886,27 +3074,47 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -2914,33 +3122,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -2974,6 +3155,7 @@ endif
 
 .obj/Strategized_Object_Proxy_Broker.o .obj/Strategized_Object_Proxy_Broker.so .shobj/Strategized_Object_Proxy_Broker.o .shobj/Strategized_Object_Proxy_Broker.so: Strategized_Object_Proxy_Broker.cpp \
   Strategized_Object_Proxy_Broker.h portableserver_export.h \
+  $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -3036,7 +3218,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3065,7 +3248,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -3074,7 +3258,8 @@ endif
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -3087,22 +3272,56 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -3121,13 +3340,11 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -3144,16 +3361,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -3165,21 +3385,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -3192,14 +3397,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -3283,12 +3480,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -3301,13 +3495,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3317,6 +3511,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -3335,28 +3547,48 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   PortableServerC.i \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
@@ -3373,33 +3605,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -3425,16 +3630,20 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \
   Object_Adapter.i $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -3450,16 +3659,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -3565,12 +3777,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -3583,13 +3792,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3599,6 +3808,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -3617,23 +3844,41 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
@@ -3641,6 +3886,8 @@ endif
   PortableServer.h \
   portableserver_export.h \
   PortableServerC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   PortableServerC.i \
   Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
@@ -3664,33 +3911,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -3736,18 +3956,20 @@ endif
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/GIOPC.i \
   $(TAO_ROOT)/tao/Tagged_Profile.i \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -3756,10 +3978,10 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -3770,16 +3992,19 @@ endif
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -3886,12 +4111,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -3904,13 +4126,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3920,6 +4142,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -3938,33 +4178,55 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i
 
@@ -3976,13 +4238,15 @@ endif
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   ImplRepo_i.h \
   ImplRepoS.h \
   ImplRepoC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -3995,7 +4259,6 @@ endif
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -4031,7 +4294,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4060,7 +4324,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -4083,6 +4348,35 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -4091,6 +4385,8 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -4102,6 +4398,8 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   PortableServerC.i \
   Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
@@ -4120,10 +4418,12 @@ endif
   ImplRepoS_T.cpp \
   ImplRepoS.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i
 
@@ -4183,12 +4483,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -4201,13 +4498,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4217,6 +4514,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -4235,34 +4550,58 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -4283,8 +4622,6 @@ endif
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(TAO_ROOT)/tao/GIOPC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/GIOPC.i \
   $(TAO_ROOT)/tao/Tagged_Profile.i \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -4301,33 +4638,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -4358,16 +4668,19 @@ endif
   POA_Cached_Policies.h POA_Cached_Policies.i POA.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -4420,12 +4733,14 @@ endif
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i portableserver_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h portableserver_export.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -4438,7 +4753,6 @@ endif
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -4467,12 +4781,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -4485,13 +4796,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4501,6 +4812,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -4519,34 +4848,58 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -4573,8 +4926,6 @@ endif
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(TAO_ROOT)/tao/GIOPC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/GIOPC.i \
   $(TAO_ROOT)/tao/Tagged_Profile.i \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -4588,33 +4939,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -4694,7 +5018,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4723,7 +5048,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -4754,6 +5080,37 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -4762,15 +5119,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -4778,33 +5137,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -4837,16 +5169,20 @@ endif
   Object_Adapter.i POA.h POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -4856,14 +5192,13 @@ endif
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
   POA_Cached_Policies.h POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i
 
 .obj/Servant_Dispatcher.o .obj/Servant_Dispatcher.so .shobj/Servant_Dispatcher.o .shobj/Servant_Dispatcher.so: Servant_Dispatcher.cpp Servant_Dispatcher.h \
-  $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
@@ -4912,7 +5247,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4941,7 +5277,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -4973,6 +5310,37 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -4981,15 +5349,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -4997,33 +5367,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -5110,12 +5453,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -5128,13 +5468,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5144,6 +5484,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -5162,28 +5520,48 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i POA_Policies.i \
   POA_Cached_Policies.i POA_Policy_Set.h \
@@ -5245,12 +5623,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -5263,13 +5638,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5279,6 +5654,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -5297,28 +5690,48 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i POA_Policies.i
 
@@ -5378,12 +5791,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -5396,13 +5806,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5412,6 +5822,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -5430,34 +5858,58 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -5481,33 +5933,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -5536,18 +5961,21 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \
   Object_Adapter.i $(TAO_ROOT)/tao/ORBInitInfo.h \
   $(TAO_ROOT)/tao/ORBInitInfo.inl \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -5653,12 +6081,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -5671,13 +6096,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5687,6 +6112,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -5705,34 +6148,58 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -5805,12 +6272,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -5823,13 +6287,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5839,6 +6303,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -5857,28 +6339,48 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i POA_Policies.i \
   $(TAO_ROOT)/tao/Policy_Set.h \
@@ -5887,10 +6389,12 @@ endif
   $(TAO_ROOT)/tao/Policy_Validator.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
@@ -5900,13 +6404,11 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -5923,16 +6425,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -5944,21 +6449,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -5971,14 +6461,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -6057,12 +6539,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -6075,13 +6554,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -6091,6 +6570,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -6109,30 +6606,50 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i POA_Policies.h \
   PortableServerC.h $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i POA_Policies.i \
   $(TAO_ROOT)/tao/Policy_Set.h \
@@ -6195,12 +6712,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -6213,13 +6727,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -6229,6 +6743,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -6247,34 +6779,58 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -6304,33 +6860,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -6371,8 +6900,6 @@ endif
   POAManager.i \
   POA_Cached_Policies.h \
   POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
@@ -6432,26 +6959,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -6464,6 +6974,34 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -6488,18 +7026,39 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  Default_ORTC.i $(TAO_ROOT)/tao/Any.h \
+  Default_ORTC.i $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/Object.h \
@@ -6508,10 +7067,17 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i
 
@@ -6570,26 +7136,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -6602,6 +7151,34 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -6626,16 +7203,36 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   Default_ORTC.i ObjectReferenceTemplate.inl POA.h Object_Adapter.h \
   portableserver_export.h Key_Adapters.h PortableServerC.h \
@@ -6648,6 +7245,8 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
@@ -6662,33 +7261,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -6721,10 +7293,16 @@ endif
   Object_Adapter.i POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
@@ -6732,13 +7310,12 @@ endif
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
   POA_Cached_Policies.h POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i
 
 .obj/AMH_Response_Handler.o .obj/AMH_Response_Handler.so .shobj/AMH_Response_Handler.o .shobj/AMH_Response_Handler.so: AMH_Response_Handler.cpp AMH_Response_Handler.h \
+  $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -6800,7 +7377,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -6829,7 +7407,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6852,6 +7431,35 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -6860,11 +7468,19 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -6872,8 +7488,6 @@ endif
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(TAO_ROOT)/tao/GIOPC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/GIOPC.i \
   $(TAO_ROOT)/tao/Tagged_Profile.i \
   $(TAO_ROOT)/tao/OctetSeqC.h \
@@ -6886,10 +7500,10 @@ endif
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -6911,33 +7525,6 @@ endif
   $(ACE_ROOT)/ace/Recyclable.h \
   $(ACE_ROOT)/ace/Recyclable.inl \
   $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
@@ -6948,26 +7535,32 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -7076,12 +7669,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -7094,13 +7684,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -7110,6 +7700,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -7128,28 +7736,48 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i POA.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i PortableServerC.i POA.h \
   Object_Adapter.h Key_Adapters.h $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -7157,33 +7785,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -7216,16 +7817,20 @@ endif
   Object_Adapter.i POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -7235,8 +7840,6 @@ endif
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
   POA_Cached_Policies.h POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i
@@ -7302,7 +7905,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -7331,7 +7935,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7354,6 +7959,35 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -7362,6 +7996,8 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h ImplRepoC.i \
@@ -7374,10 +8010,14 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -7392,13 +8032,11 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -7415,16 +8053,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -7436,21 +8077,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -7463,14 +8089,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -7514,10 +8132,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -7587,7 +8225,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -7616,7 +8255,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7639,6 +8279,35 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -7647,6 +8316,8 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h ImplRepoC.i \
@@ -7658,6 +8329,8 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   PortableServerC.i \
   Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
@@ -7683,33 +8356,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -7755,18 +8401,20 @@ endif
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/GIOPC.i \
   $(TAO_ROOT)/tao/Tagged_Profile.i \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -7775,10 +8423,10 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -7789,16 +8437,19 @@ endif
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -7885,7 +8536,8 @@ endif
   $(TAO_ROOT)/tao/corbafwd.i portableserver_export.h \
   ImR_ActivatorC.i $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -7918,12 +8570,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -7936,6 +8585,23 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -7960,33 +8626,55 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -8001,13 +8689,11 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -8024,16 +8710,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -8045,21 +8734,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -8072,14 +8746,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -8123,10 +8789,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -8194,12 +8880,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -8212,13 +8895,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -8228,6 +8911,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -8246,28 +8947,48 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   PortableServerC.i \
   Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
@@ -8292,33 +9013,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -8364,18 +9058,20 @@ endif
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/GIOPC.i \
   $(TAO_ROOT)/tao/Tagged_Profile.i \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -8384,10 +9080,10 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -8398,16 +9094,19 @@ endif
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -8519,7 +9218,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -8548,7 +9248,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -8571,6 +9272,35 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -8579,6 +9309,8 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h ImplRepoC.i \
@@ -8591,10 +9323,14 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -8609,13 +9345,11 @@ endif
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -8632,16 +9366,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -8653,21 +9390,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -8680,14 +9402,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -8731,10 +9445,30 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -8803,7 +9537,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -8832,7 +9567,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -8855,6 +9591,35 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -8863,6 +9628,8 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h ImplRepoC.i \
@@ -8874,6 +9641,8 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   PortableServerC.i \
   Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
@@ -8897,33 +9666,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -8969,18 +9711,20 @@ endif
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/GIOPC.i \
   $(TAO_ROOT)/tao/Tagged_Profile.i \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -8989,10 +9733,10 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -9003,16 +9747,19 @@ endif
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index cd05ddc4cc5..44c20cf0b50 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -1,8 +1,5 @@
-
-
 // $Id$
 
-
 // -- PortableServer Include --
 #include "Object_Adapter.h"
 #include "POA.h"
@@ -297,7 +294,7 @@ TAO_Object_Adapter::create_lock (int enable_locking,
 }
 
 int
-TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
+TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
                                       TAO_ServerRequest &req,
                                       CORBA::Object_out forward_to
                                       ACE_ENV_ARG_DECL)
@@ -340,7 +337,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
 }
 
 void
-TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
+TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
                                 PortableServer::ObjectId &system_id,
                                 TAO_POA *&poa
                                 ACE_ENV_ARG_DECL)
@@ -501,7 +498,7 @@ TAO_Object_Adapter::unbind_poa (TAO_POA *poa,
 }
 
 int
-TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key
+TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key
                                       ACE_ENV_ARG_DECL)
 {
   PortableServer::ObjectId id;
@@ -536,7 +533,7 @@ TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key
 }
 
 TAO_SERVANT_LOCATION
-TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key,
+TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key,
                                     PortableServer::Servant &servant
                                     ACE_ENV_ARG_DECL)
 {
@@ -702,7 +699,7 @@ TAO_Object_Adapter::priority (void) const
 }
 
 int
-TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
+TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                               TAO_ServerRequest &request,
                               CORBA::Object_out forward_to
                               ACE_ENV_ARG_DECL)
@@ -807,7 +804,7 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub,
        ++j)
     {
       const TAO_Profile *profile = mp.get_profile (j);
-      TAO_ObjectKey_var objkey = profile->_key ();
+      TAO::ObjectKey_var objkey = profile->_key ();
 
       if (ACE_OS::memcmp (objkey->get_buffer (),
                           &TAO_POA::objectkey_prefix[0],
@@ -1215,7 +1212,7 @@ TAO_Object_Adapter::Servant_Upcall::Servant_Upcall (TAO_ORB_Core *oc)
 }
 
 int
-TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key,
+TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO::ObjectKey &key,
                                                         const char *operation,
                                                         CORBA::Object_out forward_to
                                                         ACE_ENV_ARG_DECL)
@@ -1353,7 +1350,7 @@ TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State (void)
 }
 
 TAO_POA *
-TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO_ObjectKey &key
+TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO::ObjectKey &key
                                                 ACE_ENV_ARG_DECL)
 {
   // Acquire the object adapter lock first.
@@ -1648,7 +1645,7 @@ TAO_POA_Current_Impl::TAO_POA_Current_Impl (void)
 
 void
 TAO_POA_Current_Impl::setup (TAO_POA *p,
-                             const TAO_ObjectKey &key)
+                             const TAO::ObjectKey &key)
 {
   // Remember information about this upcall.
   this->poa_ = p;
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 22a365e4607..ec8565158bc 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -158,10 +158,10 @@ public:
   const PortableServer::ObjectId &object_id (void) const;
 
   /// Set the object key.
-  void object_key (const TAO_ObjectKey &key);
+  void object_key (const TAO::ObjectKey &key);
 
   /// Get the object key.
-  const TAO_ObjectKey &object_key (void) const;
+  const TAO::ObjectKey &object_key (void) const;
 
   /// Set the servant for the current upcall.
   void servant (PortableServer::Servant servant);
@@ -183,7 +183,7 @@ public:
 
   /// Setup the current.
   void setup (TAO_POA *impl,
-              const TAO_ObjectKey &key);
+              const TAO::ObjectKey &key);
 
 protected:
   /// The POA implementation invoking an upcall
@@ -197,7 +197,7 @@ protected:
   PortableServer::ObjectId object_id_;
 
   /// The object key of the current context.
-  const TAO_ObjectKey *object_key_;
+  const TAO::ObjectKey *object_key_;
 
   /// The servant for the current upcall.
   PortableServer::Servant servant_;
@@ -244,15 +244,15 @@ public:
   /// Destructor.
   ~TAO_Object_Adapter (void);
 
-  int dispatch_servant (const TAO_ObjectKey &key,
+  int dispatch_servant (const TAO::ObjectKey &key,
                         TAO_ServerRequest &req,
                         CORBA::Object_out forward_to
                         ACE_ENV_ARG_DECL);
 
-  int locate_servant (const TAO_ObjectKey &key
+  int locate_servant (const TAO::ObjectKey &key
                       ACE_ENV_ARG_DECL);
 
-  TAO_SERVANT_LOCATION find_servant (const TAO_ObjectKey &key,
+  TAO_SERVANT_LOCATION find_servant (const TAO::ObjectKey &key,
                                      PortableServer::Servant &servant
                                      ACE_ENV_ARG_DECL);
 
@@ -318,7 +318,7 @@ public:
   virtual void check_close (int wait_for_completion
                             ACE_ENV_ARG_DECL);
   virtual int priority (void) const;
-  virtual int dispatch (TAO_ObjectKey &key,
+  virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
                         CORBA::Object_out foward_to
                         ACE_ENV_ARG_DECL)
@@ -330,19 +330,19 @@ public:
 
 protected:
 
-  int locate_servant_i (const TAO_ObjectKey &key
+  int locate_servant_i (const TAO::ObjectKey &key
                         ACE_ENV_ARG_DECL);
 
-  TAO_SERVANT_LOCATION find_servant_i (const TAO_ObjectKey &key,
+  TAO_SERVANT_LOCATION find_servant_i (const TAO::ObjectKey &key,
                                        PortableServer::Servant &servant
                                        ACE_ENV_ARG_DECL);
 
-  void dispatch_servant_i (const TAO_ObjectKey &key,
+  void dispatch_servant_i (const TAO::ObjectKey &key,
                            TAO_ServerRequest &req,
                            void *context
                            ACE_ENV_ARG_DECL);
 
-  void locate_poa (const TAO_ObjectKey &key,
+  void locate_poa (const TAO::ObjectKey &key,
                    PortableServer::ObjectId &id,
                    TAO_POA *&poa
                    ACE_ENV_ARG_DECL);
@@ -692,7 +692,7 @@ public:
     ~Servant_Upcall (void);
 
     /// Locate POA and servant.
-    int prepare_for_upcall (const TAO_ObjectKey &key,
+    int prepare_for_upcall (const TAO::ObjectKey &key,
                             const char *operation,
                             CORBA::Object_out forward_to
                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -708,7 +708,7 @@ public:
     void post_invoke (void);
 
     /// Locate POA.
-    TAO_POA *lookup_POA (const TAO_ObjectKey &key
+    TAO_POA *lookup_POA (const TAO::ObjectKey &key
                          ACE_ENV_ARG_DECL);
 
     /// POA accessor.
diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
index 2a5fcffebaf..d1cb1630b7f 100644
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -44,7 +44,7 @@ TAO_Object_Adapter::transient_poa_name_size ()
 }
 
 ACE_INLINE int
-TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key
+TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key
                                     ACE_ENV_ARG_DECL)
 {
   // Lock access for the duration of this transaction.
@@ -55,7 +55,7 @@ TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key
 }
 
 ACE_INLINE TAO_SERVANT_LOCATION
-TAO_Object_Adapter::find_servant (const TAO_ObjectKey &key,
+TAO_Object_Adapter::find_servant (const TAO::ObjectKey &key,
                                   PortableServer::Servant &servant
                                   ACE_ENV_ARG_DECL)
 {
@@ -279,12 +279,12 @@ TAO_POA_Current_Impl::object_id (void) const
 }
 
 ACE_INLINE void
-TAO_POA_Current_Impl::object_key (const TAO_ObjectKey &key)
+TAO_POA_Current_Impl::object_key (const TAO::ObjectKey &key)
 {
   this->object_key_ = &key;
 }
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_POA_Current_Impl::object_key (void) const
 {
   return *this->object_key_;
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 7bdb7cbbed8..181f2c18342 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -2150,7 +2150,7 @@ TAO_POA::reference_to_servant_i (CORBA::Object_ptr reference
   int result = -1;
   if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
     {
-      TAO_ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
+      TAO::ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // If the object reference was not created by this POA, the
@@ -2279,7 +2279,7 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference
   // POA on which the operation is being performed.  If the object
   // reference was not created by this POA, the WrongAdapter exception
   // is raised.
-  TAO_ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO::ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   PortableServer::ObjectId system_id;
@@ -2443,7 +2443,7 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id
                                                                            priority) == 0)
     {
       // Create object key.
-      TAO_ObjectKey_var key = this->create_object_key (system_id.in ());
+      TAO::ObjectKey_var key = this->create_object_key (system_id.in ());
 
       // Ask the ORB to create you a reference
       return this->key_to_object (key.in (),
@@ -2804,7 +2804,7 @@ TAO_POA::locate_servant_i (const char *operation,
 
 /* static */
 int
-TAO_POA::parse_key (const TAO_ObjectKey &key,
+TAO_POA::parse_key (const TAO::ObjectKey &key,
                     TAO_Object_Adapter::poa_name &poa_system_name,
                     PortableServer::ObjectId &system_id,
                     CORBA::Boolean &is_root,
@@ -2940,7 +2940,7 @@ TAO_POA::parse_key (const TAO_ObjectKey &key,
   return 0;
 }
 
-TAO_ObjectKey *
+TAO::ObjectKey *
 TAO_POA::create_object_key (const PortableServer::ObjectId &id)
 {
   // Calculate the space required for the key.
@@ -2949,7 +2949,7 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id)
     id.length ();
 
   // Create the buffer for the key.
-  CORBA::Octet *buffer = TAO_ObjectKey::allocbuf (buffer_size);
+  CORBA::Octet *buffer = TAO::ObjectKey::allocbuf (buffer_size);
 
   // First copy the POA id into the key.
   ACE_OS::memcpy (&buffer[0],
@@ -2963,9 +2963,9 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id)
 
   // Create the key, giving the ownership of the buffer to the
   // sequence.
-  TAO_ObjectKey *key = 0;
+  TAO::ObjectKey *key = 0;
   ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (buffer_size,
+                  TAO::ObjectKey (buffer_size,
                                  buffer_size,
                                  buffer,
                                  1),
@@ -3261,6 +3261,25 @@ TAO_POA::ObjectId_to_wstring (const PortableServer::ObjectId &id)
   return string;
 }
 
+int
+TAO_POA::parse_ir_object_key (const TAO::ObjectKey &object_key,
+                              PortableServer::ObjectId &user_id)
+{
+  TAO_Object_Adapter::poa_name poa_system_name;
+  CORBA::Boolean is_root = 0;
+  CORBA::Boolean is_persistent = 0;
+  CORBA::Boolean is_system_id = 0;
+  TAO_Temporary_Creation_Time poa_creation_time;
+
+  return TAO_POA::parse_key (object_key,
+                             poa_system_name,
+                             user_id,
+                             is_root,
+                             is_persistent,
+                             is_system_id,
+                             poa_creation_time);
+}
+
 TAO_Object_Adapter &
 TAO_POA::object_adapter (void)
 {
@@ -3373,7 +3392,7 @@ TAO_POA::invoke_key_to_object (const char *intf,
     }
 
   // Create object key.
-  TAO_ObjectKey_var key = this->create_object_key (system_id.in ());
+  TAO::ObjectKey_var key = this->create_object_key (system_id.in ());
 
   CORBA::Object_var object = 0;
 
@@ -3426,7 +3445,7 @@ TAO_POA::invoke_key_to_object (const char *intf,
 }
 
 CORBA::Object_ptr
-TAO_POA::key_to_object (const TAO_ObjectKey &key,
+TAO_POA::key_to_object (const TAO::ObjectKey &key,
                         const char *type_id,
                         TAO_ServantBase *servant,
                         CORBA::Boolean collocated,
@@ -3496,7 +3515,7 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key,
       // Add the key.
 
       CORBA::String_var key_str;
-      TAO_ObjectKey::encode_sequence_to_string (key_str.inout (), key);
+      TAO::ObjectKey::encode_sequence_to_string (key_str.inout (), key);
 
       ior += key_str.in ();
 
@@ -3553,7 +3572,7 @@ orbkey:
 }
 
 TAO_Stub *
-TAO_POA::key_to_stub (const TAO_ObjectKey &key,
+TAO_POA::key_to_stub (const TAO::ObjectKey &key,
                       const char *type_id,
                       CORBA::Short priority
                       ACE_ENV_ARG_DECL)
@@ -3568,7 +3587,7 @@ TAO_POA::key_to_stub (const TAO_ObjectKey &key,
 }
 
 TAO_Stub *
-TAO_POA::key_to_stub_i (const TAO_ObjectKey &key,
+TAO_POA::key_to_stub_i (const TAO::ObjectKey &key,
                         const char *type_id,
                         CORBA::Short priority
                         ACE_ENV_ARG_DECL)
@@ -3740,7 +3759,7 @@ save_ior_component_and_profile_id (const IOP::TaggedComponent &component,
 }
 
 TAO_Stub *
-TAO_POA::create_stub_object (const TAO_ObjectKey &object_key,
+TAO_POA::create_stub_object (const TAO::ObjectKey &object_key,
                              const char *type_id,
                              CORBA::PolicyList *policy_list,
                              TAO_Acceptor_Filter *filter,
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index d3e60d5a8c3..8d0aa2bbe88 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -477,13 +477,17 @@ public:
 
   CORBA::Boolean cleanup_in_progress (void);
 
+  static int parse_ir_object_key (const TAO::ObjectKey &object_key,
+                                  PortableServer::ObjectId &user_id);
+  // Calls protected static method used when POACurrent is not appropriate.
+
   TAO_Object_Adapter &object_adapter (void);
 
   ACE_Lock &lock (void);
 
   /// Create the correct stub, properly initialized with the
   /// attributes and policies attached to the current POA.
-  TAO_Stub* key_to_stub (const TAO_ObjectKey &key,
+  TAO_Stub* key_to_stub (const TAO::ObjectKey &key,
                          const char *type_id,
                          CORBA::Short priority
                          ACE_ENV_ARG_DECL);
@@ -620,7 +624,7 @@ protected:
                                           &user_id
                                           ACE_ENV_ARG_DECL);
 
-  CORBA::Object_ptr key_to_object (const TAO_ObjectKey &key,
+  CORBA::Object_ptr key_to_object (const TAO::ObjectKey &key,
                                    const char *type_id,
                                    TAO_ServantBase *servant,
                                    CORBA::Boolean collocated,
@@ -629,13 +633,13 @@ protected:
   // Wrapper for the ORB's key_to_object that will alter the object pointer
   // if the ImplRepo is used.
 
-  virtual TAO_Stub* key_to_stub_i (const TAO_ObjectKey &key,
+  virtual TAO_Stub* key_to_stub_i (const TAO::ObjectKey &key,
                                    const char *type_id,
                                    CORBA::Short priority
                                    ACE_ENV_ARG_DECL);
   // Like key_to_stub() but assume that the ORB is not shutting down.
 
-  TAO_Stub *create_stub_object (const TAO_ObjectKey &object_key,
+  TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
@@ -765,11 +769,11 @@ protected:
 
   void set_id (void);
 
-  TAO_ObjectKey *create_object_key (const PortableServer::ObjectId &id);
+  TAO::ObjectKey *create_object_key (const PortableServer::ObjectId &id);
 
   int is_poa_generated_id (const PortableServer::ObjectId &id);
 
-  static int parse_key (const TAO_ObjectKey &key,
+  static int parse_key (const TAO::ObjectKey &key,
                         TAO_Object_Adapter::poa_name &poa_system_name,
                         PortableServer::ObjectId &system_id,
                         CORBA::Boolean &is_root,
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index bb8ad64ba03..9fca2cefe95 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -19,11 +19,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:670
+
 #ifndef _TAO_IDL_ORIG_POLICYS_CPP_
 #define _TAO_IDL_ORIG_POLICYS_CPP_
 
-#include "PolicyS.h"
 
+#include "PolicyS.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
@@ -31,7 +35,6 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/PortableInterceptor.h"
-
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #include "tao/PICurrent.h"
@@ -40,6 +43,7 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -48,6 +52,11 @@
 #include "PolicyS.i"
 #endif /* !defined INLINE */
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
+
 class TAO_CORBA_Policy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -55,55 +64,55 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 19:31:31 */
+
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/sirion/coryan/amh/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17,  0,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17,  0,
-     17,  0,  0,  0, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17,  0, 17, 17, 17, 17,  0, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
+     22,  0,  0,  5, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22,  0, 22, 22, 22, 22,  0, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22,
 #else
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22,  0, 22,  0, 22,  0,
+      0,  5, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22,  0, 22, 22, 22,
+     22,  0, 22, 22, 22, 22, 22, 22,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -114,29 +123,31 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
 {
   enum
     {
-      TOTAL_KEYWORDS = 6,
+      TOTAL_KEYWORDS = 7,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 16,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
+      MAX_HASH_VALUE = 21,
+      HASH_VALUE_RANGE = 18,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 10
+      WORDLIST_SIZE = 11
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"copy",  &POA_CORBA::Policy::copy_skel},
+      {"copy", 	&POA_CORBA::Policy::copy_skel},
       {"_is_a",  &POA_CORBA::Policy::_is_a_skel},
       {"",0},
-      {"destroy",       &POA_CORBA::Policy::destroy_skel},
+      {"destroy", 	&POA_CORBA::Policy::destroy_skel},
       {"",0},{"",0},
-      {"_interface",  &POA_CORBA::Policy::_interface_skel},
+      {"_component",  &POA_CORBA::Policy::_component_skel},
       {"",0},{"",0},
       {"_non_existent",  &POA_CORBA::Policy::_non_existent_skel},
-      {"",0},{"",0},
-      {"_get_policy_type",      &POA_CORBA::Policy::_get_policy_type_skel},
+      {"",0},
+      {"_interface",  &POA_CORBA::Policy::_interface_skel},
+      {"",0},{"",0},{"",0},{"",0},{"",0},
+      {"_get_policy_type", 	&POA_CORBA::Policy::_get_policy_type_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -153,90 +164,113 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
     }
   return 0;
 }
-/* ending time is 19:31:31 */
 static TAO_CORBA_Policy_Perfect_Hash_OpTable tao_CORBA_Policy_optable;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
+
 #if (TAO_HAS_INTERCEPTORS == 1)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_CORBA_Policy_policy_type_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::Policy *tao_impl
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_CORBA::Policy *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::PolicyType result);
 
 private:
-  TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &);
-  void operator= (const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &);
-
+  TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
+      const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &
+    );
+  
 private:
   POA_CORBA::Policy *_tao_impl;
   CORBA::PolicyType _result;
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA::Policy *tao_impl ACE_ENV_ARG_DECL_NOT_USED
+    POA_CORBA::Policy *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -244,17 +278,18 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_D
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
 char *
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -264,99 +299,120 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_most_derived_interfac
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::PolicyType result)
 {
   // Update the result.
    this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_CORBA_Policy_copy : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_Policy_copy (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::Policy *tao_impl
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_CORBA::Policy *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::Policy_ptr result);
 
 private:
-  TAO_ServerRequestInfo_CORBA_Policy_copy (const TAO_ServerRequestInfo_CORBA_Policy_copy &);
-  void operator= (const TAO_ServerRequestInfo_CORBA_Policy_copy &);
-
+  TAO_ServerRequestInfo_CORBA_Policy_copy (
+      const TAO_ServerRequestInfo_CORBA_Policy_copy &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_CORBA_Policy_copy &
+    );
+  
 private:
   POA_CORBA::Policy *_tao_impl;
   ::CORBA::Policy_ptr _result;
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_CORBA_Policy_copy::TAO_ServerRequestInfo_CORBA_Policy_copy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA::Policy *tao_impl ACE_ENV_ARG_DECL_NOT_USED
+    POA_CORBA::Policy *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Policy_copy::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_copy::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Policy_copy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_copy::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_CORBA_Policy_copy::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -364,17 +420,18 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
 char *
 TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -384,98 +441,118 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Policy_copy::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_Policy_copy::result (::CORBA::Policy_ptr result)
 {
   // Update the result.
    this->_result = result;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+
 class TAO_ServerRequestInfo_CORBA_Policy_destroy : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_Policy_destroy (
-    TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA::Policy *tao_impl
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  );
-
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_CORBA::Policy *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-
+  
 private:
-  TAO_ServerRequestInfo_CORBA_Policy_destroy (const TAO_ServerRequestInfo_CORBA_Policy_destroy &);
-  void operator= (const TAO_ServerRequestInfo_CORBA_Policy_destroy &);
-
+  TAO_ServerRequestInfo_CORBA_Policy_destroy (
+      const TAO_ServerRequestInfo_CORBA_Policy_destroy &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_CORBA_Policy_destroy &
+    );
+  
 private:
   POA_CORBA::Policy *_tao_impl;
-
+  
 };
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+
 TAO_ServerRequestInfo_CORBA_Policy_destroy::TAO_ServerRequestInfo_CORBA_Policy_destroy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA::Policy *tao_impl ACE_ENV_ARG_DECL_NOT_USED
+    POA_CORBA::Policy *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Policy_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_destroy::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Policy_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_destroy::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-
-CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Any * 
+TAO_ServerRequestInfo_CORBA_Policy_destroy::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -483,13 +560,14 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 char *
 TAO_ServerRequestInfo_CORBA_Policy_destroy::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -499,7 +577,8 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Policy_destroy::target_is_a (
     const char * id
-    ACE_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
@@ -511,6 +590,9 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::target_is_a (
 //            Strategized Proxy Broker Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+
 // Factory function Implementation.
 POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker *POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker (void)
 {
@@ -521,15 +603,21 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker *POA_CORBA::_TAO_Policy_Strategi
 POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::_TAO_Policy_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    this->proxy_cache_[i] = 0;
-
+    {
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::~_TAO_Policy_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    delete this->proxy_cache_[i];
-
+    {
+      delete this->proxy_cache_[i];
+      
+      // Hack to prevent bug mentioned in 1204. Refer to 1204
+      // for details..
+      this->proxy_cache_[i] = 0;
+    }
 }
 
 CORBA::_TAO_Policy_Proxy_Impl&
@@ -540,26 +628,27 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::select_proxy (
 {
   int strategy =
     TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
+  
   if (this->proxy_cache_[strategy] != 0)
-    return *this->proxy_cache_[strategy];
-
+    {
+      return *this->proxy_cache_[strategy];
+    }
+  
   this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
+  
   return *this->proxy_cache_[strategy];
-
 }
 
-void
+void 
 POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::create_proxy (
     int strategy
     ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
+  
   if (this->proxy_cache_[strategy] == 0)
     {
       switch (strategy)
@@ -572,7 +661,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
@@ -581,7 +670,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
+          
         case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
         default:
           ACE_NEW_THROW_EX (
@@ -591,17 +680,16 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::create_proxy (
           );
           ACE_CHECK;
           break;
-
-      }
-
-  }
+        }
+    }
 }
 
-
 //
 //        End Strategized Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
 
 CORBA::_TAO_Policy_Proxy_Broker *
 CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
@@ -613,13 +701,13 @@ CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 int
 CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (long)
 {
-  CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer =
+  CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer = 
     CORBA__TAO_Policy_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+static int CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
   CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer));
 
 
@@ -627,11 +715,17 @@ static int CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //                 ThruPOA Proxy  Implementation
 //
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+
 POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::_TAO_Policy_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 CORBA::PolicyType POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -648,23 +742,31 @@ CORBA::PolicyType POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
   CORBA::Object_var forward_to;
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
-      "policy_type",
+      "_get_policy_type",
       forward_to.out ()
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK_RETURN (_tao_retval);
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
   ACE_CHECK_RETURN (_tao_retval);
+  
   return ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->policy_type (
+        
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 ::CORBA::Policy_ptr POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::copy (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -686,18 +788,26 @@ CORBA::PolicyType POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK_RETURN (_tao_retval._retn ());
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
   ACE_CHECK_RETURN (_tao_retval._retn ());
+  
   return ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->copy (
+        
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+
 void POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
     CORBA::Object *_collocated_tao_target_
     ACE_ENV_ARG_DECL
@@ -706,6 +816,7 @@ void POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
     CORBA::SystemException
   ))
 {
+  
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
     );
@@ -717,24 +828,24 @@ void POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-  servant_upcall.pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_PARAMETER);
+  
+  servant_upcall.pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_PARAMETER
+    );
   ACE_CHECK;
+  
   ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->destroy (
+        
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
-  return;
-}
-
-//
+}//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -748,15 +859,15 @@ CORBA::PolicyType POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::policy_type  (
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   return ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
     )->policy_type (
+          
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
-
+  
 }
 
 ::CORBA::Policy_ptr POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy  (
@@ -765,15 +876,15 @@ CORBA::PolicyType POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::policy_type  (
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   return ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
     )->copy (
+          
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
-
+  
 }
 
 void POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy  (
@@ -782,23 +893,26 @@ void POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy  (
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  ))
-{
+  )){
   ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
     )->destroy (
+          
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
-
+  
 }
 
 
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:100
+
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
+
 POA_CORBA::Policy::Policy (void)
 {
   this->optable_ = &tao_CORBA_Policy_optable;
@@ -812,9 +926,12 @@ POA_CORBA::Policy::~Policy (void)
 {
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+
 void POA_CORBA::Policy::_get_policy_type_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -822,49 +939,59 @@ void POA_CORBA::Policy::_get_policy_type_skel (
   POA_CORBA::Policy *_tao_impl =
     ACE_static_cast (
         POA_CORBA::Policy *,
-        _tao_object_reference
+        _tao_servant
       );
   CORBA::PolicyType _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_Policy_policy_type_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl ACE_ENV_ARG_PARAMETER
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-        _tao_retval =
-        _tao_impl->policy_type (
-            ACE_ENV_SINGLE_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            _tao_retval = 
+            _tao_impl->policy_type (
+                
+                ACE_ENV_SINGLE_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          CORBA::PolicyType _tao_retval_info = _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      CORBA::PolicyType _tao_retval_info = _tao_retval;
-      _tao_ri.result (_tao_retval_info);
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -874,36 +1001,63 @@ void POA_CORBA::Policy::_get_policy_type_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
-        ACE_RE_THROW;
+        {
+          ACE_RE_THROW;
+        }
+    }
+  
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
     }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << _tao_retval)
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_CORBA::Policy::copy_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -911,50 +1065,60 @@ void POA_CORBA::Policy::copy_skel (
   POA_CORBA::Policy *_tao_impl =
     ACE_static_cast (
         POA_CORBA::Policy *,
-        _tao_object_reference
+        _tao_servant
       );
   ::CORBA::Policy_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_Policy_copy _tao_ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl ACE_ENV_ARG_PARAMETER
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-        _tao_retval =
-        _tao_impl->copy (
-            ACE_ENV_SINGLE_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            _tao_retval = 
+            _tao_impl->copy (
+                
+                ACE_ENV_SINGLE_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
+          _tao_ri.result (_tao_retval_info);
+          _tao_retval = _tao_retval_info;
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
-      _tao_ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -964,36 +1128,63 @@ void POA_CORBA::Policy::copy_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
-        ACE_RE_THROW;
+        {
+          ACE_RE_THROW;
+        }
+    }
+  
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
     }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << _tao_retval.in ())
     ))
-ACE_THROW (CORBA::MARSHAL ());
-
+    ACE_THROW (CORBA::MARSHAL ());
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
 
 void POA_CORBA::Policy::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
+    void *_tao_servant,
     void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
@@ -1001,47 +1192,58 @@ void POA_CORBA::Policy::destroy_skel (
   POA_CORBA::Policy *_tao_impl =
     ACE_static_cast (
         POA_CORBA::Policy *,
-        _tao_object_reference
+        _tao_servant
       );
   _tao_server_request.argument_flag (0);
+  
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_Policy_destroy _tao_ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl ACE_ENV_ARG_PARAMETER
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
-        _tao_impl->destroy (
-            ACE_ENV_SINGLE_ARG_PARAMETER
-          );
-        TAO_INTERCEPTOR_CHECK;
+            
+            _tao_impl->destroy (
+                
+                ACE_ENV_SINGLE_ARG_PARAMETER
+              );
+            TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+            
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -1051,98 +1253,128 @@ void POA_CORBA::Policy::destroy_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
-        ACE_RE_THROW;
+        {
+          ACE_RE_THROW;
+        }
+    }
+  
+# if defined (ACE_HAS_EXCEPTIONS) \
+     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
     }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
+}
 
-  }
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
 
 void POA_CORBA::Policy::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference;
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_servant;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
+  
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_CORBA::Policy::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference;
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_servant;
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_CORBA::Policy::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference;
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_servant;
   CORBA::InterfaceDef_ptr _tao_retval = 0;
   CORBA::Boolean _tao_result = 0;
-
+  
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   ACE_TRY
     {
-      _tao_retval =
+      _tao_retval = 
         _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       _tao_server_request.init_reply ();
-
+      
       TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+      
       _tao_result =
         _tao_adapter->interfacedef_cdr_insert (
             _tao_out,
@@ -1154,35 +1386,72 @@ void POA_CORBA::Policy::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
 }
 
+void POA_CORBA::Policy::_component_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* Servant_Upcall */
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference;
+  CORBA::Object_var _tao_retval =
+    _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  
+  _tao_server_request.init_reply ();
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  
+  if (!(_tao_out << _tao_retval._retn ()))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
 CORBA::Boolean POA_CORBA::Policy::_is_a (
     const char* value
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  const char *base_id = "IDL:org.omg/CORBA/Object:1.0";
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, base_id)))
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:org.omg/CORBA/Object:1.0"
+        )
+     )
+    {
       return 1;
-    else
+    }
+  else
+    {
       return 0;
+    }
 }
 
 void* POA_CORBA::Policy::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:omg.org/CORBA/Policy:1.0") == 0)
+    {
+      return ACE_static_cast (POA_CORBA::Policy_ptr, this);
+    }
+  
+  if (ACE_OS::strcmp (logical_type_id,
+                      "IDL:omg.org/CORBA/Object:1.0") == 0)
+    {
+      return ACE_static_cast(PortableServer::Servant, this);
+    }
+  
   return 0;
 }
 
@@ -1191,6 +1460,9 @@ const char* POA_CORBA::Policy::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Policy:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
+
 void POA_CORBA::Policy::_dispatch (
     TAO_ServerRequest &req,
     void *servant_upcall
@@ -1203,29 +1475,45 @@ void POA_CORBA::Policy::_dispatch (
                                      ACE_ENV_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
 
-CORBA::Policy*
+CORBA::Policy *
 POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
-
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              1,
+              this
+            ),
+          0
+        );
+    }
   else
-    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
+    {
+      ACE_NEW_RETURN (
+          tmp,
+          CORBA::Object (
+              stub,
+              0,
+              this
+            ),
+          0
+        );
+    }
+  
   CORBA::Object_var obj = tmp;
-
   (void) safe_stub.release ();
-
   return ::CORBA::Policy::_unchecked_narrow (obj.in ());
 }
-
-
-
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index acc95374bc7..e0d791b59de 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -19,13 +19,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:443
+
 #ifndef _TAO_IDL_ORIG_POLICYS_H_
 #define _TAO_IDL_ORIG_POLICYS_H_
 
 #include "ace/pre.h"
 #include "tao/PolicyC.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -47,133 +49,151 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
+
 TAO_NAMESPACE  POA_CORBA
 {
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
+  
   class Policy;
   typedef Policy *Policy_ptr;
-  // Forward Classes Declaration
+  
   class _TAO_Policy_ThruPOA_Proxy_Impl;
   class _TAO_Policy_Direct_Proxy_Impl;
   class _TAO_Policy_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Policy
     : public virtual PortableServer::ServantBase
   {
   protected:
     Policy (void);
-
+  
   public:
     Policy (const Policy& rhs);
     virtual ~Policy (void);
-
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
-        void *obj,
+        void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
-        void *obj,
+        void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::CORBA::Policy *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual CORBA::PolicyType policy_type (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-        static void _get_policy_type_skel (
+    
+    static void _get_policy_type_skel (
         TAO_ServerRequest &_tao_req,
-        void *_tao_obj,
+        void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual ::CORBA::Policy_ptr copy (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-        static void copy_skel (
+    
+    static void copy_skel (
         TAO_ServerRequest &_tao_req,
-        void *_tao_obj,
+        void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void destroy (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
-        static void destroy_skel (
+    
+    static void destroy_skel (
         TAO_ServerRequest &_tao_req,
-        void *_tao_obj,
+        void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
-
-  };
-
-
+  };  
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+  
   class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_Policy_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Policy_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Policy_Strategized_Proxy_Broker (void);
-
+    
     virtual ::CORBA::_TAO_Policy_Proxy_Impl &select_proxy (
       ::CORBA::Policy *object
       ACE_ENV_ARG_DECL
     );
-
+  
   private:
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
@@ -181,41 +201,46 @@ TAO_NAMESPACE  POA_CORBA
       int collocation_strategy
       ACE_ENV_ARG_DECL
     );
-
+    
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::CORBA::_TAO_Policy_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+    
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-
+  
   public:
     static _TAO_Policy_Strategized_Proxy_Broker *the_TAO_Policy_Strategized_Proxy_Broker (void);
   };
-
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-
-  class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl :
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  
+  class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl : 
     public virtual ::CORBA::_TAO_Policy_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl
   {
   public:
     _TAO_Policy_ThruPOA_Proxy_Impl (void);
-
-    virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) { }
-
+    
+    virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual CORBA::PolicyType policy_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -223,7 +248,10 @@ TAO_NAMESPACE  POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual ::CORBA::Policy_ptr copy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -231,7 +259,10 @@ TAO_NAMESPACE  POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -239,28 +270,27 @@ TAO_NAMESPACE  POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl : 
   public virtual CORBA::_TAO_Policy_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_Policy_Direct_Proxy_Impl (void);
-
-  virtual ~_TAO_Policy_Direct_Proxy_Impl (void) { }
-
+  
+  virtual ~_TAO_Policy_Direct_Proxy_Impl (void) {}
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
   virtual CORBA::PolicyType policy_type (
       CORBA::Object *_collocated_tao_target_
       ACE_ENV_ARG_DECL
@@ -268,7 +298,10 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
   virtual ::CORBA::Policy_ptr copy (
       CORBA::Object *_collocated_tao_target_
       ACE_ENV_ARG_DECL
@@ -276,16 +309,17 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
   virtual void destroy (
       CORBA::Object *_collocated_tao_target_
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
-    ));
-
-  };
+    ));};
 
 
 //
@@ -293,9 +327,16 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
+
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
+
 #include "PolicyS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/PolicyS.i b/TAO/tao/PortableServer/PolicyS.i
index f455a06b8f0..e86a7e25a26 100644
--- a/TAO/tao/PortableServer/PolicyS.i
+++ b/TAO/tao/PortableServer/PolicyS.i
@@ -19,3 +19,4 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp
index 9e19877a5df..12fd2e6c3b9 100644
--- a/TAO/tao/PortableServer/PolicyS_T.cpp
+++ b/TAO/tao/PortableServer/PolicyS_T.cpp
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:777
+
 #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_
 #define _TAO_IDL_ORIG_POLICYS_T_CPP_
 
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index 0733d3dec1b..160854e46d7 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -19,10 +19,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:604
+
 #ifndef _TAO_IDL_ORIG_POLICYS_T_H_
 #define _TAO_IDL_ORIG_POLICYS_T_H_
 
 #include "ace/pre.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -30,89 +34,108 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+
 #if defined (ACE_HAS_USING_KEYWORD)
 TAO_NAMESPACE  POA_CORBA
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class Policy_tie : public Policy
+  class  Policy_tie : public Policy
   {
   public:
     Policy_tie (T &t);
     // the T& ctor
     Policy_tie (T &t, PortableServer::POA_ptr poa);
     // ctor taking a POA
-    Policy_tie (T *tp, CORBA::Boolean release=1);
+    Policy_tie (T *tp, CORBA::Boolean release = 1);
     // ctor taking pointer and an ownership flag
-    Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    Policy_tie (
+        T *tp,
+        PortableServer::POA_ptr poa,
+        CORBA::Boolean release = 1
+      );
     // ctor with T*, ownership flag and a POA
     ~Policy_tie (void);
     // dtor
-
+    
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
     void _tied_object (T &obj);
     // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
+    void _tied_object (T *obj, CORBA::Boolean release = 1);
     // set the underlying object and the ownership flag
     CORBA::Boolean _is_owner (void);
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-
+    
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
     CORBA::PolicyType policy_type (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-        ::CORBA::Policy_ptr copy (
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-        void destroy (
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    
+    void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
-      private:
+  
+  private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-
+    
     // copy and assignment are not allowed
     Policy_tie (const Policy_tie &);
     void operator= (const Policy_tie &);
   };
-
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 #endif /* ACE_HAS_USING_KEYWORD */
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
+
 #if defined (__ACE_INLINE__)
 #include "PolicyS_T.i"
 #endif /* defined INLINE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "PolicyS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #pragma implementation ("PolicyS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
diff --git a/TAO/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i
index 79e549871da..d404b061c43 100644
--- a/TAO/tao/PortableServer/PolicyS_T.i
+++ b/TAO/tao/PortableServer/PolicyS_T.i
@@ -19,6 +19,10 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
+
 #if defined (ACE_HAS_USING_KEYWORD)
 
 template <class T> ACE_INLINE
@@ -52,7 +56,10 @@ POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA:
 template <class T> ACE_INLINE
 POA_CORBA::Policy_tie<T>::~Policy_tie (void)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
 }
 
 template <class T> ACE_INLINE T *
@@ -64,7 +71,11 @@ POA_CORBA::Policy_tie<T>::_tied_object (void)
 template <class T> ACE_INLINE void
 POA_CORBA::Policy_tie<T>::_tied_object (T &obj)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -72,7 +83,11 @@ POA_CORBA::Policy_tie<T>::_tied_object (T &obj)
 template <class T> ACE_INLINE void
 POA_CORBA::Policy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
-  if (this->rel_) delete this->ptr_;
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -93,14 +108,18 @@ template <class T> ACE_INLINE PortableServer::POA_ptr
 POA_CORBA::Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-
+    {
+      return PortableServer::POA::_duplicate (this->poa_.in ());
+    }
+  
   return this->Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -108,13 +127,15 @@ CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
   ))
 {
   return this->ptr_->policy_type (
-ACE_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy  (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -122,13 +143,15 @@ template <class T> ACE_INLINE
   ))
 {
   return this->ptr_->copy (
-ACE_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
 template <class T> ACE_INLINE
 void POA_CORBA::Policy_tie<T>::destroy  (
-    
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -136,7 +159,7 @@ void POA_CORBA::Policy_tie<T>::destroy  (
   ))
 {
   this->ptr_->destroy (
-ACE_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 8594f47e06e..408b4ca814a 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -9,7 +9,7 @@
  * PortableServerC.{h,i,cpp}, using the following command:
  *
  * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *     -o orig -Gp -Gd -Ge 1
  *          -Wb,export_macro=TAO_PortableServer_Export \
  *          -Wb,export_include="tao/corbafwd.h" \
  *          -Wb,pre_include="ace/pre.h" \
@@ -46,265 +46,358 @@
 
 #include <orb.idl>
 #include <Current.pidl>
+#include <OctetSeq.pidl>
 
 #pragma prefix "omg.org"
 
-module PortableServer {
-#   pragma version PortableServer 2.3
-
-    local interface POA;                          // forward declaration
-    typedef sequence<POA> POAList;
-    native Servant;
-    typedef sequence<octet> ObjectId;
-    exception ForwardRequest {
-        Object forward_reference;
+module PortableServer 
+{
+# pragma version PortableServer 2.3
+
+  local interface POA;	    // forward declaration
+  typedef sequence<POA> POAList;
+  native Servant;
+  typedef sequence<octet> ObjectId;
+
+  exception ForwardRequest 
+  {
+    Object forward_reference;
+  };
+
+  // @@ Frank - MIOP specific types
+
+  exception NotAGroupObject {};
+  typedef sequence <ObjectId> IDs;
+
+  // @@ Frank - End MIOP
+
+  // Policy interfaces.
+
+  const CORBA::PolicyType THREAD_POLICY_ID                = 16;
+  const CORBA::PolicyType LIFESPAN_POLICY_ID              = 17;
+  const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID         = 18;
+  const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID         = 19;
+  const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID   = 20;
+  const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID     = 21;
+  const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID    = 22;
+
+  enum ThreadPolicyValue 
+  {
+    ORB_CTRL_MODEL,
+    SINGLE_THREAD_MODEL
+  };
+
+  local interface ThreadPolicy : CORBA::Policy 
+  {
+    readonly attribute ThreadPolicyValue value;
+  };
+
+  enum LifespanPolicyValue 
+  {
+    TRANSIENT,
+    PERSISTENT
+  };
+
+  local interface LifespanPolicy : CORBA::Policy 
+  {
+    readonly attribute LifespanPolicyValue value;
+  };
+
+  enum IdUniquenessPolicyValue 
+  {
+    UNIQUE_ID,
+    MULTIPLE_ID
+  };
+
+  local interface IdUniquenessPolicy : CORBA::Policy 
+  {
+    readonly attribute IdUniquenessPolicyValue value;
+  };
+
+  enum IdAssignmentPolicyValue 
+  {
+    USER_ID,
+    SYSTEM_ID
+  };
+
+  local interface IdAssignmentPolicy : CORBA::Policy 
+  {
+    readonly attribute IdAssignmentPolicyValue value;
+  };
+
+  enum ImplicitActivationPolicyValue 
+  {
+    IMPLICIT_ACTIVATION,
+    NO_IMPLICIT_ACTIVATION
+  };
+
+  local interface ImplicitActivationPolicy : CORBA::Policy 
+  {
+    readonly attribute ImplicitActivationPolicyValue value;
+  };
+
+  enum ServantRetentionPolicyValue 
+  {
+    RETAIN,
+    NON_RETAIN
+  };
+
+  local interface ServantRetentionPolicy : CORBA::Policy 
+  {
+    readonly attribute ServantRetentionPolicyValue value;
+  };
+
+  enum RequestProcessingPolicyValue 
+  {
+    USE_ACTIVE_OBJECT_MAP_ONLY,
+    USE_DEFAULT_SERVANT,
+    USE_SERVANT_MANAGER
+  };
+
+  local interface RequestProcessingPolicy : CORBA::Policy 
+  {
+    readonly attribute RequestProcessingPolicyValue value;
+  };
+
+  // POAManager interface
+  local interface POAManager 
+  {
+    exception AdapterInactive {};
+
+    enum State 
+    {
+      HOLDING, 
+      ACTIVE, 
+      DISCARDING, 
+      INACTIVE
     };
 
-    // @@ Frank - MIOP specific types
+    void activate ()             
+      raises(AdapterInactive);
+
+    void hold_requests (in boolean wait_for_completion)
+      raises(AdapterInactive);
 
-    exception NotAGroupObject {};
-    typedef sequence <ObjectId> IDs;
+    void discard_requests (in boolean wait_for_completion)
+      raises(AdapterInactive);
 
-    // @@ Frank - End MIOP
+    void deactivate (in boolean etherealize_objects,
+                     in boolean wait_for_completion)
+      raises(AdapterInactive);
 
-    // Policy interfaces
-    const CORBA::PolicyType THREAD_POLICY_ID                = 16;
-    const CORBA::PolicyType LIFESPAN_POLICY_ID              = 17;
-    const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID         = 18;
-    const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID         = 19;
-    const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID   = 20;
-    const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID     = 21;
-    const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID    = 22;
-
-    enum ThreadPolicyValue {
-        ORB_CTRL_MODEL,
-        SINGLE_THREAD_MODEL
-    };
-    local interface ThreadPolicy : CORBA::Policy {
-        readonly attribute ThreadPolicyValue value;
-    };
+    State get_state ();
+  };
 
-    enum LifespanPolicyValue {
-        TRANSIENT,
-        PERSISTENT
-    };
-    local interface LifespanPolicy : CORBA::Policy {
-        readonly attribute LifespanPolicyValue value;
-    };
+  // AdapterActivator interface.
+  local interface AdapterActivator 
+  {
+#   pragma version AdapterActivator 2.3
 
-    enum IdUniquenessPolicyValue {
-        UNIQUE_ID,
-        MULTIPLE_ID
-    };
-    local interface IdUniquenessPolicy : CORBA::Policy {
-        readonly attribute IdUniquenessPolicyValue value;
-    };
+    boolean unknown_adapter (in POA parent,
+                             in string name);
+  };
+
+  // ServantManager interface.
+  local interface ServantManager {};
+
+  local interface ServantActivator : ServantManager 
+  {
+#   pragma version ServantActivator 2.3
 
-    enum IdAssignmentPolicyValue {
-        USER_ID,
-        SYSTEM_ID
-    };
-    local interface IdAssignmentPolicy : CORBA::Policy {
-        readonly attribute IdAssignmentPolicyValue value;
-    };
+    Servant incarnate (in ObjectId oid,
+                       in POA adapter)
+      raises (ForwardRequest);
 
-    enum ImplicitActivationPolicyValue {
-        IMPLICIT_ACTIVATION,
-        NO_IMPLICIT_ACTIVATION
-    };
-    local interface ImplicitActivationPolicy : CORBA::Policy {
-        readonly attribute ImplicitActivationPolicyValue value;
-    };
+    void etherealize (in ObjectId oid,
+                      in POA adapter,
+                      in Servant serv,
+                      in boolean cleanup_in_progress,
+                      in boolean remaining_activations);
+  };
 
-    enum ServantRetentionPolicyValue {
-        RETAIN,
-        NON_RETAIN
-    };
-    local interface ServantRetentionPolicy : CORBA::Policy {
-        readonly attribute ServantRetentionPolicyValue value;
-    };
+  local interface ServantLocator : ServantManager 
+  {
+#   pragma version ServantLocator 2.3
 
-    enum RequestProcessingPolicyValue {
-        USE_ACTIVE_OBJECT_MAP_ONLY,
-        USE_DEFAULT_SERVANT,
-        USE_SERVANT_MANAGER
-    };
-    local interface RequestProcessingPolicy : CORBA::Policy {
-        readonly attribute RequestProcessingPolicyValue value;
-    };
+    native Cookie;
 
-    // POAManager interface
-    local interface POAManager {
-        exception AdapterInactive{};
-        enum State {HOLDING, ACTIVE, DISCARDING, INACTIVE};
-        void activate()             raises(AdapterInactive);
-        void hold_requests(     in boolean wait_for_completion)
-                                    raises(AdapterInactive);
-        void discard_requests(  in boolean wait_for_completion)
-                                    raises(AdapterInactive);
-        void deactivate(        in boolean etherealize_objects,
-                                in boolean wait_for_completion)
-                                    raises(AdapterInactive);
-        State get_state();
-    };
+    Servant preinvoke (in ObjectId oid,
+                       in POA adapter,
+                       in CORBA::Identifier operation,
+                       out Cookie the_cookie)
+      raises (ForwardRequest);
 
-    // AdapterActivator interface
-    local interface AdapterActivator {
-#       pragma version AdapterActivator 2.3
-        boolean unknown_adapter(in POA parent,
-                                in string name);
-    };
+    void postinvoke (in ObjectId oid,
+                     in POA adapter,
+                     in CORBA::Identifier operation,
+                     in Cookie  the_cookie,
+                     in Servant the_servant);
+  };
 
-    // ServantManager interface
-    local interface ServantManager{ };
-
-    local interface ServantActivator : ServantManager {
-#       pragma version ServantActivator 2.3
-        Servant incarnate (     in ObjectId oid,
-                                in POA      adapter)
-                                    raises (ForwardRequest);
-        void etherealize (      in ObjectId oid,
-                                in POA      adapter,
-                                in Servant  serv,
-                                in boolean  cleanup_in_progress,
-                                in boolean  remaining_activations);
-    };
+  local interface POA 
+  {
+#   pragma version POA 2.3
 
-    local interface ServantLocator : ServantManager {
-#       pragma version ServantLocator 2.3
-        native  Cookie;
-        Servant preinvoke(      in ObjectId oid,
-                                in POA      adapter,
-                                in CORBA::Identifier
-                                            operation,
-                                out Cookie  the_cookie)
-                                    raises (ForwardRequest);
-        void postinvoke(        in ObjectId oid,
-                                in POA      adapter,
-                                in CORBA::Identifier
-                                            operation,
-                                in Cookie   the_cookie,
-                                in Servant  the_servant );
-    };
+    exception AdapterAlreadyExists {};
+    exception AdapterNonExistent {};
+    exception InvalidPolicy {unsigned short index;};
+    exception NoServant {};
+    exception ObjectAlreadyActive {};
+    exception ObjectNotActive {};
+    exception ServantAlreadyActive {};
+    exception ServantNotActive {};
+    exception WrongAdapter {};
+    exception WrongPolicy {};
 
-    local interface POA {
-#       pragma version POA 2.3
-        exception AdapterAlreadyExists {};
-        exception AdapterNonExistent {};
-        exception InvalidPolicy {unsigned short index;};
-        exception NoServant {};
-        exception ObjectAlreadyActive {};
-        exception ObjectNotActive {};
-        exception ServantAlreadyActive {};
-        exception ServantNotActive {};
-        exception WrongAdapter {};
-        exception WrongPolicy {};
-
-        // POA creation and destruction
-        POA create_POA(         in string       adapter_name,
-                                in POAManager   a_POAManager,
-                                in CORBA::PolicyList policies)
-                                    raises (AdapterAlreadyExists, InvalidPolicy);
-        POA find_POA(           in string       adapter_name,
-                                in boolean      activate_it)
-                                    raises (AdapterNonExistent);
-        void destroy(           in boolean      etherealize_objects,
-                                in boolean      wait_for_completion);
-
-        // Factories for Policy objects
-        ThreadPolicy        create_thread_policy(in ThreadPolicyValue value);
-        LifespanPolicy
-            create_lifespan_policy(in LifespanPolicyValue value);
-        IdUniquenessPolicy  create_id_uniqueness_policy(
-                                in IdUniquenessPolicyValue value);
-        IdAssignmentPolicy  create_id_assignment_policy(
-                                in IdAssignmentPolicyValue value);
-        ImplicitActivationPolicy create_implicit_activation_policy(
-                                in ImplicitActivationPolicyValue value);
-        ServantRetentionPolicy create_servant_retention_policy(
-                                in ServantRetentionPolicyValue value);
-        RequestProcessingPolicy create_request_processing_policy(
-                                in RequestProcessingPolicyValue value);
-
-        // POA attributes
-        readonly attribute string       the_name;
-        readonly attribute POA          the_parent;
-        readonly attribute POAList      the_children;
-        readonly attribute POAManager   the_POAManager;
-        attribute AdapterActivator      the_activator;
-
-        // Servant Manager registration:
-        ServantManager  get_servant_manager()
-                                    raises (WrongPolicy);
-        void            set_servant_manager(in      ServantManager imgr)
-                                    raises (WrongPolicy);
-
-        // operations for the USE_DEFAULT_SERVANT policy
-        Servant         get_servant() raises (NoServant, WrongPolicy);
-        void            set_servant( in Servant      p_servant)
-                                    raises (WrongPolicy);
-
-        // object activation and deactivation
-        ObjectId        activate_object(in Servant p_servant)
-                                    raises (ServantAlreadyActive, WrongPolicy);
-        void activate_object_with_id(in ObjectId    id,
-                                     in Servant     p_servant)
-                                    raises (ServantAlreadyActive,
-                                            ObjectAlreadyActive,
-                                            WrongPolicy);
-        void deactivate_object(      in ObjectId oid)
-                                    raises (ObjectNotActive, WrongPolicy);
-
-        // reference creation operations
-        Object create_reference (    in CORBA::RepositoryId intf)
-                                    raises (WrongPolicy);
-        Object create_reference_with_id (
-                                    in ObjectId             oid,
-                                    in CORBA::RepositoryId  intf)
-                                    raises (WrongPolicy);
-
-        // Identity mapping operations:
-        ObjectId servant_to_id(     in Servant              p_servant)
-                                    raises (ServantNotActive, WrongPolicy);
-        Object servant_to_reference(in Servant              p_servant)
-                                    raises (ServantNotActive, WrongPolicy);
-        Servant reference_to_servant(in Object              reference)
-                                    raises(ObjectNotActive, WrongAdapter, WrongPolicy);
-        ObjectId reference_to_id(   in Object               reference)
-                                    raises (WrongAdapter, WrongPolicy);
-        Servant id_to_servant(      in ObjectId             oid)
-                                    raises (ObjectNotActive, WrongPolicy);
-        Object id_to_reference(     in ObjectId             oid)
-                                        raises (ObjectNotActive, WrongPolicy);
-
-        readonly attribute CORBA::OctetSeq id;
-
-        // @@ Frank - MIOP specific methods
-
-        ObjectId create_id_for_reference(in Object the_ref)
-                              raises (NotAGroupObject);
-
-        IDs reference_to_ids(in Object the_ref)
-                              raises (NotAGroupObject);
-
-        void associate_reference_with_id (in Object ref,
-                                          in ObjectId oid)
-                              raises (NotAGroupObject);
-
-        void disassociate_reference_with_id (in Object ref,
-                                             in ObjectId oid)
-                              raises (NotAGroupObject);
-
-        // @@ Frank - End MIOP
-    };
+    // POA creation and destruction.
 
-    // Current interface
-    local interface Current : CORBA::Current {
-#       pragma version Current 2.3
-        exception   NoContext { };
-        POA         get_POA()       raises (NoContext);
-        ObjectId    get_object_id() raises (NoContext);
-    };
+    POA create_POA (in string adapter_name,
+                    in POAManager a_POAManager,
+                    in CORBA::PolicyList policies)
+      raises (AdapterAlreadyExists, 
+	      InvalidPolicy);
+
+    POA find_POA (in string adapter_name,
+                  in boolean activate_it)
+      raises (AdapterNonExistent);
+
+    void destroy (in boolean etherealize_objects,
+                  in boolean wait_for_completion);
+
+    // Factories for Policy objects.
+
+    ThreadPolicy create_thread_policy (in ThreadPolicyValue value);
+
+    LifespanPolicy create_lifespan_policy (
+	in LifespanPolicyValue value
+      );
+
+    IdUniquenessPolicy  create_id_uniqueness_policy (
+        in IdUniquenessPolicyValue value
+      );
+
+    IdAssignmentPolicy  create_id_assignment_policy (
+        in IdAssignmentPolicyValue value
+      );
+
+    ImplicitActivationPolicy create_implicit_activation_policy (
+        in ImplicitActivationPolicyValue value\
+      );
+
+    ServantRetentionPolicy create_servant_retention_policy (
+        in ServantRetentionPolicyValue value
+      );
+
+    RequestProcessingPolicy create_request_processing_policy (
+	in RequestProcessingPolicyValue value
+      );
+
+    // POA attributes
+    readonly attribute string       the_name;
+    readonly attribute POA          the_parent;
+    readonly attribute POAList      the_children;
+    readonly attribute POAManager   the_POAManager;
+    attribute AdapterActivator      the_activator;
+
+    // Servant Manager registration:
+
+    ServantManager get_servant_manager ()
+      raises (WrongPolicy);
+
+    void set_servant_manager (in ServantManager imgr)
+      raises (WrongPolicy);
+
+    // Operations for the USE_DEFAULT_SERVANT policy.
+
+    Servant get_servant () 
+      raises (NoServant, 
+	      WrongPolicy);
+
+    void set_servant (in Servant p_servant)
+      raises (WrongPolicy);
+
+    // Object activation and deactivation.
+
+    ObjectId  activate_object (in Servant p_servant)
+      raises (ServantAlreadyActive, 
+	      WrongPolicy);
+
+    void activate_object_with_id (in ObjectId id,
+                                  in Servant p_servant)
+      raises (ServantAlreadyActive,
+	      ObjectAlreadyActive,
+	      WrongPolicy);
+
+    void deactivate_object (in ObjectId oid)
+      raises (ObjectNotActive, WrongPolicy);
+
+    // Reference creation operations.
+
+    Object create_reference (in CORBA::RepositoryId intf)
+      raises (WrongPolicy);
+
+    Object create_reference_with_id (in ObjectId oid,
+				     in CORBA::RepositoryId intf)
+      raises (WrongPolicy);
+
+    // Identity mapping operations:.
+    ObjectId servant_to_id (in Servant p_servant)
+      raises (ServantNotActive, 
+	      WrongPolicy);
+
+    Object servant_to_reference (in Servant p_servant)
+      raises (ServantNotActive, WrongPolicy);
+
+    Servant reference_to_servant (in Object reference)
+      raises (ObjectNotActive, 
+	      WrongAdapter, 
+	      WrongPolicy);
+
+    ObjectId reference_to_id (in Object reference)
+      raises (WrongAdapter, 
+	      WrongPolicy);
+
+    Servant id_to_servant (in ObjectId oid)
+      raises (ObjectNotActive, WrongPolicy);
+
+    Object id_to_reference (in ObjectId oid)
+      raises (ObjectNotActive, 
+	      WrongPolicy);
+
+    readonly attribute CORBA::OctetSeq id;
+
+    // @@ Frank - MIOP specific methods
+
+    ObjectId create_id_for_reference(in Object the_ref)
+      raises (NotAGroupObject);
+
+    IDs reference_to_ids(in Object the_ref)
+      raises (NotAGroupObject);
+
+    void associate_reference_with_id (in Object ref,
+                                      in ObjectId oid)
+      raises (NotAGroupObject);
+
+    void disassociate_reference_with_id (in Object ref,
+                                         in ObjectId oid)
+      raises (NotAGroupObject);
+
+    // @@ Frank - End MIOP
+  };
+
+  // Current interface.
+  local interface Current : CORBA::Current 
+  {
+#   pragma version Current 2.3
+
+    exception NoContext {};
+
+    POA get_POA ()       
+      raises (NoContext);
+
+    ObjectId get_object_id () 
+      raises (NoContext);
+  };
 };
 
 #endif // _PORTABLESERVER_IDL_
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 1932b1a81bc..38f7f1efb44 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PortableServerC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
+
+#include "PortableServerC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -65,6 +68,9 @@ PortableServer::wstring_to_ObjectId (const CORBA::WChar *id)
   return TAO_POA::wstring_to_ObjectId (id);
 }
 
+// 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_PORTABLESERVER_POALIST_CS_)
@@ -76,27 +82,29 @@ PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_allocate
 {
   PortableServer::POA **tmp = 0;
   tmp = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    PortableServer::POA **old = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        if (!this->release_)
-          {
-            tmp[i] = PortableServer::POA::_duplicate (old[i]);
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-      }
-
-    if (this->release_)
-      {
-        delete[] old;
-      }
-  }
+    {
+      PortableServer::POA **old = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = PortableServer::POA::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -104,15 +112,18 @@ void
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
+    {
+      return;
+    }
+  
   PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
-
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       CORBA::release (tmp[i]);
       tmp[i] = PortableServer::POA::_nil ();
     }
-
+  
   _TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -126,7 +137,7 @@ void
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
-
+  
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       CORBA::release (tmp[i]);
@@ -134,7 +145,7 @@ PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_shrink_b
     }
 }
 
-void
+void 
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_downcast (
     void* target,
     CORBA::Object *src
@@ -155,123 +166,220 @@ PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_upcast (
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLESERVER_POALIST_CS_)
 #define _PORTABLESERVER_POALIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // PortableServer::POAList
 // *************************************************************
 
 PortableServer::POAList::POAList (void)
 {}
-PortableServer::POAList::POAList (CORBA::ULong max) // uses max size
-  :
+
+PortableServer::POAList::POAList (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_PortableServer_POAList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-PortableServer::POAList::POAList (CORBA::ULong max, CORBA::ULong length, PortableServer::POA_ptr *buffer, CORBA::Boolean release)
-  :
+
+PortableServer::POAList::POAList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    PortableServer::POA_ptr *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_PortableServer_POAList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-PortableServer::POAList::POAList (const POAList &seq) // copy ctor
-  :
+
+PortableServer::POAList::POAList (const POAList &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_PortableServer_POAList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 PortableServer::POAList::~POAList (void) // dtor
 {}
+
 void PortableServer::POAList::_tao_any_destructor (void *_tao_void_pointer)
 {
   POAList *tmp = ACE_static_cast (POAList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POAList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f414c69), 
+  ACE_NTOHL (0x73743a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POAList:2.3
+    8,
+  ACE_NTOHL (0x504f414c), 
+  ACE_NTOHL (0x69737400),  // name = POAList
+    CORBA::tk_sequence, // typecode kind
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_objref, // typecode kind
+    52, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      35,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x506f7274), 
+      ACE_NTOHL (0x61626c65), 
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x65722f50), 
+      ACE_NTOHL (0x4f413a32), 
+      ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA:2.3
+            4,
+      ACE_NTOHL (0x504f4100),  // name = POA
+      
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAList (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableServer_POAList),
+    (char *) &_oc_PortableServer_POAList,
+    0,
+    sizeof (PortableServer::POAList)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_POAList,
+    &_tc_TAO_tc_PortableServer_POAList
+  )
+TAO_NAMESPACE_END
 
 #if !defined (_PORTABLESERVER_OBJECTID_CS_)
 #define _PORTABLESERVER_OBJECTID_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // PortableServer::ObjectId
 // *************************************************************
 
 PortableServer::ObjectId::ObjectId (void)
 {}
-PortableServer::ObjectId::ObjectId (CORBA::ULong max) // uses max size
-  :
+
+PortableServer::ObjectId::ObjectId (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-PortableServer::ObjectId::ObjectId (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+
+PortableServer::ObjectId::ObjectId (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Octet *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-PortableServer::ObjectId::ObjectId (const ObjectId &seq) // copy ctor
-  :
+
+PortableServer::ObjectId::ObjectId (const ObjectId &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 PortableServer::ObjectId::~ObjectId (void) // dtor
 {}
+
 void PortableServer::ObjectId::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectId *tmp = ACE_static_cast (ObjectId*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_ObjectId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f4f),
-  ACE_NTOHL (0x626a6563),
-  ACE_NTOHL (0x7449643a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/ObjectId:1.0
-  9,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744964),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f4f), 
+  ACE_NTOHL (0x626a6563), 
+  ACE_NTOHL (0x7449643a), 
+  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ObjectId:2.3
+    9,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
   ACE_NTOHL (0x0),  // name = ObjectId
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_octet,
@@ -290,26 +398,30 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableServer_ObjectId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectId,
+    &_tc_TAO_tc_PortableServer_ObjectId
+  )
 TAO_NAMESPACE_END
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::ForwardRequest::ForwardRequest (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/ForwardRequest:1.0",
+        "IDL:omg.org/PortableServer/ForwardRequest:2.3",
         "ForwardRequest"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::ForwardRequest::~ForwardRequest (void)
 {
 }
 
-// Copy constructor.
 PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardRequest &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -319,7 +431,6 @@ PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardR
   this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
 }
 
-// Assignment operator.
 PortableServer::ForwardRequest&
 PortableServer::ForwardRequest::operator= (const ::PortableServer::ForwardRequest &_tao_excp)
 {
@@ -335,11 +446,11 @@ void PortableServer::ForwardRequest::_tao_any_destructor (void *_tao_void_pointe
 }
 
 PortableServer::ForwardRequest *
-PortableServer::ForwardRequest::_downcast (CORBA::Exception *exc)
+PortableServer::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (ForwardRequest *, exc);
+      return ACE_dynamic_cast (ForwardRequest *, _tao_excp);
     }
   else
     {
@@ -360,13 +471,13 @@ PortableServer::ForwardRequest::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::ForwardRequest (*this),
+      ::PortableServer::ForwardRequest (*this),
       0
     );
   return result;
 }
 
-void PortableServer::ForwardRequest::_raise ()
+void PortableServer::ForwardRequest::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -380,7 +491,7 @@ void PortableServer::ForwardRequest::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -393,66 +504,63 @@ void PortableServer::ForwardRequest::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+
 PortableServer::ForwardRequest::ForwardRequest (
     const CORBA::Object_ptr  _tao_forward_reference
-  )
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/ForwardRequest:1.0",
+  )  : CORBA::UserException (
+        "IDL:omg.org/PortableServer/ForwardRequest:2.3",
         "ForwardRequest"
       )
 {
   this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference);
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
+{
+  return ::PortableServer::_tc_ForwardRequest;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_ForwardRequest[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f46),
-  ACE_NTOHL (0x6f727761),
-  ACE_NTOHL (0x72645265),
-  ACE_NTOHL (0x71756573),
-  ACE_NTOHL (0x743a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/ForwardRequest:1.0
-  15,
-  ACE_NTOHL (0x466f7277),
-  ACE_NTOHL (0x61726452),
-  ACE_NTOHL (0x65717565),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f46), 
+  ACE_NTOHL (0x6f727761), 
+  ACE_NTOHL (0x72645265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x743a322e), 
+  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ForwardRequest:2.3
+    15,
+  ACE_NTOHL (0x466f7277), 
+  ACE_NTOHL (0x61726452), 
+  ACE_NTOHL (0x65717565), 
   ACE_NTOHL (0x73740000),  // name = ForwardRequest
   1, // member count
-  18,
-  ACE_NTOHL (0x666f7277),
-  ACE_NTOHL (0x6172645f),
-  ACE_NTOHL (0x72656665),
-  ACE_NTOHL (0x72656e63),
+    18,
+  ACE_NTOHL (0x666f7277), 
+  ACE_NTOHL (0x6172645f), 
+  ACE_NTOHL (0x72656665), 
+  ACE_NTOHL (0x72656e63), 
   ACE_NTOHL (0x65000000),  // name = forward_reference
-  CORBA::tk_objref,
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    29,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f62),
-    ACE_NTOHL (0x6a656374),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-    7,
-    ACE_NTOHL (0x4f626a65),
-    ACE_NTOHL (0x63740000),  // name = Object
-
-};
+    };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (
     CORBA::tk_except,
@@ -464,35 +572,32 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ForwardRequest, &_tc_TAO_tc_PortableServer_ForwardRequest)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ForwardRequest,
+    &_tc_TAO_tc_PortableServer_ForwardRequest
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
-{
-  return ::PortableServer::_tc_ForwardRequest;
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::NotAGroupObject::NotAGroupObject (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/NotAGroupObject:1.0",
+        "IDL:omg.org/PortableServer/NotAGroupObject:2.3",
         "NotAGroupObject"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::NotAGroupObject::~NotAGroupObject (void)
 {
 }
 
-// Copy constructor.
 PortableServer::NotAGroupObject::NotAGroupObject (const ::PortableServer::NotAGroupObject &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -501,7 +606,6 @@ PortableServer::NotAGroupObject::NotAGroupObject (const ::PortableServer::NotAGr
 {
 }
 
-// Assignment operator.
 PortableServer::NotAGroupObject&
 PortableServer::NotAGroupObject::operator= (const ::PortableServer::NotAGroupObject &_tao_excp)
 {
@@ -516,11 +620,11 @@ void PortableServer::NotAGroupObject::_tao_any_destructor (void *_tao_void_point
 }
 
 PortableServer::NotAGroupObject *
-PortableServer::NotAGroupObject::_downcast (CORBA::Exception *exc)
+PortableServer::NotAGroupObject::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/NotAGroupObject:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/NotAGroupObject:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (NotAGroupObject *, exc);
+      return ACE_dynamic_cast (NotAGroupObject *, _tao_excp);
     }
   else
     {
@@ -541,13 +645,13 @@ PortableServer::NotAGroupObject::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::NotAGroupObject (*this),
+      ::PortableServer::NotAGroupObject (*this),
       0
     );
   return result;
 }
 
-void PortableServer::NotAGroupObject::_raise ()
+void PortableServer::NotAGroupObject::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -561,7 +665,7 @@ void PortableServer::NotAGroupObject::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -574,33 +678,42 @@ void PortableServer::NotAGroupObject::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::NotAGroupObject::_type (void) const
+{
+  return ::PortableServer::_tc_NotAGroupObject;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_NotAGroupObject[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f4e),
-  ACE_NTOHL (0x6f744147),
-  ACE_NTOHL (0x726f7570),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63743a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/NotAGroupObject:1.0
-  16,
-  ACE_NTOHL (0x4e6f7441),
-  ACE_NTOHL (0x47726f75),
-  ACE_NTOHL (0x704f626a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f4e), 
+  ACE_NTOHL (0x6f744147), 
+  ACE_NTOHL (0x726f7570), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63743a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/NotAGroupObject:2.3
+    16,
+  ACE_NTOHL (0x4e6f7441), 
+  ACE_NTOHL (0x47726f75), 
+  ACE_NTOHL (0x704f626a), 
   ACE_NTOHL (0x65637400),  // name = NotAGroupObject
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_NotAGroupObject (
     CORBA::tk_except,
@@ -612,16 +725,15 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_NotAGroupObject (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NotAGroupObject, &_tc_TAO_tc_PortableServer_NotAGroupObject)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_NotAGroupObject,
+    &_tc_TAO_tc_PortableServer_NotAGroupObject
+  )
 TAO_NAMESPACE_END
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::NotAGroupObject::_type (void) const
-{
-  return ::PortableServer::_tc_NotAGroupObject;
-}
-
+// 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)
 
@@ -633,18 +745,23 @@ PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_allocate_buffer (CO
 {
   PortableServer::ObjectId* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    PortableServer::ObjectId *old = ACE_reinterpret_cast (PortableServer::ObjectId *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (old);
-
-  }
+    {
+      PortableServer::ObjectId *old =
+        ACE_reinterpret_cast (PortableServer::ObjectId *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -652,109 +769,130 @@ void
 PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  PortableServer::ObjectId *tmp = ACE_reinterpret_cast (PortableServer::ObjectId *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  PortableServer::ObjectId *tmp =
+    ACE_reinterpret_cast (PortableServer::ObjectId *, this->buffer_);
   _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::~_TAO_Unbounded_Sequence_PortableServer_IDs (void) // Dtor.
+PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::~_TAO_Unbounded_Sequence_PortableServer_IDs (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLESERVER_IDS_CS_)
 #define _PORTABLESERVER_IDS_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // PortableServer::IDs
 // *************************************************************
 
 PortableServer::IDs::IDs (void)
 {}
-PortableServer::IDs::IDs (CORBA::ULong max) // uses max size
-  :
+
+PortableServer::IDs::IDs (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_PortableServer_IDs
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<PortableServer::ObjectId>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-PortableServer::IDs::IDs (CORBA::ULong max, CORBA::ULong length, PortableServer::ObjectId *buffer, CORBA::Boolean release)
-  :
+
+PortableServer::IDs::IDs (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    PortableServer::ObjectId *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_PortableServer_IDs
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<PortableServer::ObjectId>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-PortableServer::IDs::IDs (const IDs &seq) // copy ctor
-  :
+
+PortableServer::IDs::IDs (const IDs &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_PortableServer_IDs
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<PortableServer::ObjectId>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 PortableServer::IDs::~IDs (void) // dtor
 {}
+
 void PortableServer::IDs::_tao_any_destructor (void *_tao_void_pointer)
 {
   IDs *tmp = ACE_static_cast (IDs*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_IDs[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f49),
-  ACE_NTOHL (0x44733a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/IDs:1.0
-  4,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x44733a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/IDs:2.3
+    4,
   ACE_NTOHL (0x49447300),  // name = IDs
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   100, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
     84, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       40,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x506f7274),
-      ACE_NTOHL (0x61626c65),
-      ACE_NTOHL (0x53657276),
-      ACE_NTOHL (0x65722f4f),
-      ACE_NTOHL (0x626a6563),
-      ACE_NTOHL (0x7449643a),
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/ObjectId:1.0
-      9,
-      ACE_NTOHL (0x4f626a65),
-      ACE_NTOHL (0x63744964),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x506f7274), 
+      ACE_NTOHL (0x61626c65), 
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x65722f4f), 
+      ACE_NTOHL (0x626a6563), 
+      ACE_NTOHL (0x7449643a), 
+      ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ObjectId:2.3
+            9,
+      ACE_NTOHL (0x4f626a65), 
+      ACE_NTOHL (0x63744964), 
       ACE_NTOHL (0x0),  // name = ObjectId
-      CORBA::tk_sequence, // typecode kind
+            CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         CORBA::tk_octet,
@@ -776,78 +914,56 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IDs (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IDs, &_tc_TAO_tc_PortableServer_IDs)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IDs,
+    &_tc_TAO_tc_PortableServer_IDs
+  )
 TAO_NAMESPACE_END
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREAD_POLICY_ID, 16U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, LIFESPAN_POLICY_ID, 17U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ID_UNIQUENESS_POLICY_ID, 18U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ID_ASSIGNMENT_POLICY_ID, 19U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, IMPLICIT_ACTIVATION_POLICY_ID, 20U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SERVANT_RETENTION_POLICY_ID, 21U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PROCESSING_POLICY_ID, 22U)
-TAO_NAMESPACE_END
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f54),
-  ACE_NTOHL (0x68726561),
-  ACE_NTOHL (0x64506f6c),
-  ACE_NTOHL (0x69637956),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicyValue:1.0
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f54), 
+  ACE_NTOHL (0x68726561), 
+  ACE_NTOHL (0x64506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x3a322e33), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicyValue:2.3
   18,
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x56616c75), 
   ACE_NTOHL (0x65000000),  // name = ThreadPolicyValue
   2, // member count
   15,
-  ACE_NTOHL (0x4f52425f),
-  ACE_NTOHL (0x4354524c),
-  ACE_NTOHL (0x5f4d4f44),
+  ACE_NTOHL (0x4f52425f), 
+  ACE_NTOHL (0x4354524c), 
+  ACE_NTOHL (0x5f4d4f44), 
   ACE_NTOHL (0x454c0000),  // name = ORB_CTRL_MODEL
   20,
-  ACE_NTOHL (0x53494e47),
-  ACE_NTOHL (0x4c455f54),
-  ACE_NTOHL (0x48524541),
-  ACE_NTOHL (0x445f4d4f),
+  ACE_NTOHL (0x53494e47), 
+  ACE_NTOHL (0x4c455f54), 
+  ACE_NTOHL (0x48524541), 
+  ACE_NTOHL (0x445f4d4f), 
   ACE_NTOHL (0x44454c00),  // name = SINGLE_THREAD_MODEL
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue (
     CORBA::tk_enum,
@@ -859,9 +975,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ThreadPolicyValue, &_tc_TAO_tc_PortableServer_ThreadPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ThreadPolicyValue,
+    &_tc_TAO_tc_PortableServer_ThreadPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::ThreadPolicy::_tao_class_id = 0;
 
 PortableServer::ThreadPolicy_ptr
@@ -907,13 +1030,23 @@ tao_PortableServer_ThreadPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_ThreadPolicy_marshal (
+    PortableServer::ThreadPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::ThreadPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (void) // default constructor
+PortableServer::ThreadPolicy_var::ThreadPolicy_var (void)
   : ptr_ (ThreadPolicy::_nil ())
 {}
 
@@ -923,12 +1056,12 @@ PortableServer::ThreadPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (const ::PortableServer::ThreadPolicy_var &p) // copy constructor
+PortableServer::ThreadPolicy_var::ThreadPolicy_var (const ::PortableServer::ThreadPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ThreadPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::ThreadPolicy_var::~ThreadPolicy_var (void) // destructor
+PortableServer::ThreadPolicy_var::~ThreadPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -957,7 +1090,7 @@ PortableServer::ThreadPolicy_var::operator const ::PortableServer::ThreadPolicy_
   return this->ptr_;
 }
 
-PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast
+PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1032,10 +1165,11 @@ PortableServer::ThreadPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::ThreadPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_ptr &p)
@@ -1044,14 +1178,14 @@ PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_ptr &p)
   this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
 }
 
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_var &p) // constructor from _var
+PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
 }
 
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (const ::PortableServer::ThreadPolicy_out &p) // copy constructor
+PortableServer::ThreadPolicy_out::ThreadPolicy_out (const ::PortableServer::ThreadPolicy_out &p)
   : ptr_ (ACE_const_cast (ThreadPolicy_out &, p).ptr_)
 {}
 
@@ -1082,7 +1216,7 @@ PortableServer::ThreadPolicy_out::operator ::PortableServer::ThreadPolicy_ptr &(
 }
 
 ::PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_out::ptr (void) // ptr
+PortableServer::ThreadPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1093,9 +1227,8 @@ PortableServer::ThreadPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::ThreadPolicy::ThreadPolicy (void)
 {}
@@ -1103,7 +1236,15 @@ PortableServer::ThreadPolicy::ThreadPolicy (void)
 PortableServer::ThreadPolicy::~ThreadPolicy (void)
 {}
 
-PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow (
+void 
+PortableServer::ThreadPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ThreadPolicy *tmp = ACE_static_cast (ThreadPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1111,105 +1252,170 @@ PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow (
   return ThreadPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy_ptr 
 PortableServer::ThreadPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ThreadPolicy::_nil ();
+    {
+      return ThreadPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ThreadPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ThreadPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ThreadPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::ThreadPolicy_ptr
 PortableServer::ThreadPolicy::_duplicate (ThreadPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::ThreadPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, ThreadPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ThreadPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ThreadPolicy:1.0";
+  return "IDL:omg.org/PortableServer/ThreadPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_ThreadPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f54), 
+  ACE_NTOHL (0x68726561), 
+  ACE_NTOHL (0x64506f6c), 
+  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicy:2.3
+    13,
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = ThreadPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ThreadPolicy),
+    (char *) &_oc_PortableServer_ThreadPolicy,
+    0,
+    sizeof (PortableServer::ThreadPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ThreadPolicy,
+    &_tc_TAO_tc_PortableServer_ThreadPolicy
+  )
+TAO_NAMESPACE_END
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f4c),
-  ACE_NTOHL (0x69666573),
-  ACE_NTOHL (0x70616e50),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x7956616c),
-  ACE_NTOHL (0x75653a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicyValue:1.0
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f4c), 
+  ACE_NTOHL (0x69666573), 
+  ACE_NTOHL (0x70616e50), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x7956616c), 
+  ACE_NTOHL (0x75653a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicyValue:2.3
   20,
-  ACE_NTOHL (0x4c696665),
-  ACE_NTOHL (0x7370616e),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x4c696665), 
+  ACE_NTOHL (0x7370616e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756500),  // name = LifespanPolicyValue
   2, // member count
   10,
-  ACE_NTOHL (0x5452414e),
-  ACE_NTOHL (0x5349454e),
+  ACE_NTOHL (0x5452414e), 
+  ACE_NTOHL (0x5349454e), 
   ACE_NTOHL (0x54000000),  // name = TRANSIENT
   11,
-  ACE_NTOHL (0x50455253),
-  ACE_NTOHL (0x49535445),
+  ACE_NTOHL (0x50455253), 
+  ACE_NTOHL (0x49535445), 
   ACE_NTOHL (0x4e540000),  // name = PERSISTENT
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue (
     CORBA::tk_enum,
@@ -1221,9 +1427,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_LifespanPolicyValue, &_tc_TAO_tc_PortableServer_LifespanPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_LifespanPolicyValue,
+    &_tc_TAO_tc_PortableServer_LifespanPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::LifespanPolicy::_tao_class_id = 0;
 
 PortableServer::LifespanPolicy_ptr
@@ -1269,13 +1482,23 @@ tao_PortableServer_LifespanPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_LifespanPolicy_marshal (
+    PortableServer::LifespanPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::LifespanPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (void) // default constructor
+PortableServer::LifespanPolicy_var::LifespanPolicy_var (void)
   : ptr_ (LifespanPolicy::_nil ())
 {}
 
@@ -1285,12 +1508,12 @@ PortableServer::LifespanPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (const ::PortableServer::LifespanPolicy_var &p) // copy constructor
+PortableServer::LifespanPolicy_var::LifespanPolicy_var (const ::PortableServer::LifespanPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (LifespanPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::LifespanPolicy_var::~LifespanPolicy_var (void) // destructor
+PortableServer::LifespanPolicy_var::~LifespanPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1319,7 +1542,7 @@ PortableServer::LifespanPolicy_var::operator const ::PortableServer::LifespanPol
   return this->ptr_;
 }
 
-PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast
+PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1394,10 +1617,11 @@ PortableServer::LifespanPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::LifespanPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_ptr &p)
@@ -1406,14 +1630,14 @@ PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_ptr &p)
   this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
 }
 
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_var &p) // constructor from _var
+PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
 }
 
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (const ::PortableServer::LifespanPolicy_out &p) // copy constructor
+PortableServer::LifespanPolicy_out::LifespanPolicy_out (const ::PortableServer::LifespanPolicy_out &p)
   : ptr_ (ACE_const_cast (LifespanPolicy_out &, p).ptr_)
 {}
 
@@ -1444,7 +1668,7 @@ PortableServer::LifespanPolicy_out::operator ::PortableServer::LifespanPolicy_pt
 }
 
 ::PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_out::ptr (void) // ptr
+PortableServer::LifespanPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1455,9 +1679,8 @@ PortableServer::LifespanPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::LifespanPolicy::LifespanPolicy (void)
 {}
@@ -1465,7 +1688,15 @@ PortableServer::LifespanPolicy::LifespanPolicy (void)
 PortableServer::LifespanPolicy::~LifespanPolicy (void)
 {}
 
-PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow (
+void 
+PortableServer::LifespanPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  LifespanPolicy *tmp = ACE_static_cast (LifespanPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1473,105 +1704,171 @@ PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow (
   return LifespanPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy_ptr 
 PortableServer::LifespanPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return LifespanPolicy::_nil ();
+    {
+      return LifespanPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           LifespanPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &LifespanPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &LifespanPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::LifespanPolicy_ptr
 PortableServer::LifespanPolicy::_duplicate (LifespanPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::LifespanPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, LifespanPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, LifespanPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableServer::LifespanPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/LifespanPolicy:1.0";
+  return "IDL:omg.org/PortableServer/LifespanPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_LifespanPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  46,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f4c), 
+  ACE_NTOHL (0x69666573), 
+  ACE_NTOHL (0x70616e50), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x793a322e), 
+  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicy:2.3
+    15,
+  ACE_NTOHL (0x4c696665), 
+  ACE_NTOHL (0x7370616e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63790000),  // name = LifespanPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_LifespanPolicy),
+    (char *) &_oc_PortableServer_LifespanPolicy,
+    0,
+    sizeof (PortableServer::LifespanPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_LifespanPolicy,
+    &_tc_TAO_tc_PortableServer_LifespanPolicy
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_IdUniquenessPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f49),
-  ACE_NTOHL (0x64556e69),
-  ACE_NTOHL (0x7175656e),
-  ACE_NTOHL (0x65737350),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x7956616c),
-  ACE_NTOHL (0x75653a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicyValue:1.0
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x64556e69), 
+  ACE_NTOHL (0x7175656e), 
+  ACE_NTOHL (0x65737350), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x7956616c), 
+  ACE_NTOHL (0x75653a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicyValue:2.3
   24,
-  ACE_NTOHL (0x4964556e),
-  ACE_NTOHL (0x69717565),
-  ACE_NTOHL (0x6e657373),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x4964556e), 
+  ACE_NTOHL (0x69717565), 
+  ACE_NTOHL (0x6e657373), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756500),  // name = IdUniquenessPolicyValue
   2, // member count
   10,
-  ACE_NTOHL (0x554e4951),
-  ACE_NTOHL (0x55455f49),
+  ACE_NTOHL (0x554e4951), 
+  ACE_NTOHL (0x55455f49), 
   ACE_NTOHL (0x44000000),  // name = UNIQUE_ID
   12,
-  ACE_NTOHL (0x4d554c54),
-  ACE_NTOHL (0x49504c45),
+  ACE_NTOHL (0x4d554c54), 
+  ACE_NTOHL (0x49504c45), 
   ACE_NTOHL (0x5f494400),  // name = MULTIPLE_ID
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue (
     CORBA::tk_enum,
@@ -1583,9 +1880,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IdUniquenessPolicyValue, &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IdUniquenessPolicyValue,
+    &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::IdUniquenessPolicy::_tao_class_id = 0;
 
 PortableServer::IdUniquenessPolicy_ptr
@@ -1631,13 +1935,23 @@ tao_PortableServer_IdUniquenessPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_IdUniquenessPolicy_marshal (
+    PortableServer::IdUniquenessPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::IdUniquenessPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (void) // default constructor
+PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (void)
   : ptr_ (IdUniquenessPolicy::_nil ())
 {}
 
@@ -1647,12 +1961,12 @@ PortableServer::IdUniquenessPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (const ::PortableServer::IdUniquenessPolicy_var &p) // copy constructor
+PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (const ::PortableServer::IdUniquenessPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (IdUniquenessPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::IdUniquenessPolicy_var::~IdUniquenessPolicy_var (void) // destructor
+PortableServer::IdUniquenessPolicy_var::~IdUniquenessPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1681,7 +1995,7 @@ PortableServer::IdUniquenessPolicy_var::operator const ::PortableServer::IdUniqu
   return this->ptr_;
 }
 
-PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast
+PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1756,10 +2070,11 @@ PortableServer::IdUniquenessPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::IdUniquenessPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &p)
@@ -1768,14 +2083,14 @@ PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPoli
   this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
 }
 
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_var &p) // constructor from _var
+PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
 }
 
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (const ::PortableServer::IdUniquenessPolicy_out &p) // copy constructor
+PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (const ::PortableServer::IdUniquenessPolicy_out &p)
   : ptr_ (ACE_const_cast (IdUniquenessPolicy_out &, p).ptr_)
 {}
 
@@ -1806,7 +2121,7 @@ PortableServer::IdUniquenessPolicy_out::operator ::PortableServer::IdUniquenessP
 }
 
 ::PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_out::ptr (void) // ptr
+PortableServer::IdUniquenessPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1817,9 +2132,8 @@ PortableServer::IdUniquenessPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 {}
@@ -1827,7 +2141,15 @@ PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
 {}
 
-PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow (
+void 
+PortableServer::IdUniquenessPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  IdUniquenessPolicy *tmp = ACE_static_cast (IdUniquenessPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1835,104 +2157,172 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narr
   return IdUniquenessPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy_ptr 
 PortableServer::IdUniquenessPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return IdUniquenessPolicy::_nil ();
+    {
+      return IdUniquenessPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           IdUniquenessPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &IdUniquenessPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &IdUniquenessPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::IdUniquenessPolicy_ptr
 PortableServer::IdUniquenessPolicy::_duplicate (IdUniquenessPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::IdUniquenessPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, IdUniquenessPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, IdUniquenessPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0";
+  return "IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_IdUniquenessPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  50,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x64556e69), 
+  ACE_NTOHL (0x7175656e), 
+  ACE_NTOHL (0x65737350), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x793a322e), 
+  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3
+    19,
+  ACE_NTOHL (0x4964556e), 
+  ACE_NTOHL (0x69717565), 
+  ACE_NTOHL (0x6e657373), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63790000),  // name = IdUniquenessPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_IdUniquenessPolicy),
+    (char *) &_oc_PortableServer_IdUniquenessPolicy,
+    0,
+    sizeof (PortableServer::IdUniquenessPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IdUniquenessPolicy,
+    &_tc_TAO_tc_PortableServer_IdUniquenessPolicy
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_IdAssignmentPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f49),
-  ACE_NTOHL (0x64417373),
-  ACE_NTOHL (0x69676e6d),
-  ACE_NTOHL (0x656e7450),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x7956616c),
-  ACE_NTOHL (0x75653a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicyValue:1.0
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x64417373), 
+  ACE_NTOHL (0x69676e6d), 
+  ACE_NTOHL (0x656e7450), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x7956616c), 
+  ACE_NTOHL (0x75653a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicyValue:2.3
   24,
-  ACE_NTOHL (0x49644173),
-  ACE_NTOHL (0x7369676e),
-  ACE_NTOHL (0x6d656e74),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x49644173), 
+  ACE_NTOHL (0x7369676e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756500),  // name = IdAssignmentPolicyValue
   2, // member count
   8,
-  ACE_NTOHL (0x55534552),
+  ACE_NTOHL (0x55534552), 
   ACE_NTOHL (0x5f494400),  // name = USER_ID
   10,
-  ACE_NTOHL (0x53595354),
-  ACE_NTOHL (0x454d5f49),
+  ACE_NTOHL (0x53595354), 
+  ACE_NTOHL (0x454d5f49), 
   ACE_NTOHL (0x44000000),  // name = SYSTEM_ID
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue (
     CORBA::tk_enum,
@@ -1944,9 +2334,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IdAssignmentPolicyValue, &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IdAssignmentPolicyValue,
+    &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::IdAssignmentPolicy::_tao_class_id = 0;
 
 PortableServer::IdAssignmentPolicy_ptr
@@ -1992,13 +2389,23 @@ tao_PortableServer_IdAssignmentPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_IdAssignmentPolicy_marshal (
+    PortableServer::IdAssignmentPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::IdAssignmentPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (void) // default constructor
+PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (void)
   : ptr_ (IdAssignmentPolicy::_nil ())
 {}
 
@@ -2008,12 +2415,12 @@ PortableServer::IdAssignmentPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (const ::PortableServer::IdAssignmentPolicy_var &p) // copy constructor
+PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (const ::PortableServer::IdAssignmentPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (IdAssignmentPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::IdAssignmentPolicy_var::~IdAssignmentPolicy_var (void) // destructor
+PortableServer::IdAssignmentPolicy_var::~IdAssignmentPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2042,7 +2449,7 @@ PortableServer::IdAssignmentPolicy_var::operator const ::PortableServer::IdAssig
   return this->ptr_;
 }
 
-PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast
+PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2117,10 +2524,11 @@ PortableServer::IdAssignmentPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::IdAssignmentPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &p)
@@ -2129,14 +2537,14 @@ PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPoli
   this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
 }
 
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_var &p) // constructor from _var
+PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
 }
 
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (const ::PortableServer::IdAssignmentPolicy_out &p) // copy constructor
+PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (const ::PortableServer::IdAssignmentPolicy_out &p)
   : ptr_ (ACE_const_cast (IdAssignmentPolicy_out &, p).ptr_)
 {}
 
@@ -2167,7 +2575,7 @@ PortableServer::IdAssignmentPolicy_out::operator ::PortableServer::IdAssignmentP
 }
 
 ::PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_out::ptr (void) // ptr
+PortableServer::IdAssignmentPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2178,9 +2586,8 @@ PortableServer::IdAssignmentPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 {}
@@ -2188,7 +2595,15 @@ PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
 {}
 
-PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow (
+void 
+PortableServer::IdAssignmentPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  IdAssignmentPolicy *tmp = ACE_static_cast (IdAssignmentPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2196,116 +2611,184 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narr
   return IdAssignmentPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy_ptr 
 PortableServer::IdAssignmentPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return IdAssignmentPolicy::_nil ();
+    {
+      return IdAssignmentPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           IdAssignmentPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &IdAssignmentPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &IdAssignmentPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::IdAssignmentPolicy_ptr
 PortableServer::IdAssignmentPolicy::_duplicate (IdAssignmentPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::IdAssignmentPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, IdAssignmentPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, IdAssignmentPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0";
+  return "IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_IdAssignmentPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  50,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x64417373), 
+  ACE_NTOHL (0x69676e6d), 
+  ACE_NTOHL (0x656e7450), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x793a322e), 
+  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3
+    19,
+  ACE_NTOHL (0x49644173), 
+  ACE_NTOHL (0x7369676e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63790000),  // name = IdAssignmentPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_IdAssignmentPolicy),
+    (char *) &_oc_PortableServer_IdAssignmentPolicy,
+    0,
+    sizeof (PortableServer::IdAssignmentPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IdAssignmentPolicy,
+    &_tc_TAO_tc_PortableServer_IdAssignmentPolicy
+  )
+TAO_NAMESPACE_END
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   61,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f49),
-  ACE_NTOHL (0x6d706c69),
-  ACE_NTOHL (0x63697441),
-  ACE_NTOHL (0x63746976),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e506f6c),
-  ACE_NTOHL (0x69637956),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicyValue:1.0
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x6d706c69), 
+  ACE_NTOHL (0x63697441), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x3a322e33), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicyValue:2.3
   30,
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x69636974),
-  ACE_NTOHL (0x41637469),
-  ACE_NTOHL (0x76617469),
-  ACE_NTOHL (0x6f6e506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x69636974), 
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76617469), 
+  ACE_NTOHL (0x6f6e506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x56616c75), 
   ACE_NTOHL (0x65000000),  // name = ImplicitActivationPolicyValue
   2, // member count
   20,
-  ACE_NTOHL (0x494d504c),
-  ACE_NTOHL (0x49434954),
-  ACE_NTOHL (0x5f414354),
-  ACE_NTOHL (0x49564154),
+  ACE_NTOHL (0x494d504c), 
+  ACE_NTOHL (0x49434954), 
+  ACE_NTOHL (0x5f414354), 
+  ACE_NTOHL (0x49564154), 
   ACE_NTOHL (0x494f4e00),  // name = IMPLICIT_ACTIVATION
   23,
-  ACE_NTOHL (0x4e4f5f49),
-  ACE_NTOHL (0x4d504c49),
-  ACE_NTOHL (0x4349545f),
-  ACE_NTOHL (0x41435449),
-  ACE_NTOHL (0x56415449),
+  ACE_NTOHL (0x4e4f5f49), 
+  ACE_NTOHL (0x4d504c49), 
+  ACE_NTOHL (0x4349545f), 
+  ACE_NTOHL (0x41435449), 
+  ACE_NTOHL (0x56415449), 
   ACE_NTOHL (0x4f4e0000),  // name = NO_IMPLICIT_ACTIVATION
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue (
     CORBA::tk_enum,
@@ -2317,9 +2800,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ImplicitActivationPolicyValue, &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ImplicitActivationPolicyValue,
+    &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::ImplicitActivationPolicy::_tao_class_id = 0;
 
 PortableServer::ImplicitActivationPolicy_ptr
@@ -2365,13 +2855,23 @@ tao_PortableServer_ImplicitActivationPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_ImplicitActivationPolicy_marshal (
+    PortableServer::ImplicitActivationPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::ImplicitActivationPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (void) // default constructor
+PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (void)
   : ptr_ (ImplicitActivationPolicy::_nil ())
 {}
 
@@ -2381,12 +2881,12 @@ PortableServer::ImplicitActivationPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (const ::PortableServer::ImplicitActivationPolicy_var &p) // copy constructor
+PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (const ::PortableServer::ImplicitActivationPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ImplicitActivationPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::ImplicitActivationPolicy_var::~ImplicitActivationPolicy_var (void) // destructor
+PortableServer::ImplicitActivationPolicy_var::~ImplicitActivationPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2415,7 +2915,7 @@ PortableServer::ImplicitActivationPolicy_var::operator const ::PortableServer::I
   return this->ptr_;
 }
 
-PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast
+PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2490,10 +2990,11 @@ PortableServer::ImplicitActivationPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::ImplicitActivationPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &p)
@@ -2502,14 +3003,14 @@ PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (Impl
   this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
 }
 
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &p) // constructor from _var
+PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
 }
 
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (const ::PortableServer::ImplicitActivationPolicy_out &p) // copy constructor
+PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (const ::PortableServer::ImplicitActivationPolicy_out &p)
   : ptr_ (ACE_const_cast (ImplicitActivationPolicy_out &, p).ptr_)
 {}
 
@@ -2540,7 +3041,7 @@ PortableServer::ImplicitActivationPolicy_out::operator ::PortableServer::Implici
 }
 
 ::PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_out::ptr (void) // ptr
+PortableServer::ImplicitActivationPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2551,9 +3052,8 @@ PortableServer::ImplicitActivationPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 {}
@@ -2561,7 +3061,15 @@ PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
 {}
 
-PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow (
+void 
+PortableServer::ImplicitActivationPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ImplicitActivationPolicy *tmp = ACE_static_cast (ImplicitActivationPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2569,106 +3077,177 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationP
   return ImplicitActivationPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy_ptr 
 PortableServer::ImplicitActivationPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ImplicitActivationPolicy::_nil ();
+    {
+      return ImplicitActivationPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ImplicitActivationPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ImplicitActivationPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ImplicitActivationPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::ImplicitActivationPolicy_ptr
 PortableServer::ImplicitActivationPolicy::_duplicate (ImplicitActivationPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::ImplicitActivationPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, ImplicitActivationPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ImplicitActivationPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0";
+  return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  56,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x6d706c69), 
+  ACE_NTOHL (0x63697441), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e506f6c), 
+  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3
+    25,
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x69636974), 
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76617469), 
+  ACE_NTOHL (0x6f6e506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = ImplicitActivationPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ImplicitActivationPolicy),
+    (char *) &_oc_PortableServer_ImplicitActivationPolicy,
+    0,
+    sizeof (PortableServer::ImplicitActivationPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ImplicitActivationPolicy,
+    &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f53),
-  ACE_NTOHL (0x65727661),
-  ACE_NTOHL (0x6e745265),
-  ACE_NTOHL (0x74656e74),
-  ACE_NTOHL (0x696f6e50),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x7956616c),
-  ACE_NTOHL (0x75653a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicyValue:1.0
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x74656e74), 
+  ACE_NTOHL (0x696f6e50), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x7956616c), 
+  ACE_NTOHL (0x75653a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicyValue:2.3
   28,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x616e7452),
-  ACE_NTOHL (0x6574656e),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e7452), 
+  ACE_NTOHL (0x6574656e), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756500),  // name = ServantRetentionPolicyValue
   2, // member count
   7,
-  ACE_NTOHL (0x52455441),
+  ACE_NTOHL (0x52455441), 
   ACE_NTOHL (0x494e0000),  // name = RETAIN
   11,
-  ACE_NTOHL (0x4e4f4e5f),
-  ACE_NTOHL (0x52455441),
+  ACE_NTOHL (0x4e4f4e5f), 
+  ACE_NTOHL (0x52455441), 
   ACE_NTOHL (0x494e0000),  // name = NON_RETAIN
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue (
     CORBA::tk_enum,
@@ -2680,9 +3259,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ServantRetentionPolicyValue, &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServantRetentionPolicyValue,
+    &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::ServantRetentionPolicy::_tao_class_id = 0;
 
 PortableServer::ServantRetentionPolicy_ptr
@@ -2728,13 +3314,23 @@ tao_PortableServer_ServantRetentionPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_ServantRetentionPolicy_marshal (
+    PortableServer::ServantRetentionPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::ServantRetentionPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (void) // default constructor
+PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (void)
   : ptr_ (ServantRetentionPolicy::_nil ())
 {}
 
@@ -2744,12 +3340,12 @@ PortableServer::ServantRetentionPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (const ::PortableServer::ServantRetentionPolicy_var &p) // copy constructor
+PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (const ::PortableServer::ServantRetentionPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ServantRetentionPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::ServantRetentionPolicy_var::~ServantRetentionPolicy_var (void) // destructor
+PortableServer::ServantRetentionPolicy_var::~ServantRetentionPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2778,7 +3374,7 @@ PortableServer::ServantRetentionPolicy_var::operator const ::PortableServer::Ser
   return this->ptr_;
 }
 
-PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast
+PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2853,10 +3449,11 @@ PortableServer::ServantRetentionPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::ServantRetentionPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &p)
@@ -2865,14 +3462,14 @@ PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantR
   this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
 }
 
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_var &p) // constructor from _var
+PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
 }
 
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (const ::PortableServer::ServantRetentionPolicy_out &p) // copy constructor
+PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (const ::PortableServer::ServantRetentionPolicy_out &p)
   : ptr_ (ACE_const_cast (ServantRetentionPolicy_out &, p).ptr_)
 {}
 
@@ -2903,7 +3500,7 @@ PortableServer::ServantRetentionPolicy_out::operator ::PortableServer::ServantRe
 }
 
 ::PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_out::ptr (void) // ptr
+PortableServer::ServantRetentionPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2914,9 +3511,8 @@ PortableServer::ServantRetentionPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 {}
@@ -2924,7 +3520,15 @@ PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
 {}
 
-PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow (
+void 
+PortableServer::ServantRetentionPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantRetentionPolicy *tmp = ACE_static_cast (ServantRetentionPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2932,120 +3536,190 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolic
   return ServantRetentionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy_ptr 
 PortableServer::ServantRetentionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ServantRetentionPolicy::_nil ();
+    {
+      return ServantRetentionPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServantRetentionPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServantRetentionPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServantRetentionPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::ServantRetentionPolicy_ptr
 PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::ServantRetentionPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, ServantRetentionPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ServantRetentionPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0";
+  return "IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_ServantRetentionPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  54,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x74656e74), 
+  ACE_NTOHL (0x696f6e50), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x793a322e), 
+  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3
+    23,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e7452), 
+  ACE_NTOHL (0x6574656e), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63790000),  // name = ServantRetentionPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ServantRetentionPolicy),
+    (char *) &_oc_PortableServer_ServantRetentionPolicy,
+    0,
+    sizeof (PortableServer::ServantRetentionPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServantRetentionPolicy,
+    &_tc_TAO_tc_PortableServer_ServantRetentionPolicy
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_PortableServer_RequestProcessingPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f52),
-  ACE_NTOHL (0x65717565),
-  ACE_NTOHL (0x73745072),
-  ACE_NTOHL (0x6f636573),
-  ACE_NTOHL (0x73696e67),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
-  ACE_NTOHL (0x6c75653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicyValue:1.0
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f52), 
+  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x73745072), 
+  ACE_NTOHL (0x6f636573), 
+  ACE_NTOHL (0x73696e67), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x6c75653a), 
+  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicyValue:2.3
   29,
-  ACE_NTOHL (0x52657175),
-  ACE_NTOHL (0x65737450),
-  ACE_NTOHL (0x726f6365),
-  ACE_NTOHL (0x7373696e),
-  ACE_NTOHL (0x67506f6c),
-  ACE_NTOHL (0x69637956),
-  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737450), 
+  ACE_NTOHL (0x726f6365), 
+  ACE_NTOHL (0x7373696e), 
+  ACE_NTOHL (0x67506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
   ACE_NTOHL (0x0),  // name = RequestProcessingPolicyValue
   3, // member count
   27,
-  ACE_NTOHL (0x5553455f),
-  ACE_NTOHL (0x41435449),
-  ACE_NTOHL (0x56455f4f),
-  ACE_NTOHL (0x424a4543),
-  ACE_NTOHL (0x545f4d41),
-  ACE_NTOHL (0x505f4f4e),
+  ACE_NTOHL (0x5553455f), 
+  ACE_NTOHL (0x41435449), 
+  ACE_NTOHL (0x56455f4f), 
+  ACE_NTOHL (0x424a4543), 
+  ACE_NTOHL (0x545f4d41), 
+  ACE_NTOHL (0x505f4f4e), 
   ACE_NTOHL (0x4c590000),  // name = USE_ACTIVE_OBJECT_MAP_ONLY
   20,
-  ACE_NTOHL (0x5553455f),
-  ACE_NTOHL (0x44454641),
-  ACE_NTOHL (0x554c545f),
-  ACE_NTOHL (0x53455256),
+  ACE_NTOHL (0x5553455f), 
+  ACE_NTOHL (0x44454641), 
+  ACE_NTOHL (0x554c545f), 
+  ACE_NTOHL (0x53455256), 
   ACE_NTOHL (0x414e5400),  // name = USE_DEFAULT_SERVANT
   20,
-  ACE_NTOHL (0x5553455f),
-  ACE_NTOHL (0x53455256),
-  ACE_NTOHL (0x414e545f),
-  ACE_NTOHL (0x4d414e41),
+  ACE_NTOHL (0x5553455f), 
+  ACE_NTOHL (0x53455256), 
+  ACE_NTOHL (0x414e545f), 
+  ACE_NTOHL (0x4d414e41), 
   ACE_NTOHL (0x47455200),  // name = USE_SERVANT_MANAGER
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (
     CORBA::tk_enum,
@@ -3057,9 +3731,16 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_RequestProcessingPolicyValue, &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_RequestProcessingPolicyValue,
+    &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::RequestProcessingPolicy::_tao_class_id = 0;
 
 PortableServer::RequestProcessingPolicy_ptr
@@ -3105,13 +3786,23 @@ tao_PortableServer_RequestProcessingPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_RequestProcessingPolicy_marshal (
+    PortableServer::RequestProcessingPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::RequestProcessingPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (void) // default constructor
+PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (void)
   : ptr_ (RequestProcessingPolicy::_nil ())
 {}
 
@@ -3121,12 +3812,12 @@ PortableServer::RequestProcessingPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (const ::PortableServer::RequestProcessingPolicy_var &p) // copy constructor
+PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (const ::PortableServer::RequestProcessingPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (RequestProcessingPolicy::_duplicate (p.ptr ()))
 {}
 
-PortableServer::RequestProcessingPolicy_var::~RequestProcessingPolicy_var (void) // destructor
+PortableServer::RequestProcessingPolicy_var::~RequestProcessingPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3155,7 +3846,7 @@ PortableServer::RequestProcessingPolicy_var::operator const ::PortableServer::Re
   return this->ptr_;
 }
 
-PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast
+PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3230,10 +3921,11 @@ PortableServer::RequestProcessingPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::RequestProcessingPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &p)
@@ -3242,14 +3934,14 @@ PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (Reques
   this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
 }
 
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_var &p) // constructor from _var
+PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
 }
 
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (const ::PortableServer::RequestProcessingPolicy_out &p) // copy constructor
+PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (const ::PortableServer::RequestProcessingPolicy_out &p)
   : ptr_ (ACE_const_cast (RequestProcessingPolicy_out &, p).ptr_)
 {}
 
@@ -3280,7 +3972,7 @@ PortableServer::RequestProcessingPolicy_out::operator ::PortableServer::RequestP
 }
 
 ::PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_out::ptr (void) // ptr
+PortableServer::RequestProcessingPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3291,9 +3983,8 @@ PortableServer::RequestProcessingPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 {}
@@ -3301,7 +3992,15 @@ PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
 {}
 
-PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow (
+void 
+PortableServer::RequestProcessingPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RequestProcessingPolicy *tmp = ACE_static_cast (RequestProcessingPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3309,72 +4008,142 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPol
   return RequestProcessingPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy_ptr 
 PortableServer::RequestProcessingPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return RequestProcessingPolicy::_nil ();
+    {
+      return RequestProcessingPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           RequestProcessingPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &RequestProcessingPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &RequestProcessingPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::RequestProcessingPolicy_ptr
 PortableServer::RequestProcessingPolicy::_duplicate (RequestProcessingPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::RequestProcessingPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, RequestProcessingPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, RequestProcessingPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0";
+  return "IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  55,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f52), 
+  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x73745072), 
+  ACE_NTOHL (0x6f636573), 
+  ACE_NTOHL (0x73696e67), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63793a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3
+    24,
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737450), 
+  ACE_NTOHL (0x726f6365), 
+  ACE_NTOHL (0x7373696e), 
+  ACE_NTOHL (0x67506f6c), 
+  ACE_NTOHL (0x69637900),  // name = RequestProcessingPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_RequestProcessingPolicy),
+    (char *) &_oc_PortableServer_RequestProcessingPolicy,
+    0,
+    sizeof (PortableServer::RequestProcessingPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_RequestProcessingPolicy,
+    &_tc_TAO_tc_PortableServer_RequestProcessingPolicy
+  )
+TAO_NAMESPACE_END
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::POAManager::_tao_class_id = 0;
 
 PortableServer::POAManager_ptr
@@ -3420,13 +4189,23 @@ tao_PortableServer_POAManager_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_POAManager_marshal (
+    PortableServer::POAManager_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::POAManager_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::POAManager_var::POAManager_var (void) // default constructor
+PortableServer::POAManager_var::POAManager_var (void)
   : ptr_ (POAManager::_nil ())
 {}
 
@@ -3436,12 +4215,12 @@ PortableServer::POAManager_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::POAManager_var::POAManager_var (const ::PortableServer::POAManager_var &p) // copy constructor
+PortableServer::POAManager_var::POAManager_var (const ::PortableServer::POAManager_var &p)
   : TAO_Base_var (),
     ptr_ (POAManager::_duplicate (p.ptr ()))
 {}
 
-PortableServer::POAManager_var::~POAManager_var (void) // destructor
+PortableServer::POAManager_var::~POAManager_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3470,7 +4249,7 @@ PortableServer::POAManager_var::operator const ::PortableServer::POAManager_ptr
   return this->ptr_;
 }
 
-PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast
+PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3545,10 +4324,11 @@ PortableServer::POAManager_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::POAManager_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::POAManager_out::POAManager_out (POAManager_ptr &p)
@@ -3557,14 +4337,14 @@ PortableServer::POAManager_out::POAManager_out (POAManager_ptr &p)
   this->ptr_ = ::PortableServer::POAManager::_nil ();
 }
 
-PortableServer::POAManager_out::POAManager_out (POAManager_var &p) // constructor from _var
+PortableServer::POAManager_out::POAManager_out (POAManager_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::POAManager::_nil ();
 }
 
-PortableServer::POAManager_out::POAManager_out (const ::PortableServer::POAManager_out &p) // copy constructor
+PortableServer::POAManager_out::POAManager_out (const ::PortableServer::POAManager_out &p)
   : ptr_ (ACE_const_cast (POAManager_out &, p).ptr_)
 {}
 
@@ -3595,7 +4375,7 @@ PortableServer::POAManager_out::operator ::PortableServer::POAManager_ptr &() //
 }
 
 ::PortableServer::POAManager_ptr &
-PortableServer::POAManager_out::ptr (void) // ptr
+PortableServer::POAManager_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3606,9 +4386,8 @@ PortableServer::POAManager_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::POAManager::POAManager (void)
 {}
@@ -3616,7 +4395,15 @@ PortableServer::POAManager::POAManager (void)
 PortableServer::POAManager::~POAManager (void)
 {}
 
-PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (
+void 
+PortableServer::POAManager::_tao_any_destructor (void *_tao_void_pointer)
+{
+  POAManager *tmp = ACE_static_cast (POAManager *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::POAManager_ptr
+PortableServer::POAManager::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3624,73 +4411,91 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (
   return POAManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::POAManager_ptr
+PortableServer::POAManager_ptr 
 PortableServer::POAManager::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return POAManager::_nil ();
+    {
+      return POAManager::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           POAManager_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &POAManager::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &POAManager::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::POAManager_ptr
 PortableServer::POAManager::_duplicate (POAManager_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::POAManager::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, POAManager)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, POAManager)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableServer::POAManager::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/POAManager:1.0";
+  return "IDL:omg.org/PortableServer/POAManager:2.3";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0",
+        "IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3",
         "AdapterInactive"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POAManager::AdapterInactive::~AdapterInactive (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -3699,7 +4504,6 @@ PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableSe
 {
 }
 
-// Assignment operator.
 PortableServer::POAManager::AdapterInactive&
 PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
 {
@@ -3707,12 +4511,18 @@ PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::
   return *this;
 }
 
+void PortableServer::POAManager::AdapterInactive::_tao_any_destructor (void *_tao_void_pointer)
+{
+  AdapterInactive *tmp = ACE_static_cast (AdapterInactive*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POAManager::AdapterInactive *
-PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception *exc)
+PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (AdapterInactive *, exc);
+      return ACE_dynamic_cast (AdapterInactive *, _tao_excp);
     }
   else
     {
@@ -3733,13 +4543,13 @@ PortableServer::POAManager::AdapterInactive::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POAManager::AdapterInactive (*this),
+      ::PortableServer::POAManager::AdapterInactive (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POAManager::AdapterInactive::_raise ()
+void PortableServer::POAManager::AdapterInactive::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -3760,7 +4570,99 @@ void PortableServer::POAManager::AdapterInactive::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POAManager::AdapterInactive::_type (void) const
+{
+  return ::PortableServer::POAManager::_tc_AdapterInactive;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POAManager_AdapterInactive[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  58,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f414d61), 
+  ACE_NTOHL (0x6e616765), 
+  ACE_NTOHL (0x722f4164), 
+  ACE_NTOHL (0x61707465), 
+  ACE_NTOHL (0x72496e61), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x653a322e), 
+  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3
+    16,
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657249), 
+  ACE_NTOHL (0x6e616374), 
+  ACE_NTOHL (0x69766500),  // name = AdapterInactive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_AdapterInactive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POAManager_AdapterInactive),
+    (char *) &_oc_PortableServer_POAManager_AdapterInactive,
+    0,
+    sizeof (PortableServer::POAManager::AdapterInactive)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive =
+  &_tc_TAO_tc_PortableServer_POAManager_AdapterInactive;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POAManager[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  42,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f414d61), 
+  ACE_NTOHL (0x6e616765), 
+  ACE_NTOHL (0x723a322e), 
+  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager:2.3
+    11,
+  ACE_NTOHL (0x504f414d), 
+  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x65720000),  // name = POAManager
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_POAManager),
+    (char *) &_oc_PortableServer_POAManager,
+    0,
+    sizeof (PortableServer::POAManager)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_POAManager,
+    &_tc_TAO_tc_PortableServer_POAManager
+  )
+TAO_NAMESPACE_END
+
 #if (TAO_HAS_MINIMUM_POA == 0)
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::AdapterActivator::_tao_class_id = 0;
 
 PortableServer::AdapterActivator_ptr
@@ -3806,13 +4708,23 @@ tao_PortableServer_AdapterActivator_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_AdapterActivator_marshal (
+    PortableServer::AdapterActivator_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::AdapterActivator_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::AdapterActivator_var::AdapterActivator_var (void) // default constructor
+PortableServer::AdapterActivator_var::AdapterActivator_var (void)
   : ptr_ (AdapterActivator::_nil ())
 {}
 
@@ -3822,12 +4734,12 @@ PortableServer::AdapterActivator_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::AdapterActivator_var::AdapterActivator_var (const ::PortableServer::AdapterActivator_var &p) // copy constructor
+PortableServer::AdapterActivator_var::AdapterActivator_var (const ::PortableServer::AdapterActivator_var &p)
   : TAO_Base_var (),
     ptr_ (AdapterActivator::_duplicate (p.ptr ()))
 {}
 
-PortableServer::AdapterActivator_var::~AdapterActivator_var (void) // destructor
+PortableServer::AdapterActivator_var::~AdapterActivator_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3856,7 +4768,7 @@ PortableServer::AdapterActivator_var::operator const ::PortableServer::AdapterAc
   return this->ptr_;
 }
 
-PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast
+PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3931,10 +4843,11 @@ PortableServer::AdapterActivator_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::AdapterActivator_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_ptr &p)
@@ -3943,14 +4856,14 @@ PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_ptr
   this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
 }
 
-PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_var &p) // constructor from _var
+PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
 }
 
-PortableServer::AdapterActivator_out::AdapterActivator_out (const ::PortableServer::AdapterActivator_out &p) // copy constructor
+PortableServer::AdapterActivator_out::AdapterActivator_out (const ::PortableServer::AdapterActivator_out &p)
   : ptr_ (ACE_const_cast (AdapterActivator_out &, p).ptr_)
 {}
 
@@ -3981,7 +4894,7 @@ PortableServer::AdapterActivator_out::operator ::PortableServer::AdapterActivato
 }
 
 ::PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_out::ptr (void) // ptr
+PortableServer::AdapterActivator_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3992,9 +4905,8 @@ PortableServer::AdapterActivator_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::AdapterActivator::AdapterActivator (void)
 {}
@@ -4002,7 +4914,15 @@ PortableServer::AdapterActivator::AdapterActivator (void)
 PortableServer::AdapterActivator::~AdapterActivator (void)
 {}
 
-PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (
+void 
+PortableServer::AdapterActivator::_tao_any_destructor (void *_tao_void_pointer)
+{
+  AdapterActivator *tmp = ACE_static_cast (AdapterActivator *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4010,50 +4930,68 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (
   return AdapterActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator_ptr 
 PortableServer::AdapterActivator::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return AdapterActivator::_nil ();
+    {
+      return AdapterActivator::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           AdapterActivator_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &AdapterActivator::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &AdapterActivator::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::AdapterActivator_ptr
 PortableServer::AdapterActivator::_duplicate (AdapterActivator_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::AdapterActivator::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, AdapterActivator)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, AdapterActivator)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -4062,6 +5000,53 @@ const char* PortableServer::AdapterActivator::_interface_repository_id (void) co
   return "IDL:omg.org/PortableServer/AdapterActivator:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_AdapterActivator[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f41), 
+  ACE_NTOHL (0x64617074), 
+  ACE_NTOHL (0x65724163), 
+  ACE_NTOHL (0x74697661), 
+  ACE_NTOHL (0x746f723a), 
+  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/AdapterActivator:2.3
+    17,
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657241), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x61746f72), 
+  ACE_NTOHL (0x0),  // name = AdapterActivator
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_AdapterActivator (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_AdapterActivator),
+    (char *) &_oc_PortableServer_AdapterActivator,
+    0,
+    sizeof (PortableServer::AdapterActivator)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_AdapterActivator,
+    &_tc_TAO_tc_PortableServer_AdapterActivator
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::ServantManager::_tao_class_id = 0;
 
 PortableServer::ServantManager_ptr
@@ -4107,13 +5092,23 @@ tao_PortableServer_ServantManager_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_ServantManager_marshal (
+    PortableServer::ServantManager_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::ServantManager_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::ServantManager_var::ServantManager_var (void) // default constructor
+PortableServer::ServantManager_var::ServantManager_var (void)
   : ptr_ (ServantManager::_nil ())
 {}
 
@@ -4123,12 +5118,12 @@ PortableServer::ServantManager_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::ServantManager_var::ServantManager_var (const ::PortableServer::ServantManager_var &p) // copy constructor
+PortableServer::ServantManager_var::ServantManager_var (const ::PortableServer::ServantManager_var &p)
   : TAO_Base_var (),
     ptr_ (ServantManager::_duplicate (p.ptr ()))
 {}
 
-PortableServer::ServantManager_var::~ServantManager_var (void) // destructor
+PortableServer::ServantManager_var::~ServantManager_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4157,7 +5152,7 @@ PortableServer::ServantManager_var::operator const ::PortableServer::ServantMana
   return this->ptr_;
 }
 
-PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast
+PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4232,10 +5227,11 @@ PortableServer::ServantManager_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::ServantManager_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::ServantManager_out::ServantManager_out (ServantManager_ptr &p)
@@ -4244,14 +5240,14 @@ PortableServer::ServantManager_out::ServantManager_out (ServantManager_ptr &p)
   this->ptr_ = ::PortableServer::ServantManager::_nil ();
 }
 
-PortableServer::ServantManager_out::ServantManager_out (ServantManager_var &p) // constructor from _var
+PortableServer::ServantManager_out::ServantManager_out (ServantManager_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::ServantManager::_nil ();
 }
 
-PortableServer::ServantManager_out::ServantManager_out (const ::PortableServer::ServantManager_out &p) // copy constructor
+PortableServer::ServantManager_out::ServantManager_out (const ::PortableServer::ServantManager_out &p)
   : ptr_ (ACE_const_cast (ServantManager_out &, p).ptr_)
 {}
 
@@ -4282,7 +5278,7 @@ PortableServer::ServantManager_out::operator ::PortableServer::ServantManager_pt
 }
 
 ::PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_out::ptr (void) // ptr
+PortableServer::ServantManager_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4293,9 +5289,8 @@ PortableServer::ServantManager_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::ServantManager::ServantManager (void)
 {}
@@ -4303,7 +5298,15 @@ PortableServer::ServantManager::ServantManager (void)
 PortableServer::ServantManager::~ServantManager (void)
 {}
 
-PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (
+void 
+PortableServer::ServantManager::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantManager *tmp = ACE_static_cast (ServantManager *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::ServantManager_ptr
+PortableServer::ServantManager::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4311,58 +5314,122 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (
   return ServantManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::ServantManager_ptr
+PortableServer::ServantManager_ptr 
 PortableServer::ServantManager::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ServantManager::_nil ();
+    {
+      return ServantManager::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServantManager_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServantManager::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServantManager::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::ServantManager_ptr
 PortableServer::ServantManager::_duplicate (ServantManager_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::ServantManager::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
 const char* PortableServer::ServantManager::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ServantManager:1.0";
+  return "IDL:omg.org/PortableServer/ServantManager:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_ServantManager[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  46,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e744d61), 
+  ACE_NTOHL (0x6e616765), 
+  ACE_NTOHL (0x723a322e), 
+  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantManager:2.3
+    15,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e744d), 
+  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x65720000),  // name = ServantManager
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantManager (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ServantManager),
+    (char *) &_oc_PortableServer_ServantManager,
+    0,
+    sizeof (PortableServer::ServantManager)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServantManager,
+    &_tc_TAO_tc_PortableServer_ServantManager
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::ServantActivator::_tao_class_id = 0;
 
 PortableServer::ServantActivator_ptr
@@ -4408,13 +5475,23 @@ tao_PortableServer_ServantActivator_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_ServantActivator_marshal (
+    PortableServer::ServantActivator_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::ServantActivator_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::ServantActivator_var::ServantActivator_var (void) // default constructor
+PortableServer::ServantActivator_var::ServantActivator_var (void)
   : ptr_ (ServantActivator::_nil ())
 {}
 
@@ -4424,12 +5501,12 @@ PortableServer::ServantActivator_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::ServantActivator_var::ServantActivator_var (const ::PortableServer::ServantActivator_var &p) // copy constructor
+PortableServer::ServantActivator_var::ServantActivator_var (const ::PortableServer::ServantActivator_var &p)
   : TAO_Base_var (),
     ptr_ (ServantActivator::_duplicate (p.ptr ()))
 {}
 
-PortableServer::ServantActivator_var::~ServantActivator_var (void) // destructor
+PortableServer::ServantActivator_var::~ServantActivator_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4458,7 +5535,7 @@ PortableServer::ServantActivator_var::operator const ::PortableServer::ServantAc
   return this->ptr_;
 }
 
-PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast
+PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4533,10 +5610,11 @@ PortableServer::ServantActivator_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::ServantActivator_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_ptr &p)
@@ -4545,14 +5623,14 @@ PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_ptr
   this->ptr_ = ::PortableServer::ServantActivator::_nil ();
 }
 
-PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_var &p) // constructor from _var
+PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::ServantActivator::_nil ();
 }
 
-PortableServer::ServantActivator_out::ServantActivator_out (const ::PortableServer::ServantActivator_out &p) // copy constructor
+PortableServer::ServantActivator_out::ServantActivator_out (const ::PortableServer::ServantActivator_out &p)
   : ptr_ (ACE_const_cast (ServantActivator_out &, p).ptr_)
 {}
 
@@ -4583,7 +5661,7 @@ PortableServer::ServantActivator_out::operator ::PortableServer::ServantActivato
 }
 
 ::PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_out::ptr (void) // ptr
+PortableServer::ServantActivator_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4594,9 +5672,8 @@ PortableServer::ServantActivator_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::ServantActivator::ServantActivator (void)
 {}
@@ -4604,7 +5681,15 @@ PortableServer::ServantActivator::ServantActivator (void)
 PortableServer::ServantActivator::~ServantActivator (void)
 {}
 
-PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (
+void 
+PortableServer::ServantActivator::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantActivator *tmp = ACE_static_cast (ServantActivator *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4612,62 +5697,82 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (
   return ServantActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator_ptr 
 PortableServer::ServantActivator::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ServantActivator::_nil ();
+    {
+      return ServantActivator::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServantActivator_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServantActivator::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServantActivator::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::ServantActivator_ptr
 PortableServer::ServantActivator::_duplicate (ServantActivator_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::ServantActivator::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, ServantActivator)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableServer::ServantManager_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ServantActivator)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableServer::ServantManager_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -4676,6 +5781,53 @@ const char* PortableServer::ServantActivator::_interface_repository_id (void) co
   return "IDL:omg.org/PortableServer/ServantActivator:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_ServantActivator[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e744163), 
+  ACE_NTOHL (0x74697661), 
+  ACE_NTOHL (0x746f723a), 
+  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ServantActivator:2.3
+    17,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e7441), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x61746f72), 
+  ACE_NTOHL (0x0),  // name = ServantActivator
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantActivator (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ServantActivator),
+    (char *) &_oc_PortableServer_ServantActivator,
+    0,
+    sizeof (PortableServer::ServantActivator)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServantActivator,
+    &_tc_TAO_tc_PortableServer_ServantActivator
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::ServantLocator::_tao_class_id = 0;
 
 PortableServer::ServantLocator_ptr
@@ -4721,13 +5873,23 @@ tao_PortableServer_ServantLocator_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_ServantLocator_marshal (
+    PortableServer::ServantLocator_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::ServantLocator_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::ServantLocator_var::ServantLocator_var (void) // default constructor
+PortableServer::ServantLocator_var::ServantLocator_var (void)
   : ptr_ (ServantLocator::_nil ())
 {}
 
@@ -4737,12 +5899,12 @@ PortableServer::ServantLocator_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::ServantLocator_var::ServantLocator_var (const ::PortableServer::ServantLocator_var &p) // copy constructor
+PortableServer::ServantLocator_var::ServantLocator_var (const ::PortableServer::ServantLocator_var &p)
   : TAO_Base_var (),
     ptr_ (ServantLocator::_duplicate (p.ptr ()))
 {}
 
-PortableServer::ServantLocator_var::~ServantLocator_var (void) // destructor
+PortableServer::ServantLocator_var::~ServantLocator_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4771,7 +5933,7 @@ PortableServer::ServantLocator_var::operator const ::PortableServer::ServantLoca
   return this->ptr_;
 }
 
-PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast
+PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4846,10 +6008,11 @@ PortableServer::ServantLocator_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::ServantLocator_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_ptr &p)
@@ -4858,14 +6021,14 @@ PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_ptr &p)
   this->ptr_ = ::PortableServer::ServantLocator::_nil ();
 }
 
-PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_var &p) // constructor from _var
+PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::ServantLocator::_nil ();
 }
 
-PortableServer::ServantLocator_out::ServantLocator_out (const ::PortableServer::ServantLocator_out &p) // copy constructor
+PortableServer::ServantLocator_out::ServantLocator_out (const ::PortableServer::ServantLocator_out &p)
   : ptr_ (ACE_const_cast (ServantLocator_out &, p).ptr_)
 {}
 
@@ -4896,7 +6059,7 @@ PortableServer::ServantLocator_out::operator ::PortableServer::ServantLocator_pt
 }
 
 ::PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_out::ptr (void) // ptr
+PortableServer::ServantLocator_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4907,9 +6070,8 @@ PortableServer::ServantLocator_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::ServantLocator::ServantLocator (void)
 {}
@@ -4917,7 +6079,15 @@ PortableServer::ServantLocator::ServantLocator (void)
 PortableServer::ServantLocator::~ServantLocator (void)
 {}
 
-PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (
+void 
+PortableServer::ServantLocator::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantLocator *tmp = ACE_static_cast (ServantLocator *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4925,62 +6095,82 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (
   return ServantLocator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator_ptr 
 PortableServer::ServantLocator::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ServantLocator::_nil ();
+    {
+      return ServantLocator::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServantLocator_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServantLocator::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServantLocator::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::ServantLocator_ptr
 PortableServer::ServantLocator::_duplicate (ServantLocator_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::ServantLocator::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, ServantLocator)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableServer::ServantManager_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ServantLocator)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableServer::ServantManager_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -4989,8 +6179,54 @@ const char* PortableServer::ServantLocator::_interface_repository_id (void) cons
   return "IDL:omg.org/PortableServer/ServantLocator:2.3";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_ServantLocator[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  46,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e744c6f), 
+  ACE_NTOHL (0x6361746f), 
+  ACE_NTOHL (0x723a322e), 
+  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantLocator:2.3
+    15,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e744c), 
+  ACE_NTOHL (0x6f636174), 
+  ACE_NTOHL (0x6f720000),  // name = ServantLocator
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantLocator (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ServantLocator),
+    (char *) &_oc_PortableServer_ServantLocator,
+    0,
+    sizeof (PortableServer::ServantLocator)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServantLocator,
+    &_tc_TAO_tc_PortableServer_ServantLocator
+  )
+TAO_NAMESPACE_END
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::POA::_tao_class_id = 0;
 
 PortableServer::POA_ptr
@@ -5036,13 +6272,23 @@ tao_PortableServer_POA_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_POA_marshal (
+    PortableServer::POA_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::POA_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::POA_var::POA_var (void) // default constructor
+PortableServer::POA_var::POA_var (void)
   : ptr_ (POA::_nil ())
 {}
 
@@ -5052,12 +6298,12 @@ PortableServer::POA_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::POA_var::POA_var (const ::PortableServer::POA_var &p) // copy constructor
+PortableServer::POA_var::POA_var (const ::PortableServer::POA_var &p)
   : TAO_Base_var (),
     ptr_ (POA::_duplicate (p.ptr ()))
 {}
 
-PortableServer::POA_var::~POA_var (void) // destructor
+PortableServer::POA_var::~POA_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -5086,7 +6332,7 @@ PortableServer::POA_var::operator const ::PortableServer::POA_ptr &() const // c
   return this->ptr_;
 }
 
-PortableServer::POA_var::operator ::PortableServer::POA_ptr &() // cast
+PortableServer::POA_var::operator ::PortableServer::POA_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -5161,10 +6407,11 @@ PortableServer::POA_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::POA_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::POA_out::POA_out (POA_ptr &p)
@@ -5173,14 +6420,14 @@ PortableServer::POA_out::POA_out (POA_ptr &p)
   this->ptr_ = ::PortableServer::POA::_nil ();
 }
 
-PortableServer::POA_out::POA_out (POA_var &p) // constructor from _var
+PortableServer::POA_out::POA_out (POA_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::POA::_nil ();
 }
 
-PortableServer::POA_out::POA_out (const ::PortableServer::POA_out &p) // copy constructor
+PortableServer::POA_out::POA_out (const ::PortableServer::POA_out &p)
   : ptr_ (ACE_const_cast (POA_out &, p).ptr_)
 {}
 
@@ -5211,7 +6458,7 @@ PortableServer::POA_out::operator ::PortableServer::POA_ptr &() // cast
 }
 
 ::PortableServer::POA_ptr &
-PortableServer::POA_out::ptr (void) // ptr
+PortableServer::POA_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -5222,9 +6469,8 @@ PortableServer::POA_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::POA::POA (void)
 {}
@@ -5232,7 +6478,15 @@ PortableServer::POA::POA (void)
 PortableServer::POA::~POA (void)
 {}
 
-PortableServer::POA_ptr PortableServer::POA::_narrow (
+void 
+PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
+{
+  POA *tmp = ACE_static_cast (POA *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::POA_ptr
+PortableServer::POA::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -5240,50 +6494,68 @@ PortableServer::POA_ptr PortableServer::POA::_narrow (
   return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::POA_ptr
+PortableServer::POA_ptr 
 PortableServer::POA::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return POA::_nil ();
+    {
+      return POA::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           POA_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &POA::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &POA::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::POA_ptr
 PortableServer::POA::_duplicate (POA_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, POA)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, POA)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -5292,21 +6564,21 @@ const char* PortableServer::POA::_interface_repository_id (void) const
   return "IDL:omg.org/PortableServer/POA:2.3";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0",
+        "IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3",
         "AdapterAlreadyExists"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::AdapterAlreadyExists::~AdapterAlreadyExists (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -5315,7 +6587,6 @@ PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::Portabl
 {
 }
 
-// Assignment operator.
 PortableServer::POA::AdapterAlreadyExists&
 PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
 {
@@ -5323,12 +6594,18 @@ PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::PO
   return *this;
 }
 
+void PortableServer::POA::AdapterAlreadyExists::_tao_any_destructor (void *_tao_void_pointer)
+{
+  AdapterAlreadyExists *tmp = ACE_static_cast (AdapterAlreadyExists*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::AdapterAlreadyExists *
-PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception *exc)
+PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (AdapterAlreadyExists *, exc);
+      return ACE_dynamic_cast (AdapterAlreadyExists *, _tao_excp);
     }
   else
     {
@@ -5349,13 +6626,13 @@ PortableServer::POA::AdapterAlreadyExists::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::AdapterAlreadyExists (*this),
+      ::PortableServer::POA::AdapterAlreadyExists (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::AdapterAlreadyExists::_raise ()
+void PortableServer::POA::AdapterAlreadyExists::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5376,21 +6653,69 @@ void PortableServer::POA::AdapterAlreadyExists::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::AdapterAlreadyExists::_type (void) const
+{
+  return ::PortableServer::POA::_tc_AdapterAlreadyExists;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POA_AdapterAlreadyExists[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  56,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f41), 
+  ACE_NTOHL (0x64617074), 
+  ACE_NTOHL (0x6572416c), 
+  ACE_NTOHL (0x72656164), 
+  ACE_NTOHL (0x79457869), 
+  ACE_NTOHL (0x7374733a), 
+  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3
+    21,
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657241), 
+  ACE_NTOHL (0x6c726561), 
+  ACE_NTOHL (0x64794578), 
+  ACE_NTOHL (0x69737473), 
+  ACE_NTOHL (0x0),  // name = AdapterAlreadyExists
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_AdapterAlreadyExists),
+    (char *) &_oc_PortableServer_POA_AdapterAlreadyExists,
+    0,
+    sizeof (PortableServer::POA::AdapterAlreadyExists)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists =
+  &_tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0",
+        "IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3",
         "AdapterNonExistent"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::AdapterNonExistent::~AdapterNonExistent (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -5399,7 +6724,6 @@ PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableSer
 {
 }
 
-// Assignment operator.
 PortableServer::POA::AdapterNonExistent&
 PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
 {
@@ -5407,12 +6731,18 @@ PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA:
   return *this;
 }
 
+void PortableServer::POA::AdapterNonExistent::_tao_any_destructor (void *_tao_void_pointer)
+{
+  AdapterNonExistent *tmp = ACE_static_cast (AdapterNonExistent*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::AdapterNonExistent *
-PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception *exc)
+PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (AdapterNonExistent *, exc);
+      return ACE_dynamic_cast (AdapterNonExistent *, _tao_excp);
     }
   else
     {
@@ -5433,13 +6763,13 @@ PortableServer::POA::AdapterNonExistent::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::AdapterNonExistent (*this),
+      ::PortableServer::POA::AdapterNonExistent (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::AdapterNonExistent::_raise ()
+void PortableServer::POA::AdapterNonExistent::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5460,21 +6790,68 @@ void PortableServer::POA::AdapterNonExistent::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::AdapterNonExistent::_type (void) const
+{
+  return ::PortableServer::POA::_tc_AdapterNonExistent;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POA_AdapterNonExistent[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  54,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f41), 
+  ACE_NTOHL (0x64617074), 
+  ACE_NTOHL (0x65724e6f), 
+  ACE_NTOHL (0x6e457869), 
+  ACE_NTOHL (0x7374656e), 
+  ACE_NTOHL (0x743a322e), 
+  ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3
+    19,
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724e), 
+  ACE_NTOHL (0x6f6e4578), 
+  ACE_NTOHL (0x69737465), 
+  ACE_NTOHL (0x6e740000),  // name = AdapterNonExistent
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterNonExistent (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_AdapterNonExistent),
+    (char *) &_oc_PortableServer_POA_AdapterNonExistent,
+    0,
+    sizeof (PortableServer::POA::AdapterNonExistent)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent =
+  &_tc_TAO_tc_PortableServer_POA_AdapterNonExistent;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0",
+        "IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3",
         "InvalidPolicy"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::InvalidPolicy::~InvalidPolicy (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -5484,7 +6861,6 @@ PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::
   this->index = _tao_excp.index;
 }
 
-// Assignment operator.
 PortableServer::POA::InvalidPolicy&
 PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
 {
@@ -5493,12 +6869,18 @@ PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::Inva
   return *this;
 }
 
+void PortableServer::POA::InvalidPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  InvalidPolicy *tmp = ACE_static_cast (InvalidPolicy*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::InvalidPolicy *
-PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception *exc)
+PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InvalidPolicy *, exc);
+      return ACE_dynamic_cast (InvalidPolicy *, _tao_excp);
     }
   else
     {
@@ -5519,13 +6901,13 @@ PortableServer::POA::InvalidPolicy::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::InvalidPolicy (*this),
+      ::PortableServer::POA::InvalidPolicy (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::InvalidPolicy::_raise ()
+void PortableServer::POA::InvalidPolicy::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5546,34 +6928,89 @@ void PortableServer::POA::InvalidPolicy::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+
 PortableServer::POA::InvalidPolicy::InvalidPolicy (
     CORBA::UShort _tao_index
-  )
+  )  
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0",
+        "IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3",
         "InvalidPolicy"
       )
 {
   this->index = _tao_index;
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::InvalidPolicy::_type (void) const
+{
+  return ::PortableServer::POA::_tc_InvalidPolicy;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POA_InvalidPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  49,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f49), 
+  ACE_NTOHL (0x6e76616c), 
+  ACE_NTOHL (0x6964506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a322e33), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3
+    14,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696450), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x79000000),  // name = InvalidPolicy
+  1, // member count
+    6,
+  ACE_NTOHL (0x696e6465), 
+  ACE_NTOHL (0x78000000),  // name = index
+    CORBA::tk_ushort,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_InvalidPolicy),
+    (char *) &_oc_PortableServer_POA_InvalidPolicy,
+    0,
+    sizeof (PortableServer::POA::InvalidPolicy)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_InvalidPolicy =
+  &_tc_TAO_tc_PortableServer_POA_InvalidPolicy;
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::NoServant::NoServant (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/NoServant:1.0",
+        "IDL:omg.org/PortableServer/POA/NoServant:2.3",
         "NoServant"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::NoServant::~NoServant (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServant &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -5582,7 +7019,6 @@ PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServan
 {
 }
 
-// Assignment operator.
 PortableServer::POA::NoServant&
 PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServant &_tao_excp)
 {
@@ -5590,12 +7026,18 @@ PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServan
   return *this;
 }
 
+void PortableServer::POA::NoServant::_tao_any_destructor (void *_tao_void_pointer)
+{
+  NoServant *tmp = ACE_static_cast (NoServant*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::NoServant *
-PortableServer::POA::NoServant::_downcast (CORBA::Exception *exc)
+PortableServer::POA::NoServant::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (NoServant *, exc);
+      return ACE_dynamic_cast (NoServant *, _tao_excp);
     }
   else
     {
@@ -5616,13 +7058,13 @@ PortableServer::POA::NoServant::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::NoServant (*this),
+      ::PortableServer::POA::NoServant (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::NoServant::_raise ()
+void PortableServer::POA::NoServant::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5643,23 +7085,66 @@ void PortableServer::POA::NoServant::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::NoServant::_type (void) const
+{
+  return ::PortableServer::POA::_tc_NoServant;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POA_NoServant[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f4e), 
+  ACE_NTOHL (0x6f536572), 
+  ACE_NTOHL (0x76616e74), 
+  ACE_NTOHL (0x3a322e33), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/NoServant:2.3
+    10,
+  ACE_NTOHL (0x4e6f5365), 
+  ACE_NTOHL (0x7276616e), 
+  ACE_NTOHL (0x74000000),  // name = NoServant
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_NoServant),
+    (char *) &_oc_PortableServer_POA_NoServant,
+    0,
+    sizeof (PortableServer::POA::NoServant)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant =
+  &_tc_TAO_tc_PortableServer_POA_NoServant;
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0",
+        "IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3",
         "ObjectAlreadyActive"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::ObjectAlreadyActive::~ObjectAlreadyActive (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -5668,7 +7153,6 @@ PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableS
 {
 }
 
-// Assignment operator.
 PortableServer::POA::ObjectAlreadyActive&
 PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
 {
@@ -5676,12 +7160,18 @@ PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA
   return *this;
 }
 
+void PortableServer::POA::ObjectAlreadyActive::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ObjectAlreadyActive *tmp = ACE_static_cast (ObjectAlreadyActive*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::ObjectAlreadyActive *
-PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception *exc)
+PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (ObjectAlreadyActive *, exc);
+      return ACE_dynamic_cast (ObjectAlreadyActive *, _tao_excp);
     }
   else
     {
@@ -5702,13 +7192,13 @@ PortableServer::POA::ObjectAlreadyActive::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::ObjectAlreadyActive (*this),
+      ::PortableServer::POA::ObjectAlreadyActive (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::ObjectAlreadyActive::_raise ()
+void PortableServer::POA::ObjectAlreadyActive::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5729,21 +7219,68 @@ void PortableServer::POA::ObjectAlreadyActive::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::ObjectAlreadyActive::_type (void) const
+{
+  return ::PortableServer::POA::_tc_ObjectAlreadyActive;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POA_ObjectAlreadyActive[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  55,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f4f), 
+  ACE_NTOHL (0x626a6563), 
+  ACE_NTOHL (0x74416c72), 
+  ACE_NTOHL (0x65616479), 
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76653a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3
+    20,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x6374416c), 
+  ACE_NTOHL (0x72656164), 
+  ACE_NTOHL (0x79416374), 
+  ACE_NTOHL (0x69766500),  // name = ObjectAlreadyActive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_ObjectAlreadyActive),
+    (char *) &_oc_PortableServer_POA_ObjectAlreadyActive,
+    0,
+    sizeof (PortableServer::POA::ObjectAlreadyActive)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive =
+  &_tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0",
+        "IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3",
         "ObjectNotActive"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::ObjectNotActive::~ObjectNotActive (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -5752,7 +7289,6 @@ PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::P
 {
 }
 
-// Assignment operator.
 PortableServer::POA::ObjectNotActive&
 PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
 {
@@ -5760,12 +7296,18 @@ PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::Ob
   return *this;
 }
 
+void PortableServer::POA::ObjectNotActive::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ObjectNotActive *tmp = ACE_static_cast (ObjectNotActive*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::ObjectNotActive *
-PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception *exc)
+PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (ObjectNotActive *, exc);
+      return ACE_dynamic_cast (ObjectNotActive *, _tao_excp);
     }
   else
     {
@@ -5786,13 +7328,13 @@ PortableServer::POA::ObjectNotActive::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::ObjectNotActive (*this),
+      ::PortableServer::POA::ObjectNotActive (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::ObjectNotActive::_raise ()
+void PortableServer::POA::ObjectNotActive::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5813,21 +7355,66 @@ void PortableServer::POA::ObjectNotActive::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::ObjectNotActive::_type (void) const
+{
+  return ::PortableServer::POA::_tc_ObjectNotActive;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POA_ObjectNotActive[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  51,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f4f), 
+  ACE_NTOHL (0x626a6563), 
+  ACE_NTOHL (0x744e6f74), 
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76653a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3
+    16,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744e6f), 
+  ACE_NTOHL (0x74416374), 
+  ACE_NTOHL (0x69766500),  // name = ObjectNotActive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectNotActive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_ObjectNotActive),
+    (char *) &_oc_PortableServer_POA_ObjectNotActive,
+    0,
+    sizeof (PortableServer::POA::ObjectNotActive)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive =
+  &_tc_TAO_tc_PortableServer_POA_ObjectNotActive;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0",
+        "IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3",
         "ServantAlreadyActive"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::ServantAlreadyActive::~ServantAlreadyActive (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -5836,7 +7423,6 @@ PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::Portabl
 {
 }
 
-// Assignment operator.
 PortableServer::POA::ServantAlreadyActive&
 PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
 {
@@ -5844,12 +7430,18 @@ PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::PO
   return *this;
 }
 
+void PortableServer::POA::ServantAlreadyActive::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantAlreadyActive *tmp = ACE_static_cast (ServantAlreadyActive*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::ServantAlreadyActive *
-PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception *exc)
+PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (ServantAlreadyActive *, exc);
+      return ACE_dynamic_cast (ServantAlreadyActive *, _tao_excp);
     }
   else
     {
@@ -5870,13 +7462,13 @@ PortableServer::POA::ServantAlreadyActive::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::ServantAlreadyActive (*this),
+      ::PortableServer::POA::ServantAlreadyActive (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::ServantAlreadyActive::_raise ()
+void PortableServer::POA::ServantAlreadyActive::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5897,21 +7489,69 @@ void PortableServer::POA::ServantAlreadyActive::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::ServantAlreadyActive::_type (void) const
+{
+  return ::PortableServer::POA::_tc_ServantAlreadyActive;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POA_ServantAlreadyActive[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  56,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e74416c), 
+  ACE_NTOHL (0x72656164), 
+  ACE_NTOHL (0x79416374), 
+  ACE_NTOHL (0x6976653a), 
+  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3
+    21,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e7441), 
+  ACE_NTOHL (0x6c726561), 
+  ACE_NTOHL (0x64794163), 
+  ACE_NTOHL (0x74697665), 
+  ACE_NTOHL (0x0),  // name = ServantAlreadyActive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_ServantAlreadyActive),
+    (char *) &_oc_PortableServer_POA_ServantAlreadyActive,
+    0,
+    sizeof (PortableServer::POA::ServantAlreadyActive)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive =
+  &_tc_TAO_tc_PortableServer_POA_ServantAlreadyActive;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::ServantNotActive::ServantNotActive (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/ServantNotActive:1.0",
+        "IDL:omg.org/PortableServer/POA/ServantNotActive:2.3",
         "ServantNotActive"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::ServantNotActive::~ServantNotActive (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer::POA::ServantNotActive &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -5920,7 +7560,6 @@ PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer:
 {
 }
 
-// Assignment operator.
 PortableServer::POA::ServantNotActive&
 PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::ServantNotActive &_tao_excp)
 {
@@ -5928,12 +7567,18 @@ PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::S
   return *this;
 }
 
+void PortableServer::POA::ServantNotActive::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantNotActive *tmp = ACE_static_cast (ServantNotActive*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::ServantNotActive *
-PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception *exc)
+PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (ServantNotActive *, exc);
+      return ACE_dynamic_cast (ServantNotActive *, _tao_excp);
     }
   else
     {
@@ -5954,13 +7599,13 @@ PortableServer::POA::ServantNotActive::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::ServantNotActive (*this),
+      ::PortableServer::POA::ServantNotActive (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::ServantNotActive::_raise ()
+void PortableServer::POA::ServantNotActive::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5981,21 +7626,67 @@ void PortableServer::POA::ServantNotActive::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::ServantNotActive::_type (void) const
+{
+  return ::PortableServer::POA::_tc_ServantNotActive;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POA_ServantNotActive[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  52,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e744e6f), 
+  ACE_NTOHL (0x74416374), 
+  ACE_NTOHL (0x6976653a), 
+  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/ServantNotActive:2.3
+    17,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e744e), 
+  ACE_NTOHL (0x6f744163), 
+  ACE_NTOHL (0x74697665), 
+  ACE_NTOHL (0x0),  // name = ServantNotActive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantNotActive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_ServantNotActive),
+    (char *) &_oc_PortableServer_POA_ServantNotActive,
+    0,
+    sizeof (PortableServer::POA::ServantNotActive)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive =
+  &_tc_TAO_tc_PortableServer_POA_ServantNotActive;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::WrongAdapter::WrongAdapter (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/WrongAdapter:1.0",
+        "IDL:omg.org/PortableServer/POA/WrongAdapter:2.3",
         "WrongAdapter"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::WrongAdapter::~WrongAdapter (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::WrongAdapter &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -6004,7 +7695,6 @@ PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::Wr
 {
 }
 
-// Assignment operator.
 PortableServer::POA::WrongAdapter&
 PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::WrongAdapter &_tao_excp)
 {
@@ -6012,12 +7702,18 @@ PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::Wrong
   return *this;
 }
 
+void PortableServer::POA::WrongAdapter::_tao_any_destructor (void *_tao_void_pointer)
+{
+  WrongAdapter *tmp = ACE_static_cast (WrongAdapter*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::WrongAdapter *
-PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception *exc)
+PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (WrongAdapter *, exc);
+      return ACE_dynamic_cast (WrongAdapter *, _tao_excp);
     }
   else
     {
@@ -6038,13 +7734,13 @@ PortableServer::POA::WrongAdapter::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::WrongAdapter (*this),
+      ::PortableServer::POA::WrongAdapter (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::WrongAdapter::_raise ()
+void PortableServer::POA::WrongAdapter::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -6065,21 +7761,65 @@ void PortableServer::POA::WrongAdapter::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::WrongAdapter::_type (void) const
+{
+  return ::PortableServer::POA::_tc_WrongAdapter;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POA_WrongAdapter[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f57), 
+  ACE_NTOHL (0x726f6e67), 
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465723a), 
+  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/WrongAdapter:2.3
+    13,
+  ACE_NTOHL (0x57726f6e), 
+  ACE_NTOHL (0x67416461), 
+  ACE_NTOHL (0x70746572), 
+  ACE_NTOHL (0x0),  // name = WrongAdapter
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongAdapter (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_WrongAdapter),
+    (char *) &_oc_PortableServer_POA_WrongAdapter,
+    0,
+    sizeof (PortableServer::POA::WrongAdapter)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter =
+  &_tc_TAO_tc_PortableServer_POA_WrongAdapter;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::POA::WrongPolicy::WrongPolicy (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/WrongPolicy:1.0",
+        "IDL:omg.org/PortableServer/POA/WrongPolicy:2.3",
         "WrongPolicy"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::POA::WrongPolicy::~WrongPolicy (void)
 {
 }
 
-// Copy constructor.
 PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::WrongPolicy &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -6088,7 +7828,6 @@ PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::Wron
 {
 }
 
-// Assignment operator.
 PortableServer::POA::WrongPolicy&
 PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongPolicy &_tao_excp)
 {
@@ -6096,12 +7835,18 @@ PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongP
   return *this;
 }
 
+void PortableServer::POA::WrongPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  WrongPolicy *tmp = ACE_static_cast (WrongPolicy*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::POA::WrongPolicy *
-PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception *exc)
+PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (WrongPolicy *, exc);
+      return ACE_dynamic_cast (WrongPolicy *, _tao_excp);
     }
   else
     {
@@ -6122,13 +7867,13 @@ PortableServer::POA::WrongPolicy::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::POA::WrongPolicy (*this),
+      ::PortableServer::POA::WrongPolicy (*this),
       0
     );
   return result;
 }
 
-void PortableServer::POA::WrongPolicy::_raise ()
+void PortableServer::POA::WrongPolicy::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -6149,6 +7894,89 @@ void PortableServer::POA::WrongPolicy::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POA::WrongPolicy::_type (void) const
+{
+  return ::PortableServer::POA::_tc_WrongPolicy;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  47,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f57), 
+  ACE_NTOHL (0x726f6e67), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63793a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/WrongPolicy:2.3
+    12,
+  ACE_NTOHL (0x57726f6e), 
+  ACE_NTOHL (0x67506f6c), 
+  ACE_NTOHL (0x69637900),  // name = WrongPolicy
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongPolicy (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_WrongPolicy),
+    (char *) &_oc_PortableServer_POA_WrongPolicy,
+    0,
+    sizeof (PortableServer::POA::WrongPolicy)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy =
+  &_tc_TAO_tc_PortableServer_POA_WrongPolicy;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_POA[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  35,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f413a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA:2.3
+    4,
+  ACE_NTOHL (0x504f4100),  // name = POA
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_POA),
+    (char *) &_oc_PortableServer_POA,
+    0,
+    sizeof (PortableServer::POA)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_POA,
+    &_tc_TAO_tc_PortableServer_POA
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int PortableServer::Current::_tao_class_id = 0;
 
 PortableServer::Current_ptr
@@ -6194,13 +8022,23 @@ tao_PortableServer_Current_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_PortableServer_Current_marshal (
+    PortableServer::Current_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // PortableServer::Current_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-PortableServer::Current_var::Current_var (void) // default constructor
+PortableServer::Current_var::Current_var (void)
   : ptr_ (Current::_nil ())
 {}
 
@@ -6210,12 +8048,12 @@ PortableServer::Current_var::ptr (void) const
   return this->ptr_;
 }
 
-PortableServer::Current_var::Current_var (const ::PortableServer::Current_var &p) // copy constructor
+PortableServer::Current_var::Current_var (const ::PortableServer::Current_var &p)
   : TAO_Base_var (),
     ptr_ (Current::_duplicate (p.ptr ()))
 {}
 
-PortableServer::Current_var::~Current_var (void) // destructor
+PortableServer::Current_var::~Current_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -6244,7 +8082,7 @@ PortableServer::Current_var::operator const ::PortableServer::Current_ptr &() co
   return this->ptr_;
 }
 
-PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast
+PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -6319,10 +8157,11 @@ PortableServer::Current_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // PortableServer::Current_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 PortableServer::Current_out::Current_out (Current_ptr &p)
@@ -6331,14 +8170,14 @@ PortableServer::Current_out::Current_out (Current_ptr &p)
   this->ptr_ = ::PortableServer::Current::_nil ();
 }
 
-PortableServer::Current_out::Current_out (Current_var &p) // constructor from _var
+PortableServer::Current_out::Current_out (Current_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::PortableServer::Current::_nil ();
 }
 
-PortableServer::Current_out::Current_out (const ::PortableServer::Current_out &p) // copy constructor
+PortableServer::Current_out::Current_out (const ::PortableServer::Current_out &p)
   : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
 {}
 
@@ -6369,7 +8208,7 @@ PortableServer::Current_out::operator ::PortableServer::Current_ptr &() // cast
 }
 
 ::PortableServer::Current_ptr &
-PortableServer::Current_out::ptr (void) // ptr
+PortableServer::Current_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -6380,9 +8219,8 @@ PortableServer::Current_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 PortableServer::Current::Current (void)
 {}
@@ -6390,7 +8228,15 @@ PortableServer::Current::Current (void)
 PortableServer::Current::~Current (void)
 {}
 
-PortableServer::Current_ptr PortableServer::Current::_narrow (
+void 
+PortableServer::Current::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+PortableServer::Current_ptr
+PortableServer::Current::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -6398,62 +8244,82 @@ PortableServer::Current_ptr PortableServer::Current::_narrow (
   return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::Current_ptr
+PortableServer::Current_ptr 
 PortableServer::Current::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return Current::_nil ();
+    {
+      return Current::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Current_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Current::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Current::_tao_class_id
+                )
+            )
         );
 }
 
 PortableServer::Current_ptr
 PortableServer::Current::_duplicate (Current_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *PortableServer::Current::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, Current)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Current::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Current_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::PortableServer, Current)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Current::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Current_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -6462,21 +8328,21 @@ const char* PortableServer::Current::_interface_repository_id (void) const
   return "IDL:omg.org/PortableServer/Current:2.3";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 PortableServer::Current::NoContext::NoContext (void)
   : CORBA::UserException (
-        "IDL:omg.org/PortableServer/Current/NoContext:1.0",
+        "IDL:omg.org/PortableServer/Current/NoContext:2.3",
         "NoContext"
       )
 {
 }
 
-// Destructor - all members are of self managing types.
 PortableServer::Current::NoContext::~NoContext (void)
 {
 }
 
-// Copy constructor.
 PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::NoContext &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -6485,7 +8351,6 @@ PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::
 {
 }
 
-// Assignment operator.
 PortableServer::Current::NoContext&
 PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::NoContext &_tao_excp)
 {
@@ -6493,12 +8358,18 @@ PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::
   return *this;
 }
 
+void PortableServer::Current::NoContext::_tao_any_destructor (void *_tao_void_pointer)
+{
+  NoContext *tmp = ACE_static_cast (NoContext*, _tao_void_pointer);
+  delete tmp;
+}
+
 PortableServer::Current::NoContext *
-PortableServer::Current::NoContext::_downcast (CORBA::Exception *exc)
+PortableServer::Current::NoContext::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:2.3", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (NoContext *, exc);
+      return ACE_dynamic_cast (NoContext *, _tao_excp);
     }
   else
     {
@@ -6519,13 +8390,13 @@ PortableServer::Current::NoContext::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      PortableServer::Current::NoContext (*this),
+      ::PortableServer::Current::NoContext (*this),
       0
     );
   return result;
 }
 
-void PortableServer::Current::NoContext::_raise ()
+void PortableServer::Current::NoContext::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -6546,787 +8417,1582 @@ void PortableServer::Current::NoContext::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::Current::NoContext::_type (void) const
+{
+  return ::PortableServer::Current::_tc_NoContext;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_Current_NoContext[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  49,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f43), 
+  ACE_NTOHL (0x75727265), 
+  ACE_NTOHL (0x6e742f4e), 
+  ACE_NTOHL (0x6f436f6e), 
+  ACE_NTOHL (0x74657874), 
+  ACE_NTOHL (0x3a322e33), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/Current/NoContext:2.3
+    10,
+  ACE_NTOHL (0x4e6f436f), 
+  ACE_NTOHL (0x6e746578), 
+  ACE_NTOHL (0x74000000),  // name = NoContext
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current_NoContext (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_Current_NoContext),
+    (char *) &_oc_PortableServer_Current_NoContext,
+    0,
+    sizeof (PortableServer::Current::NoContext)
+  );
+
+::CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext =
+  &_tc_TAO_tc_PortableServer_Current_NoContext;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableServer_Current[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f43), 
+  ACE_NTOHL (0x75727265), 
+  ACE_NTOHL (0x6e743a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/Current:2.3
+    8,
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_Current),
+    (char *) &_oc_PortableServer_Current,
+    0,
+    sizeof (PortableServer::Current)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Current,
+    &_tc_TAO_tc_PortableServer_Current
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const PortableServer::ObjectId &_tao_elem
-  ) // copying
+    const PortableServer::POAList &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        PortableServer::_tc_ObjectId,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<PortableServer::POAList>::insert_copy (
+      _tao_any,
+      PortableServer::POAList::_tao_any_destructor,
+      PortableServer::_tc_POAList,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::ObjectId *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::POAList *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      PortableServer::_tc_ObjectId,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableServer::ObjectId::_tao_any_destructor
+  TAO::Any_Dual_Impl_T<PortableServer::POAList>::insert (
+      _tao_any,
+      PortableServer::POAList::_tao_any_destructor,
+      PortableServer::_tc_POAList,
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ObjectId *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::POAList *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableServer::ObjectId*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableServer::POAList *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::ObjectId *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::POAList *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::POAList>::extract (
+        _tao_any,
+        PortableServer::POAList::_tao_any_destructor,
+        PortableServer::_tc_POAList,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableServer::ObjectId &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableServer::ObjectId>::insert_copy (
+      _tao_any,
+      PortableServer::ObjectId::_tao_any_destructor,
+      PortableServer::_tc_ObjectId,
+      _tao_elem
+    );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ObjectId *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableServer::ObjectId>::insert (
+      _tao_any,
+      PortableServer::ObjectId::_tao_any_destructor,
+      PortableServer::_tc_ObjectId,
+      _tao_elem
+    );
+}
 
-    if (!result)
-      return 0; // not equivalent
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ObjectId *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const PortableServer::ObjectId *&,
+      _tao_elem
+    );
+}
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const PortableServer::ObjectId*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      PortableServer::ObjectId *tmp;
-      ACE_NEW_RETURN (tmp, PortableServer::ObjectId, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableServer::_tc_ObjectId,
-            1,
-            ACE_static_cast (void *, tmp),
-            PortableServer::ObjectId::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::ObjectId *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::ObjectId>::extract (
+        _tao_any,
+        PortableServer::ObjectId::_tao_any_destructor,
+        PortableServer::_tc_ObjectId,
+        _tao_elem
+      );
 }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableServer::ForwardRequest &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::insert_copy (
+      _tao_any,
+      PortableServer::ForwardRequest::_tao_any_destructor,
       PortableServer::_tc_ForwardRequest,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::ForwardRequest *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ForwardRequest *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::insert (
+      _tao_any,
+      PortableServer::ForwardRequest::_tao_any_destructor,
       PortableServer::_tc_ForwardRequest,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableServer::ForwardRequest::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ForwardRequest *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ForwardRequest *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableServer::ForwardRequest*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableServer::ForwardRequest *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::ForwardRequest *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::ForwardRequest *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::ForwardRequest *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      PortableServer::ForwardRequest *tmp;
-      ACE_NEW_RETURN (tmp, PortableServer::ForwardRequest, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:omg.org/PortableServer/ForwardRequest:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableServer::_tc_ForwardRequest,
-            1,
-            tmp,
-            PortableServer::ForwardRequest::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::extract (
+        _tao_any,
+        PortableServer::ForwardRequest::_tao_any_destructor,
+        PortableServer::_tc_ForwardRequest,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-void operator<<= (CORBA::Any &_tao_any, const PortableServer::NotAGroupObject &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableServer::NotAGroupObject &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>::insert_copy (
+      _tao_any,
+      PortableServer::NotAGroupObject::_tao_any_destructor,
       PortableServer::_tc_NotAGroupObject,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::NotAGroupObject *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::NotAGroupObject *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>::insert (
+      _tao_any,
+      PortableServer::NotAGroupObject::_tao_any_destructor,
       PortableServer::_tc_NotAGroupObject,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableServer::NotAGroupObject::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::NotAGroupObject *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::NotAGroupObject *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableServer::NotAGroupObject*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableServer::NotAGroupObject *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::NotAGroupObject *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::NotAGroupObject *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>::extract (
+        _tao_any,
+        PortableServer::NotAGroupObject::_tao_any_destructor,
+        PortableServer::_tc_NotAGroupObject,
+        _tao_elem
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_NotAGroupObject ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::NotAGroupObject *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      PortableServer::NotAGroupObject *tmp;
-      ACE_NEW_RETURN (tmp, PortableServer::NotAGroupObject, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:omg.org/PortableServer/NotAGroupObject:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableServer::_tc_NotAGroupObject,
-            1,
-            tmp,
-            PortableServer::NotAGroupObject::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const PortableServer::IDs &_tao_elem
-  ) // copying
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        PortableServer::_tc_IDs,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<PortableServer::IDs>::insert_copy (
+      _tao_any,
+      PortableServer::IDs::_tao_any_destructor,
+      PortableServer::_tc_IDs,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::IDs *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IDs *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<PortableServer::IDs>::insert (
+      _tao_any,
+      PortableServer::IDs::_tao_any_destructor,
       PortableServer::_tc_IDs,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      PortableServer::IDs::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IDs *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IDs *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const PortableServer::IDs*&,
+  return _tao_any >>= ACE_const_cast (
+      const PortableServer::IDs *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::IDs *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::IDs *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IDs ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const PortableServer::IDs*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      PortableServer::IDs *tmp;
-      ACE_NEW_RETURN (tmp, PortableServer::IDs, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            PortableServer::_tc_IDs,
-            1,
-            ACE_static_cast (void *, tmp),
-            PortableServer::IDs::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::IDs>::extract (
+        _tao_any,
+        PortableServer::IDs::_tao_any_destructor,
+        PortableServer::_tc_IDs,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::ThreadPolicyValue _tao_elem)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_ThreadPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ThreadPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_ThreadPolicyValue,
+        _tao_elem 
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    if (!result)
-      return 0; // not equivalent
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::ThreadPolicy_ptr _tao_objptr =
+    PortableServer::ThreadPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ThreadPolicy>::insert (
+      _tao_any,
+      PortableServer::ThreadPolicy::_tao_any_destructor,
+      PortableServer::_tc_ThreadPolicy,
+      *_tao_elem
+    );
+}
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ThreadPolicy>::extract (
+        _tao_any,
+        PortableServer::ThreadPolicy::_tao_any_destructor,
+        PortableServer::_tc_ThreadPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ThreadPolicy>::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<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var>
+  template class TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::ThreadPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy, PortableServer::ThreadPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::ThreadPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::LifespanPolicyValue _tao_elem)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_LifespanPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::LifespanPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_LifespanPolicyValue,
+        _tao_elem 
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (!result)
-      return 0; // not equivalent
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::LifespanPolicy_ptr _tao_objptr =
+    PortableServer::LifespanPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::LifespanPolicy>::insert (
+      _tao_any,
+      PortableServer::LifespanPolicy::_tao_any_destructor,
+      PortableServer::_tc_LifespanPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::LifespanPolicy>::extract (
+        _tao_any,
+        PortableServer::LifespanPolicy::_tao_any_destructor,
+        PortableServer::_tc_LifespanPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::LifespanPolicy>::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<PortableServer::LifespanPolicy,PortableServer::LifespanPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::LifespanPolicy,PortableServer::LifespanPolicy_var>
+  template class TAO_Object_Manager<PortableServer::LifespanPolicy,PortableServer::LifespanPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::LifespanPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::LifespanPolicy, PortableServer::LifespanPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::LifespanPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::IdUniquenessPolicyValue _tao_elem)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_IdUniquenessPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdUniquenessPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_IdUniquenessPolicyValue,
+        _tao_elem 
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// 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,
+    PortableServer::IdUniquenessPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::IdUniquenessPolicy_ptr _tao_objptr =
+    PortableServer::IdUniquenessPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
 
-    if (!result)
-      return 0; // not equivalent
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::insert (
+      _tao_any,
+      PortableServer::IdUniquenessPolicy::_tao_any_destructor,
+      PortableServer::_tc_IdUniquenessPolicy,
+      *_tao_elem
+    );
+}
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::extract (
+        _tao_any,
+        PortableServer::IdUniquenessPolicy::_tao_any_destructor,
+        PortableServer::_tc_IdUniquenessPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::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<PortableServer::IdUniquenessPolicy,PortableServer::IdUniquenessPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::IdUniquenessPolicy,PortableServer::IdUniquenessPolicy_var>
+  template class TAO_Object_Manager<PortableServer::IdUniquenessPolicy,PortableServer::IdUniquenessPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::IdUniquenessPolicy, PortableServer::IdUniquenessPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::IdAssignmentPolicyValue _tao_elem)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_IdAssignmentPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdAssignmentPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_IdAssignmentPolicyValue,
+        _tao_elem 
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    if (!result)
-      return 0; // not equivalent
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::IdAssignmentPolicy_ptr _tao_objptr =
+    PortableServer::IdAssignmentPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::insert (
+      _tao_any,
+      PortableServer::IdAssignmentPolicy::_tao_any_destructor,
+      PortableServer::_tc_IdAssignmentPolicy,
+      *_tao_elem
+    );
+}
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::extract (
+        _tao_any,
+        PortableServer::IdAssignmentPolicy::_tao_any_destructor,
+        PortableServer::_tc_IdAssignmentPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::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<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var>
+  template class TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy, PortableServer::IdAssignmentPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::ImplicitActivationPolicyValue _tao_elem)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_ImplicitActivationPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ImplicitActivationPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_ImplicitActivationPolicyValue,
+        _tao_elem 
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (!result)
-      return 0; // not equivalent
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::ImplicitActivationPolicy_ptr _tao_objptr =
+    PortableServer::ImplicitActivationPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::insert (
+      _tao_any,
+      PortableServer::ImplicitActivationPolicy::_tao_any_destructor,
+      PortableServer::_tc_ImplicitActivationPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::extract (
+        _tao_any,
+        PortableServer::ImplicitActivationPolicy::_tao_any_destructor,
+        PortableServer::_tc_ImplicitActivationPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::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<PortableServer::ImplicitActivationPolicy,PortableServer::ImplicitActivationPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::ImplicitActivationPolicy,PortableServer::ImplicitActivationPolicy_var>
+  template class TAO_Object_Manager<PortableServer::ImplicitActivationPolicy,PortableServer::ImplicitActivationPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::ImplicitActivationPolicy, PortableServer::ImplicitActivationPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::ServantRetentionPolicyValue _tao_elem)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_ServantRetentionPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ServantRetentionPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_ServantRetentionPolicyValue,
+        _tao_elem 
+      );
+}
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// 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,
+    PortableServer::ServantRetentionPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::ServantRetentionPolicy_ptr _tao_objptr =
+    PortableServer::ServantRetentionPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
 
-    if (!result)
-      return 0; // not equivalent
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::insert (
+      _tao_any,
+      PortableServer::ServantRetentionPolicy::_tao_any_destructor,
+      PortableServer::_tc_ServantRetentionPolicy,
+      *_tao_elem
+    );
+}
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::extract (
+        _tao_any,
+        PortableServer::ServantRetentionPolicy::_tao_any_destructor,
+        PortableServer::_tc_ServantRetentionPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::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<PortableServer::ServantRetentionPolicy,PortableServer::ServantRetentionPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::ServantRetentionPolicy,PortableServer::ServantRetentionPolicy_var>
+  template class TAO_Object_Manager<PortableServer::ServantRetentionPolicy,PortableServer::ServantRetentionPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::ServantRetentionPolicy, PortableServer::ServantRetentionPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, PortableServer::RequestProcessingPolicyValue _tao_elem)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicyValue _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::insert (
+      _tao_any,
       PortableServer::_tc_RequestProcessingPolicyValue,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::RequestProcessingPolicyValue &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicyValue &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_RequestProcessingPolicyValue,
+        _tao_elem 
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    if (!result)
-      return 0; // not equivalent
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::RequestProcessingPolicy_ptr _tao_objptr =
+    PortableServer::RequestProcessingPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::insert (
+      _tao_any,
+      PortableServer::RequestProcessingPolicy::_tao_any_destructor,
+      PortableServer::_tc_RequestProcessingPolicy,
+      *_tao_elem
+    );
+}
 
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::extract (
+        _tao_any,
+        PortableServer::RequestProcessingPolicy::_tao_any_destructor,
+        PortableServer::_tc_RequestProcessingPolicy,
+        _tao_elem
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::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<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var>
+  template class TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var>;
+  template class TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy, PortableServer::RequestProcessingPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// 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,
+    PortableServer::POAManager_ptr _tao_elem
+  )
+{
+  PortableServer::POAManager_ptr _tao_objptr =
+    PortableServer::POAManager::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::POAManager_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::POAManager>::insert (
+      _tao_any,
+      PortableServer::POAManager::_tao_any_destructor,
+      PortableServer::_tc_POAManager,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::POAManager_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::POAManager>::extract (
+        _tao_any,
+        PortableServer::POAManager::_tao_any_destructor,
+        PortableServer::_tc_POAManager,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POAManager>::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<PortableServer::POAManager,PortableServer::POAManager_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>
+  template class TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>;
+  template class TAO::Any_Impl_T<PortableServer::POAManager>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::POAManager, PortableServer::POAManager_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::POAManager>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// 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,
+    PortableServer::AdapterActivator_ptr _tao_elem
+  )
+{
+  PortableServer::AdapterActivator_ptr _tao_objptr =
+    PortableServer::AdapterActivator::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::AdapterActivator_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::AdapterActivator>::insert (
+      _tao_any,
+      PortableServer::AdapterActivator::_tao_any_destructor,
+      PortableServer::_tc_AdapterActivator,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::AdapterActivator_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::AdapterActivator>::extract (
+        _tao_any,
+        PortableServer::AdapterActivator::_tao_any_destructor,
+        PortableServer::_tc_AdapterActivator,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::AdapterActivator>::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<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>
+  template class TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>;
+  template class TAO::Any_Impl_T<PortableServer::AdapterActivator>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::AdapterActivator, PortableServer::AdapterActivator_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::AdapterActivator>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableServer::ServantManager_ptr _tao_elem
+  )
+{
+  PortableServer::ServantManager_ptr _tao_objptr =
+    PortableServer::ServantManager::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantManager_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ServantManager>::insert (
+      _tao_any,
+      PortableServer::ServantManager::_tao_any_destructor,
+      PortableServer::_tc_ServantManager,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantManager_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ServantManager>::extract (
+        _tao_any,
+        PortableServer::ServantManager::_tao_any_destructor,
+        PortableServer::_tc_ServantManager,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantManager>::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<PortableServer::ServantManager,PortableServer::ServantManager_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::ServantManager,PortableServer::ServantManager_var>
+  template class TAO_Object_Manager<PortableServer::ServantManager,PortableServer::ServantManager_var>;
+  template class TAO::Any_Impl_T<PortableServer::ServantManager>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::ServantManager, PortableServer::ServantManager_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::ServantManager>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableServer::ServantActivator_ptr _tao_elem
+  )
+{
+  PortableServer::ServantActivator_ptr _tao_objptr =
+    PortableServer::ServantActivator::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantActivator_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ServantActivator>::insert (
+      _tao_any,
+      PortableServer::ServantActivator::_tao_any_destructor,
+      PortableServer::_tc_ServantActivator,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantActivator_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ServantActivator>::extract (
+        _tao_any,
+        PortableServer::ServantActivator::_tao_any_destructor,
+        PortableServer::_tc_ServantActivator,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantActivator>::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<PortableServer::ServantActivator,PortableServer::ServantActivator_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::ServantActivator,PortableServer::ServantActivator_var>
+  template class TAO_Object_Manager<PortableServer::ServantActivator,PortableServer::ServantActivator_var>;
+  template class TAO::Any_Impl_T<PortableServer::ServantActivator>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::ServantActivator, PortableServer::ServantActivator_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::ServantActivator>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableServer::ServantLocator_ptr _tao_elem
+  )
+{
+  PortableServer::ServantLocator_ptr _tao_objptr =
+    PortableServer::ServantLocator::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantLocator_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ServantLocator>::insert (
+      _tao_any,
+      PortableServer::ServantLocator::_tao_any_destructor,
+      PortableServer::_tc_ServantLocator,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantLocator_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ServantLocator>::extract (
+        _tao_any,
+        PortableServer::ServantLocator::_tao_any_destructor,
+        PortableServer::_tc_ServantLocator,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantLocator>::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<PortableServer::ServantLocator,PortableServer::ServantLocator_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var>
+  template class TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var>;
+  template class TAO::Any_Impl_T<PortableServer::ServantLocator>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator, PortableServer::ServantLocator_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::ServantLocator>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// 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,
+    PortableServer::POA_ptr _tao_elem
+  )
+{
+  PortableServer::POA_ptr _tao_objptr =
+    PortableServer::POA::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::POA_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::POA>::insert (
+      _tao_any,
+      PortableServer::POA::_tao_any_destructor,
+      PortableServer::_tc_POA,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::POA_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::POA>::extract (
+        _tao_any,
+        PortableServer::POA::_tao_any_destructor,
+        PortableServer::_tc_POA,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POA>::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<PortableServer::POA,PortableServer::POA_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>
+  template class TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>;
+  template class TAO::Any_Impl_T<PortableServer::POA>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::POA>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    PortableServer::Current_ptr _tao_elem
+  )
+{
+  PortableServer::Current_ptr _tao_objptr =
+    PortableServer::Current::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::Current_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::Current>::insert (
+      _tao_any,
+      PortableServer::Current::_tao_any_destructor,
+      PortableServer::_tc_Current,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::Current_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::Current>::extract (
+        _tao_any,
+        PortableServer::Current::_tao_any_destructor,
+        PortableServer::_tc_Current,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::Current>::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<PortableServer::Current,PortableServer::Current_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<PortableServer::Current,PortableServer::Current_var>
+  template class TAO_Object_Manager<PortableServer::Current,PortableServer::Current_var>;
+  template class TAO::Any_Impl_T<PortableServer::Current>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<PortableServer::Current, PortableServer::Current_var>
+# pragma instantiate TAO::Any_Impl_T<PortableServer::Current>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:64
+
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableServer::POAList>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const PortableServer::ObjectId &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (PortableServer::ObjectId *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
+      // Encode all elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (PortableServer::ObjectId *)&_tao_sequence);
+        if (oseq->mb ())
+          return strm.write_octet_array_mb (oseq->mb ());
+        else
+          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+      }
+      
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -7335,93 +10001,316 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),
-    ACE_Message_Block::DONT_DELETE))
     {
-      TAO_ORB_Core* orb_core = strm.orb_core ();
-      if (orb_core != 0 &&
-      strm.orb_core ()->resource_factory ()->
-      input_cdr_allocator_type_locked () == 1)
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      if (ACE_BIT_DISABLED (strm.start ()->flags (),
+      ACE_Message_Block::DONT_DELETE))
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-          ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-        oseq->replace (_tao_seq_len, strm.start ());
-        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-        strm.skip_bytes (_tao_seq_len);
-        return 1;
+        TAO_ORB_Core* orb_core = strm.orb_core ();
+        if (orb_core != 0 &&
+        strm.orb_core ()->resource_factory ()->
+        input_cdr_allocator_type_locked () == 1)
+        {
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+          oseq->replace (_tao_seq_len, strm.start ());
+          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+          strm.skip_bytes (_tao_seq_len);
+          return 1;
+        }
       }
-    }
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  }
-  return 0; // error
+    }
+  
+  return 0;
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const PortableServer::IDs &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+      // Encode all elements.
+      }
+    
+  return 0;
 }
-
-CORBA::Boolean operator>> (
+  
+  CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     PortableServer::IDs &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 1159.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+    // Retrieve all the elements.
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ThreadPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ThreadPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::LifespanPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::LifespanPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POAManager>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POAManager>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::AdapterActivator>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::AdapterActivator>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantManager>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantManager>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantActivator>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantActivator>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantLocator>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantLocator>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POA>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POA>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::Current>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::Current>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
+
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 05bcbcc9a8b..9f48c60d165 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_PORTABLESERVERC_H_
 #define _TAO_IDL_ORIG_PORTABLESERVERC_H_
 
@@ -34,6 +37,7 @@
 #include "tao/Sequence.h"
 #include "tao/Exception.h"
 #include "tao/PolicyC.h"
+#include "tao/OctetSeqC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -65,8 +69,12 @@ class TAO_Local_ServantBase;
 class TAO_DynamicImplementation;
 class TAO_POA;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  PortableServer
 {
+  
   typedef TAO_ServantBase ServantBase;
   typedef TAO_ServantBase_var ServantBase_var;
   typedef TAO_RefCountServantBase RefCountServantBase;
@@ -75,40 +83,45 @@ TAO_NAMESPACE  PortableServer
   typedef TAO_Local_ServantBase LocalServantBase;
   typedef TAO_DynamicImplementation DynamicImplementation;
 
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
+  
   class POA;
 
 #if !defined (_PORTABLESERVER_POA___PTR_CH_)
 #define _PORTABLESERVER_POA___PTR_CH_
-
+  
   typedef POA *POA_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_POA___VAR_CH_)
 #define _PORTABLESERVER_POA___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export POA_var : public TAO_Base_var
   {
   public:
     POA_var (void); // default constructor
-    POA_var (POA_ptr p) : ptr_ (p) {}
+    POA_var (POA_ptr p) : ptr_ (p) {} 
     POA_var (const POA_var &); // copy constructor
     ~POA_var (void); // destructor
-
+    
     POA_var &operator= (POA_ptr);
     POA_var &operator= (const POA_var &);
     POA_ptr operator-> (void) const;
-
+    
     operator const POA_ptr &() const;
     operator POA_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     POA_ptr in (void) const;
     POA_ptr &inout (void);
     POA_ptr &out (void);
     POA_ptr _retn (void);
     POA_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static POA_ptr tao_duplicate (POA_ptr);
@@ -119,7 +132,7 @@ TAO_NAMESPACE  PortableServer
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     POA_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -127,13 +140,14 @@ TAO_NAMESPACE  PortableServer
     POA_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_POA___OUT_CH_)
 #define _PORTABLESERVER_POA___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export POA_out
   {
   public:
@@ -146,25 +160,25 @@ TAO_NAMESPACE  PortableServer
     operator POA_ptr &();
     POA_ptr &ptr (void);
     POA_ptr operator-> (void);
-
+  
   private:
     POA_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_PORTABLESERVER_POALIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CH_
-
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Object_Sequence_PortableServer_POAList
+  
+  class TAO_PortableServer_Export _TAO_Unbounded_Object_Sequence_PortableServer_POAList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Object_Sequence_PortableServer_POAList (void);
     _TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_PortableServer_POAList (
@@ -180,14 +194,14 @@ TAO_NAMESPACE  PortableServer
         const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void);
-
+    
     // = Accessors.
     TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var> operator[] (CORBA::ULong index) const;
-
+    
     // = Static operations.
     static POA **allocbuf (CORBA::ULong nelems);
     static void freebuf (POA **buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -197,7 +211,7 @@ TAO_NAMESPACE  PortableServer
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-
+    
     virtual void _downcast (
         void* target,
         CORBA::Object *src
@@ -208,56 +222,62 @@ TAO_NAMESPACE  PortableServer
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLESERVER_POALIST_CH_)
 #define _PORTABLESERVER_POALIST_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class POAList;
   class POAList_var;
-
+  
   // *************************************************************
-  // POAList
+  // PortableServer::POAList
   // *************************************************************
+  
+  class TAO_PortableServer_Export POAList : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-  class TAO_PortableServer_Export POAList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_PortableServer_POAList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<POA,POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    POAList (void); // default ctor
-    POAList (CORBA::ULong max); // uses max size
+    POAList (void);
+    POAList (CORBA::ULong max);
     POAList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        POA_ptr *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        POA_ptr *buffer, 
         CORBA::Boolean release = 0
       );
-    POAList (const POAList &); // copy ctor
+    POAList (const POAList &);
     ~POAList (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef POAList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
   };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_POALIST___VAR_CH_)
 #define _PORTABLESERVER_POALIST___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class PortableServer::POAList_var
   // *************************************************************
-
+  
   class TAO_PortableServer_Export POAList_var
   {
   public:
@@ -265,37 +285,40 @@ TAO_NAMESPACE  PortableServer
     POAList_var (POAList *);
     POAList_var (const POAList_var &);
     ~POAList_var (void);
-
+    
     POAList_var &operator= (POAList *);
     POAList_var &operator= (const POAList_var &);
     POAList *operator-> (void);
     const POAList *operator-> (void) const;
-
+    
     operator const POAList &() const;
     operator POAList &();
     operator POAList &() const;
-    operator POAList *&(); // variable-size base types only
-
+    
+    // Variable-size base types only.
+    operator POAList *&();
+    
     TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index);
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const POAList &in (void) const;
     POAList &inout (void);
     POAList *&out (void);
     POAList *_retn (void);
     POAList *ptr (void) const;
-
+  
   private:
     POAList *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_POALIST___OUT_CH_)
 #define _PORTABLESERVER_POALIST___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_PortableServer_Export POAList_out
   {
   public:
@@ -308,52 +331,60 @@ TAO_NAMESPACE  PortableServer
     POAList *&ptr (void);
     POAList *operator-> (void);
     TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index);
-
+  
   private:
     POAList *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const POAList_var &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_POAList;
 
 #if !defined (_PORTABLESERVER_OBJECTID_CH_)
 #define _PORTABLESERVER_OBJECTID_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ObjectId;
   class ObjectId_var;
-
+  
   // *************************************************************
-  // ObjectId
+  // PortableServer::ObjectId
   // *************************************************************
+  
+  class TAO_PortableServer_Export ObjectId : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-  class TAO_PortableServer_Export ObjectId : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    ObjectId (void); // default ctor
-    ObjectId (CORBA::ULong max); // uses max size
+    ObjectId (void);
+    ObjectId (CORBA::ULong max);
     ObjectId (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        CORBA::Octet *buffer, 
         CORBA::Boolean release = 0
       );
-    ObjectId (const ObjectId &); // copy ctor
+    ObjectId (const ObjectId &);
     ~ObjectId (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef ObjectId_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     ObjectId (
         CORBA::ULong length,
@@ -361,61 +392,66 @@ TAO_NAMESPACE  PortableServer
       )
       : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-
   };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_OBJECTID___VAR_CH_)
 #define _PORTABLESERVER_OBJECTID___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class PortableServer::ObjectId_var
   // *************************************************************
-
+  
   class TAO_PortableServer_Export ObjectId_var
   {
   public:
     ObjectId_var (void);
     ObjectId_var (ObjectId *);
     ObjectId_var (const ObjectId_var &);
+    
     // Fixed-size base types only.
     ObjectId_var (const ObjectId &);
+    
     ~ObjectId_var (void);
-
+    
     ObjectId_var &operator= (ObjectId *);
     ObjectId_var &operator= (const ObjectId_var &);
+    
     // Fixed-size base types only.
     ObjectId_var &operator= (const ObjectId &);
+    
     ObjectId *operator-> (void);
     const ObjectId *operator-> (void) const;
-
+    
     operator const ObjectId &() const;
     operator ObjectId &();
     operator ObjectId &() const;
-
     CORBA::Octet & operator[] (CORBA::ULong index);
     const CORBA::Octet & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ObjectId &in (void) const;
     ObjectId &inout (void);
     ObjectId *&out (void);
     ObjectId *_retn (void);
     ObjectId *ptr (void) const;
-
+  
   private:
     ObjectId *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_OBJECTID___OUT_CH_)
 #define _PORTABLESERVER_OBJECTID___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_PortableServer_Export ObjectId_out
   {
   public:
@@ -428,36 +464,41 @@ TAO_NAMESPACE  PortableServer
     ObjectId *&ptr (void);
     ObjectId *operator-> (void);
     CORBA::Octet & operator[] (CORBA::ULong index);
-
+  
   private:
     ObjectId *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ObjectId_var &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ObjectId;
-
+  
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
 #define _PORTABLESERVER_FORWARDREQUEST_CH_
-
+  
   class TAO_PortableServer_Export ForwardRequest : public CORBA::UserException
   {
   public:
+    
     CORBA::Object_var forward_reference;
-
     ForwardRequest (void);
     ForwardRequest (const ForwardRequest &);
     ~ForwardRequest (void);
 
     ForwardRequest &operator= (const ForwardRequest &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static ForwardRequest *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -469,43 +510,54 @@ TAO_NAMESPACE  PortableServer
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-        ForwardRequest (
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+    
+    ForwardRequest (
         const CORBA::Object_ptr  _tao_forward_reference
       );
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
-
+  
+  // 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_ForwardRequest;
 
 #endif /* end #if !defined */
-
+  
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_PORTABLESERVER_NOTAGROUPOBJECT_CH_)
 #define _PORTABLESERVER_NOTAGROUPOBJECT_CH_
-
+  
   class TAO_PortableServer_Export NotAGroupObject : public CORBA::UserException
   {
   public:
-
+    
     NotAGroupObject (void);
     NotAGroupObject (const NotAGroupObject &);
     ~NotAGroupObject (void);
 
     NotAGroupObject &operator= (const NotAGroupObject &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static NotAGroupObject *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -517,34 +569,39 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
-
+  
+  // 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_NotAGroupObject;
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CH_
-
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_PortableServer_IDs
+  
+  class TAO_PortableServer_Export _TAO_Unbounded_Sequence_PortableServer_IDs
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_PortableServer_IDs (void);
-    _TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_PortableServer_IDs (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -558,15 +615,15 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_PortableServer_IDs (void);
-
+    
     // = Accessors.
     ObjectId &operator[] (CORBA::ULong i);
     const ObjectId &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static ObjectId *allocbuf (CORBA::ULong size);
     static void freebuf (ObjectId *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -582,56 +639,62 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLESERVER_IDS_CH_)
 #define _PORTABLESERVER_IDS_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class IDs;
   class IDs_var;
-
+  
   // *************************************************************
-  // IDs
+  // PortableServer::IDs
   // *************************************************************
+  
+  class TAO_PortableServer_Export IDs : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-  class TAO_PortableServer_Export IDs : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_PortableServer_IDs
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ObjectId>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    IDs (void); // default ctor
-    IDs (CORBA::ULong max); // uses max size
+    IDs (void);
+    IDs (CORBA::ULong max);
     IDs (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ObjectId *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ObjectId *buffer, 
         CORBA::Boolean release = 0
       );
-    IDs (const IDs &); // copy ctor
+    IDs (const IDs &);
     ~IDs (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef IDs_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
   };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_IDS___VAR_CH_)
 #define _PORTABLESERVER_IDS___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class PortableServer::IDs_var
   // *************************************************************
-
+  
   class TAO_PortableServer_Export IDs_var
   {
   public:
@@ -639,38 +702,41 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     IDs_var (IDs *);
     IDs_var (const IDs_var &);
     ~IDs_var (void);
-
+    
     IDs_var &operator= (IDs *);
     IDs_var &operator= (const IDs_var &);
     IDs *operator-> (void);
     const IDs *operator-> (void) const;
-
+    
     operator const IDs &() const;
     operator IDs &();
     operator IDs &() const;
-    operator IDs *&(); // variable-size base types only
-
+    
+    // Variable-size base types only.
+    operator IDs *&();
+    
     ObjectId & operator[] (CORBA::ULong index);
     const ObjectId & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const IDs &in (void) const;
     IDs &inout (void);
     IDs *&out (void);
     IDs *_retn (void);
     IDs *ptr (void) const;
-
+  
   private:
     IDs *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_IDS___OUT_CH_)
 #define _PORTABLESERVER_IDS___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_PortableServer_Export IDs_out
   {
   public:
@@ -683,79 +749,113 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     IDs *&ptr (void);
     IDs *operator-> (void);
     ObjectId & operator[] (CORBA::ULong index);
-
+  
   private:
     IDs *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const IDs_var &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_IDs;
-
+  
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREAD_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LIFESPAN_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ID_UNIQUENESS_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ID_ASSIGNMENT_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong IMPLICIT_ACTIVATION_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SERVANT_RETENTION_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PROCESSING_POLICY_ID;
-
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong THREAD_POLICY_ID = 16U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong LIFESPAN_POLICY_ID = 17U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong ID_UNIQUENESS_POLICY_ID = 18U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong ID_ASSIGNMENT_POLICY_ID = 19U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong IMPLICIT_ACTIVATION_POLICY_ID = 20U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong SERVANT_RETENTION_POLICY_ID = 21U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong REQUEST_PROCESSING_POLICY_ID = 22U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum ThreadPolicyValue
   {
     ORB_CTRL_MODEL,
     SINGLE_THREAD_MODEL
   };
-
+  
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   typedef ThreadPolicyValue &ThreadPolicyValue_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_ThreadPolicyValue;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLESERVER_THREADPOLICY___PTR_CH_)
 #define _PORTABLESERVER_THREADPOLICY___PTR_CH_
-
+  
   class ThreadPolicy;
   typedef ThreadPolicy *ThreadPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CH_)
 #define _PORTABLESERVER_THREADPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export ThreadPolicy_var : public TAO_Base_var
   {
   public:
     ThreadPolicy_var (void); // default constructor
-    ThreadPolicy_var (ThreadPolicy_ptr p) : ptr_ (p) {}
+    ThreadPolicy_var (ThreadPolicy_ptr p) : ptr_ (p) {} 
     ThreadPolicy_var (const ThreadPolicy_var &); // copy constructor
     ~ThreadPolicy_var (void); // destructor
-
+    
     ThreadPolicy_var &operator= (ThreadPolicy_ptr);
     ThreadPolicy_var &operator= (const ThreadPolicy_var &);
     ThreadPolicy_ptr operator-> (void) const;
-
+    
     operator const ThreadPolicy_ptr &() const;
     operator ThreadPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ThreadPolicy_ptr in (void) const;
     ThreadPolicy_ptr &inout (void);
     ThreadPolicy_ptr &out (void);
     ThreadPolicy_ptr _retn (void);
     ThreadPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ThreadPolicy_ptr tao_duplicate (ThreadPolicy_ptr);
@@ -766,7 +866,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ThreadPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -774,13 +874,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     ThreadPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CH_)
 #define _PORTABLESERVER_THREADPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export ThreadPolicy_out
   {
   public:
@@ -793,117 +894,137 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator ThreadPolicy_ptr &();
     ThreadPolicy_ptr &ptr (void);
     ThreadPolicy_ptr operator-> (void);
-
+  
   private:
     ThreadPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_THREADPOLICY_CH_)
 #define _PORTABLESERVER_THREADPOLICY_CH_
-
+  
   class TAO_PortableServer_Export ThreadPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ThreadPolicy_ptr _ptr_type;
     typedef ThreadPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
-
+    
     static ThreadPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ThreadPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ThreadPolicy_ptr _nil (void)
       {
         return (ThreadPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::ThreadPolicyValue value (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ThreadPolicy (void);
-
     virtual ~ThreadPolicy (void);
-
+    
   private:
     ThreadPolicy (const ThreadPolicy &);
     void operator= (const ThreadPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ThreadPolicy;
+  
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum LifespanPolicyValue
   {
     TRANSIENT,
     PERSISTENT
   };
-
+  
   typedef LifespanPolicyValue &LifespanPolicyValue_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_LifespanPolicyValue;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___PTR_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY___PTR_CH_
-
+  
   class LifespanPolicy;
   typedef LifespanPolicy *LifespanPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export LifespanPolicy_var : public TAO_Base_var
   {
   public:
     LifespanPolicy_var (void); // default constructor
-    LifespanPolicy_var (LifespanPolicy_ptr p) : ptr_ (p) {}
+    LifespanPolicy_var (LifespanPolicy_ptr p) : ptr_ (p) {} 
     LifespanPolicy_var (const LifespanPolicy_var &); // copy constructor
     ~LifespanPolicy_var (void); // destructor
-
+    
     LifespanPolicy_var &operator= (LifespanPolicy_ptr);
     LifespanPolicy_var &operator= (const LifespanPolicy_var &);
     LifespanPolicy_ptr operator-> (void) const;
-
+    
     operator const LifespanPolicy_ptr &() const;
     operator LifespanPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     LifespanPolicy_ptr in (void) const;
     LifespanPolicy_ptr &inout (void);
     LifespanPolicy_ptr &out (void);
     LifespanPolicy_ptr _retn (void);
     LifespanPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static LifespanPolicy_ptr tao_duplicate (LifespanPolicy_ptr);
@@ -914,7 +1035,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     LifespanPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -922,13 +1043,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     LifespanPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___OUT_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export LifespanPolicy_out
   {
   public:
@@ -941,115 +1063,135 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator LifespanPolicy_ptr &();
     LifespanPolicy_ptr &ptr (void);
     LifespanPolicy_ptr operator-> (void);
-
+  
   private:
     LifespanPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY_CH_
-
+  
   class TAO_PortableServer_Export LifespanPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef LifespanPolicy_ptr _ptr_type;
     typedef LifespanPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
-
+    
     static LifespanPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static LifespanPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static LifespanPolicy_ptr _nil (void)
       {
         return (LifespanPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::LifespanPolicyValue value (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     LifespanPolicy (void);
-
     virtual ~LifespanPolicy (void);
-
+    
   private:
     LifespanPolicy (const LifespanPolicy &);
     void operator= (const LifespanPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_LifespanPolicy;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum IdUniquenessPolicyValue
   {
     UNIQUE_ID,
     MULTIPLE_ID
   };
-
+  
   typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_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_IdUniquenessPolicyValue;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_
-
+  
   class IdUniquenessPolicy;
   typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export IdUniquenessPolicy_var : public TAO_Base_var
   {
   public:
     IdUniquenessPolicy_var (void); // default constructor
-    IdUniquenessPolicy_var (IdUniquenessPolicy_ptr p) : ptr_ (p) {}
+    IdUniquenessPolicy_var (IdUniquenessPolicy_ptr p) : ptr_ (p) {} 
     IdUniquenessPolicy_var (const IdUniquenessPolicy_var &); // copy constructor
     ~IdUniquenessPolicy_var (void); // destructor
-
+    
     IdUniquenessPolicy_var &operator= (IdUniquenessPolicy_ptr);
     IdUniquenessPolicy_var &operator= (const IdUniquenessPolicy_var &);
     IdUniquenessPolicy_ptr operator-> (void) const;
-
+    
     operator const IdUniquenessPolicy_ptr &() const;
     operator IdUniquenessPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     IdUniquenessPolicy_ptr in (void) const;
     IdUniquenessPolicy_ptr &inout (void);
     IdUniquenessPolicy_ptr &out (void);
     IdUniquenessPolicy_ptr _retn (void);
     IdUniquenessPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static IdUniquenessPolicy_ptr tao_duplicate (IdUniquenessPolicy_ptr);
@@ -1060,7 +1202,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     IdUniquenessPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1068,13 +1210,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     IdUniquenessPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export IdUniquenessPolicy_out
   {
   public:
@@ -1087,115 +1230,135 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator IdUniquenessPolicy_ptr &();
     IdUniquenessPolicy_ptr &ptr (void);
     IdUniquenessPolicy_ptr operator-> (void);
-
+  
   private:
     IdUniquenessPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_
-
+  
   class TAO_PortableServer_Export IdUniquenessPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IdUniquenessPolicy_ptr _ptr_type;
     typedef IdUniquenessPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
-
+    
     static IdUniquenessPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IdUniquenessPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IdUniquenessPolicy_ptr _nil (void)
       {
         return (IdUniquenessPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::IdUniquenessPolicyValue value (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     IdUniquenessPolicy (void);
-
     virtual ~IdUniquenessPolicy (void);
-
+    
   private:
     IdUniquenessPolicy (const IdUniquenessPolicy &);
     void operator= (const IdUniquenessPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_IdUniquenessPolicy;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum IdAssignmentPolicyValue
   {
     USER_ID,
     SYSTEM_ID
   };
-
+  
   typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_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_IdAssignmentPolicyValue;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_
-
+  
   class IdAssignmentPolicy;
   typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export IdAssignmentPolicy_var : public TAO_Base_var
   {
   public:
     IdAssignmentPolicy_var (void); // default constructor
-    IdAssignmentPolicy_var (IdAssignmentPolicy_ptr p) : ptr_ (p) {}
+    IdAssignmentPolicy_var (IdAssignmentPolicy_ptr p) : ptr_ (p) {} 
     IdAssignmentPolicy_var (const IdAssignmentPolicy_var &); // copy constructor
     ~IdAssignmentPolicy_var (void); // destructor
-
+    
     IdAssignmentPolicy_var &operator= (IdAssignmentPolicy_ptr);
     IdAssignmentPolicy_var &operator= (const IdAssignmentPolicy_var &);
     IdAssignmentPolicy_ptr operator-> (void) const;
-
+    
     operator const IdAssignmentPolicy_ptr &() const;
     operator IdAssignmentPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     IdAssignmentPolicy_ptr in (void) const;
     IdAssignmentPolicy_ptr &inout (void);
     IdAssignmentPolicy_ptr &out (void);
     IdAssignmentPolicy_ptr _retn (void);
     IdAssignmentPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static IdAssignmentPolicy_ptr tao_duplicate (IdAssignmentPolicy_ptr);
@@ -1206,7 +1369,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     IdAssignmentPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1214,13 +1377,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     IdAssignmentPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export IdAssignmentPolicy_out
   {
   public:
@@ -1233,117 +1397,137 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator IdAssignmentPolicy_ptr &();
     IdAssignmentPolicy_ptr &ptr (void);
     IdAssignmentPolicy_ptr operator-> (void);
-
+  
   private:
     IdAssignmentPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_
-
+  
   class TAO_PortableServer_Export IdAssignmentPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IdAssignmentPolicy_ptr _ptr_type;
     typedef IdAssignmentPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
-
+    
     static IdAssignmentPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IdAssignmentPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IdAssignmentPolicy_ptr _nil (void)
       {
         return (IdAssignmentPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::IdAssignmentPolicyValue value (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     IdAssignmentPolicy (void);
-
     virtual ~IdAssignmentPolicy (void);
-
+    
   private:
     IdAssignmentPolicy (const IdAssignmentPolicy &);
     void operator= (const IdAssignmentPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_IdAssignmentPolicy;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum ImplicitActivationPolicyValue
   {
     IMPLICIT_ACTIVATION,
     NO_IMPLICIT_ACTIVATION
   };
-
+  
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_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_ImplicitActivationPolicyValue;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_
-
+  
   class ImplicitActivationPolicy;
   typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export ImplicitActivationPolicy_var : public TAO_Base_var
   {
   public:
     ImplicitActivationPolicy_var (void); // default constructor
-    ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr p) : ptr_ (p) {}
+    ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr p) : ptr_ (p) {} 
     ImplicitActivationPolicy_var (const ImplicitActivationPolicy_var &); // copy constructor
     ~ImplicitActivationPolicy_var (void); // destructor
-
+    
     ImplicitActivationPolicy_var &operator= (ImplicitActivationPolicy_ptr);
     ImplicitActivationPolicy_var &operator= (const ImplicitActivationPolicy_var &);
     ImplicitActivationPolicy_ptr operator-> (void) const;
-
+    
     operator const ImplicitActivationPolicy_ptr &() const;
     operator ImplicitActivationPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ImplicitActivationPolicy_ptr in (void) const;
     ImplicitActivationPolicy_ptr &inout (void);
     ImplicitActivationPolicy_ptr &out (void);
     ImplicitActivationPolicy_ptr _retn (void);
     ImplicitActivationPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ImplicitActivationPolicy_ptr tao_duplicate (ImplicitActivationPolicy_ptr);
@@ -1354,7 +1538,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ImplicitActivationPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1362,13 +1546,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     ImplicitActivationPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export ImplicitActivationPolicy_out
   {
   public:
@@ -1381,119 +1566,139 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator ImplicitActivationPolicy_ptr &();
     ImplicitActivationPolicy_ptr &ptr (void);
     ImplicitActivationPolicy_ptr operator-> (void);
-
+  
   private:
     ImplicitActivationPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_
-
+  
   class TAO_PortableServer_Export ImplicitActivationPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ImplicitActivationPolicy_ptr _ptr_type;
     typedef ImplicitActivationPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
-
+    
     static ImplicitActivationPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ImplicitActivationPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ImplicitActivationPolicy_ptr _nil (void)
       {
         return (ImplicitActivationPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::ImplicitActivationPolicyValue value (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ImplicitActivationPolicy (void);
-
     virtual ~ImplicitActivationPolicy (void);
-
+    
   private:
     ImplicitActivationPolicy (const ImplicitActivationPolicy &);
     void operator= (const ImplicitActivationPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ImplicitActivationPolicy;
+  
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum ServantRetentionPolicyValue
   {
     RETAIN,
     NON_RETAIN
   };
-
+  
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
+ typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_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_ServantRetentionPolicyValue;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_
-
+  
   class ServantRetentionPolicy;
   typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export ServantRetentionPolicy_var : public TAO_Base_var
   {
   public:
     ServantRetentionPolicy_var (void); // default constructor
-    ServantRetentionPolicy_var (ServantRetentionPolicy_ptr p) : ptr_ (p) {}
+    ServantRetentionPolicy_var (ServantRetentionPolicy_ptr p) : ptr_ (p) {} 
     ServantRetentionPolicy_var (const ServantRetentionPolicy_var &); // copy constructor
     ~ServantRetentionPolicy_var (void); // destructor
-
+    
     ServantRetentionPolicy_var &operator= (ServantRetentionPolicy_ptr);
     ServantRetentionPolicy_var &operator= (const ServantRetentionPolicy_var &);
     ServantRetentionPolicy_ptr operator-> (void) const;
-
+    
     operator const ServantRetentionPolicy_ptr &() const;
     operator ServantRetentionPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServantRetentionPolicy_ptr in (void) const;
     ServantRetentionPolicy_ptr &inout (void);
     ServantRetentionPolicy_ptr &out (void);
     ServantRetentionPolicy_ptr _retn (void);
     ServantRetentionPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServantRetentionPolicy_ptr tao_duplicate (ServantRetentionPolicy_ptr);
@@ -1504,7 +1709,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServantRetentionPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1512,13 +1717,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     ServantRetentionPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export ServantRetentionPolicy_out
   {
   public:
@@ -1531,120 +1737,140 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator ServantRetentionPolicy_ptr &();
     ServantRetentionPolicy_ptr &ptr (void);
     ServantRetentionPolicy_ptr operator-> (void);
-
+  
   private:
     ServantRetentionPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
-
+  
   class TAO_PortableServer_Export ServantRetentionPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServantRetentionPolicy_ptr _ptr_type;
     typedef ServantRetentionPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
-
+    
     static ServantRetentionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServantRetentionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServantRetentionPolicy_ptr _nil (void)
       {
         return (ServantRetentionPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::ServantRetentionPolicyValue value (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ServantRetentionPolicy (void);
-
     virtual ~ServantRetentionPolicy (void);
-
+    
   private:
     ServantRetentionPolicy (const ServantRetentionPolicy &);
     void operator= (const ServantRetentionPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ServantRetentionPolicy;
+  
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum RequestProcessingPolicyValue
   {
     USE_ACTIVE_OBJECT_MAP_ONLY,
     USE_DEFAULT_SERVANT,
     USE_SERVANT_MANAGER
   };
-
+  
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_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_RequestProcessingPolicyValue;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_
-
+  
   class RequestProcessingPolicy;
   typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export RequestProcessingPolicy_var : public TAO_Base_var
   {
   public:
     RequestProcessingPolicy_var (void); // default constructor
-    RequestProcessingPolicy_var (RequestProcessingPolicy_ptr p) : ptr_ (p) {}
+    RequestProcessingPolicy_var (RequestProcessingPolicy_ptr p) : ptr_ (p) {} 
     RequestProcessingPolicy_var (const RequestProcessingPolicy_var &); // copy constructor
     ~RequestProcessingPolicy_var (void); // destructor
-
+    
     RequestProcessingPolicy_var &operator= (RequestProcessingPolicy_ptr);
     RequestProcessingPolicy_var &operator= (const RequestProcessingPolicy_var &);
     RequestProcessingPolicy_ptr operator-> (void) const;
-
+    
     operator const RequestProcessingPolicy_ptr &() const;
     operator RequestProcessingPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     RequestProcessingPolicy_ptr in (void) const;
     RequestProcessingPolicy_ptr &inout (void);
     RequestProcessingPolicy_ptr &out (void);
     RequestProcessingPolicy_ptr _retn (void);
     RequestProcessingPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static RequestProcessingPolicy_ptr tao_duplicate (RequestProcessingPolicy_ptr);
@@ -1655,7 +1881,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     RequestProcessingPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1663,13 +1889,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     RequestProcessingPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export RequestProcessingPolicy_out
   {
   public:
@@ -1682,107 +1909,121 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator RequestProcessingPolicy_ptr &();
     RequestProcessingPolicy_ptr &ptr (void);
     RequestProcessingPolicy_ptr operator-> (void);
-
+  
   private:
     RequestProcessingPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
-
+  
   class TAO_PortableServer_Export RequestProcessingPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef RequestProcessingPolicy_ptr _ptr_type;
     typedef RequestProcessingPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
-
+    
     static RequestProcessingPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestProcessingPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestProcessingPolicy_ptr _nil (void)
       {
         return (RequestProcessingPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::RequestProcessingPolicyValue value (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     RequestProcessingPolicy (void);
-
     virtual ~RequestProcessingPolicy (void);
-
+    
   private:
     RequestProcessingPolicy (const RequestProcessingPolicy &);
     void operator= (const RequestProcessingPolicy &);
   };
 
-
 #endif /* end #if !defined */
+  
+  // 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_RequestProcessingPolicy;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_)
 #define _PORTABLESERVER_POAMANAGER___PTR_CH_
-
+  
   class POAManager;
   typedef POAManager *POAManager_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_POAMANAGER___VAR_CH_)
 #define _PORTABLESERVER_POAMANAGER___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export POAManager_var : public TAO_Base_var
   {
   public:
     POAManager_var (void); // default constructor
-    POAManager_var (POAManager_ptr p) : ptr_ (p) {}
+    POAManager_var (POAManager_ptr p) : ptr_ (p) {} 
     POAManager_var (const POAManager_var &); // copy constructor
     ~POAManager_var (void); // destructor
-
+    
     POAManager_var &operator= (POAManager_ptr);
     POAManager_var &operator= (const POAManager_var &);
     POAManager_ptr operator-> (void) const;
-
+    
     operator const POAManager_ptr &() const;
     operator POAManager_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     POAManager_ptr in (void) const;
     POAManager_ptr &inout (void);
     POAManager_ptr &out (void);
     POAManager_ptr _retn (void);
     POAManager_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static POAManager_ptr tao_duplicate (POAManager_ptr);
@@ -1793,7 +2034,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     POAManager_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1801,13 +2042,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     POAManager_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_POAMANAGER___OUT_CH_)
 #define _PORTABLESERVER_POAMANAGER___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export POAManager_out
   {
   public:
@@ -1820,61 +2062,65 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator POAManager_ptr &();
     POAManager_ptr &ptr (void);
     POAManager_ptr operator-> (void);
-
+  
   private:
     POAManager_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_POAMANAGER_CH_)
 #define _PORTABLESERVER_POAMANAGER_CH_
-
+  
   class TAO_PortableServer_Export POAManager
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef POAManager_ptr _ptr_type;
     typedef POAManager_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static POAManager_ptr _duplicate (POAManager_ptr obj);
-
+    
     static POAManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static POAManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static POAManager_ptr _nil (void)
       {
         return (POAManager_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
 #define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
-
+    
     class TAO_PortableServer_Export AdapterInactive : public CORBA::UserException
     {
     public:
-
+      
       AdapterInactive (void);
       AdapterInactive (const AdapterInactive &);
       ~AdapterInactive (void);
 
       AdapterInactive &operator= (const AdapterInactive &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static AdapterInactive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1886,18 +2132,28 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_AdapterInactive;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+    
     enum State
     {
       HOLDING,
@@ -1905,19 +2161,30 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       DISCARDING,
       INACTIVE
     };
-
+    
     typedef State &State_out;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_State;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void activate (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
-
+    
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void hold_requests (
         CORBA::Boolean wait_for_completion
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1926,7 +2193,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void discard_requests (
         CORBA::Boolean wait_for_completion
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1935,7 +2205,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void deactivate (
         CORBA::Boolean etherealize_objects,
         CORBA::Boolean wait_for_completion
@@ -1945,69 +2218,87 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
-
+    
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::POAManager::State get_state (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     POAManager (void);
-
     virtual ~POAManager (void);
-
+    
+    friend class _TAO_POAManager_Remote_Proxy_Impl;
+    friend class _TAO_POAManager_ThruPOA_Proxy_Impl;
+    friend class _TAO_POAManager_Direct_Proxy_Impl;
+  
   private:
     POAManager (const POAManager &);
     void operator= (const POAManager &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_POAManager;
+  
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_
-
+  
   class AdapterActivator;
   typedef AdapterActivator *AdapterActivator_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export AdapterActivator_var : public TAO_Base_var
   {
   public:
     AdapterActivator_var (void); // default constructor
-    AdapterActivator_var (AdapterActivator_ptr p) : ptr_ (p) {}
+    AdapterActivator_var (AdapterActivator_ptr p) : ptr_ (p) {} 
     AdapterActivator_var (const AdapterActivator_var &); // copy constructor
     ~AdapterActivator_var (void); // destructor
-
+    
     AdapterActivator_var &operator= (AdapterActivator_ptr);
     AdapterActivator_var &operator= (const AdapterActivator_var &);
     AdapterActivator_ptr operator-> (void) const;
-
+    
     operator const AdapterActivator_ptr &() const;
     operator AdapterActivator_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     AdapterActivator_ptr in (void) const;
     AdapterActivator_ptr &inout (void);
     AdapterActivator_ptr &out (void);
     AdapterActivator_ptr _retn (void);
     AdapterActivator_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static AdapterActivator_ptr tao_duplicate (AdapterActivator_ptr);
@@ -2018,7 +2309,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     AdapterActivator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2026,13 +2317,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     AdapterActivator_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export AdapterActivator_out
   {
   public:
@@ -2045,47 +2337,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator AdapterActivator_ptr &();
     AdapterActivator_ptr &ptr (void);
     AdapterActivator_ptr operator-> (void);
-
+  
   private:
     AdapterActivator_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR_CH_
-
+  
   class TAO_PortableServer_Export AdapterActivator
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef AdapterActivator_ptr _ptr_type;
     typedef AdapterActivator_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
-
+    
     static AdapterActivator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static AdapterActivator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static AdapterActivator_ptr _nil (void)
       {
         return (AdapterActivator_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean unknown_adapter (
         PortableServer::POA_ptr parent,
         const char * name
@@ -2094,58 +2389,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     AdapterActivator (void);
-
     virtual ~AdapterActivator (void);
-
+    
   private:
     AdapterActivator (const AdapterActivator &);
     void operator= (const AdapterActivator &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_AdapterActivator;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___PTR_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER___PTR_CH_
-
+  
   class ServantManager;
   typedef ServantManager *ServantManager_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export ServantManager_var : public TAO_Base_var
   {
   public:
     ServantManager_var (void); // default constructor
-    ServantManager_var (ServantManager_ptr p) : ptr_ (p) {}
+    ServantManager_var (ServantManager_ptr p) : ptr_ (p) {} 
     ServantManager_var (const ServantManager_var &); // copy constructor
     ~ServantManager_var (void); // destructor
-
+    
     ServantManager_var &operator= (ServantManager_ptr);
     ServantManager_var &operator= (const ServantManager_var &);
     ServantManager_ptr operator-> (void) const;
-
+    
     operator const ServantManager_ptr &() const;
     operator ServantManager_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServantManager_ptr in (void) const;
     ServantManager_ptr &inout (void);
     ServantManager_ptr &out (void);
     ServantManager_ptr _retn (void);
     ServantManager_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServantManager_ptr tao_duplicate (ServantManager_ptr);
@@ -2156,7 +2462,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServantManager_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2164,13 +2470,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     ServantManager_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___OUT_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export ServantManager_out
   {
   public:
@@ -2183,98 +2490,109 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator ServantManager_ptr &();
     ServantManager_ptr &ptr (void);
     ServantManager_ptr operator-> (void);
-
+  
   private:
     ServantManager_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_SERVANTMANAGER_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER_CH_
-
+  
   class TAO_PortableServer_Export ServantManager
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServantManager_ptr _ptr_type;
     typedef ServantManager_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServantManager_ptr _duplicate (ServantManager_ptr obj);
-
+    
     static ServantManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServantManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServantManager_ptr _nil (void)
       {
         return (ServantManager_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
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ServantManager (void);
-
     virtual ~ServantManager (void);
-
+    
   private:
     ServantManager (const ServantManager &);
     void operator= (const ServantManager &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ServantManager;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_
-
+  
   class ServantActivator;
   typedef ServantActivator *ServantActivator_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export ServantActivator_var : public TAO_Base_var
   {
   public:
     ServantActivator_var (void); // default constructor
-    ServantActivator_var (ServantActivator_ptr p) : ptr_ (p) {}
+    ServantActivator_var (ServantActivator_ptr p) : ptr_ (p) {} 
     ServantActivator_var (const ServantActivator_var &); // copy constructor
     ~ServantActivator_var (void); // destructor
-
+    
     ServantActivator_var &operator= (ServantActivator_ptr);
     ServantActivator_var &operator= (const ServantActivator_var &);
     ServantActivator_ptr operator-> (void) const;
-
+    
     operator const ServantActivator_ptr &() const;
     operator ServantActivator_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServantActivator_ptr in (void) const;
     ServantActivator_ptr &inout (void);
     ServantActivator_ptr &out (void);
     ServantActivator_ptr _retn (void);
     ServantActivator_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServantActivator_ptr tao_duplicate (ServantActivator_ptr);
@@ -2285,7 +2603,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServantActivator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2293,13 +2611,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     ServantActivator_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export ServantActivator_out
   {
   public:
@@ -2312,47 +2631,50 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator ServantActivator_ptr &();
     ServantActivator_ptr &ptr (void);
     ServantActivator_ptr operator-> (void);
-
+  
   private:
     ServantActivator_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR_CH_
-
+  
   class TAO_PortableServer_Export ServantActivator
     : public virtual PortableServer::ServantManager
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServantActivator_ptr _ptr_type;
     typedef ServantActivator_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
-
+    
     static ServantActivator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServantActivator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServantActivator_ptr _nil (void)
       {
         return (ServantActivator_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::Servant incarnate (
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter
@@ -2368,7 +2690,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void etherealize (
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter,
@@ -2380,58 +2705,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ServantActivator (void);
-
     virtual ~ServantActivator (void);
-
+    
   private:
     ServantActivator (const ServantActivator &);
     void operator= (const ServantActivator &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ServantActivator;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___PTR_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR___PTR_CH_
-
+  
   class ServantLocator;
   typedef ServantLocator *ServantLocator_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export ServantLocator_var : public TAO_Base_var
   {
   public:
     ServantLocator_var (void); // default constructor
-    ServantLocator_var (ServantLocator_ptr p) : ptr_ (p) {}
+    ServantLocator_var (ServantLocator_ptr p) : ptr_ (p) {} 
     ServantLocator_var (const ServantLocator_var &); // copy constructor
     ~ServantLocator_var (void); // destructor
-
+    
     ServantLocator_var &operator= (ServantLocator_ptr);
     ServantLocator_var &operator= (const ServantLocator_var &);
     ServantLocator_ptr operator-> (void) const;
-
+    
     operator const ServantLocator_ptr &() const;
     operator ServantLocator_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServantLocator_ptr in (void) const;
     ServantLocator_ptr &inout (void);
     ServantLocator_ptr &out (void);
     ServantLocator_ptr _retn (void);
     ServantLocator_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServantLocator_ptr tao_duplicate (ServantLocator_ptr);
@@ -2442,7 +2778,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServantLocator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2450,13 +2786,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     ServantLocator_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___OUT_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export ServantLocator_out
   {
   public:
@@ -2469,50 +2806,52 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator ServantLocator_ptr &();
     ServantLocator_ptr &ptr (void);
     ServantLocator_ptr operator-> (void);
-
+  
   private:
     ServantLocator_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR_CH_
-
+  
   class TAO_PortableServer_Export ServantLocator
     : public virtual PortableServer::ServantManager
   {
   public:
-
     typedef void *Cookie;
 
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServantLocator_ptr _ptr_type;
     typedef ServantLocator_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
-
+    
     static ServantLocator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServantLocator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServantLocator_ptr _nil (void)
       {
         return (ServantLocator_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::Servant preinvoke (
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter,
@@ -2530,7 +2869,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void postinvoke (
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter,
@@ -2542,58 +2884,69 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ServantLocator (void);
-
     virtual ~ServantLocator (void);
-
+    
   private:
     ServantLocator (const ServantLocator &);
     void operator= (const ServantLocator &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ServantLocator;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLESERVER_POA___PTR_CH_)
 #define _PORTABLESERVER_POA___PTR_CH_
-
+  
   class POA;
   typedef POA *POA_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_POA___VAR_CH_)
 #define _PORTABLESERVER_POA___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export POA_var : public TAO_Base_var
   {
   public:
     POA_var (void); // default constructor
-    POA_var (POA_ptr p) : ptr_ (p) {}
+    POA_var (POA_ptr p) : ptr_ (p) {} 
     POA_var (const POA_var &); // copy constructor
     ~POA_var (void); // destructor
-
+    
     POA_var &operator= (POA_ptr);
     POA_var &operator= (const POA_var &);
     POA_ptr operator-> (void) const;
-
+    
     operator const POA_ptr &() const;
     operator POA_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     POA_ptr in (void) const;
     POA_ptr &inout (void);
     POA_ptr &out (void);
     POA_ptr _retn (void);
     POA_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static POA_ptr tao_duplicate (POA_ptr);
@@ -2604,7 +2957,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     POA_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2612,13 +2965,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     POA_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_POA___OUT_CH_)
 #define _PORTABLESERVER_POA___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export POA_out
   {
   public:
@@ -2631,66 +2985,72 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator POA_ptr &();
     POA_ptr &ptr (void);
     POA_ptr operator-> (void);
-
+  
   private:
     POA_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+
 #if !defined (_PORTABLESERVER_POA_CH_)
 #define _PORTABLESERVER_POA_CH_
-
+  
   class TAO_PortableServer_Export POA
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef POA_ptr _ptr_type;
     typedef POA_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static POA_ptr _duplicate (POA_ptr obj);
-
+    
     static POA_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static POA_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static POA_ptr _nil (void)
       {
         return (POA_ptr)0;
       }
-
-    virtual TAO_POA* _tao_poa_downcast(void)
+    
+    virtual TAO_POA* _tao_poa_downcast (void)
       {
         return 0;
       }
 
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
 #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
-
+    
     class TAO_PortableServer_Export AdapterAlreadyExists : public CORBA::UserException
     {
     public:
-
+      
       AdapterAlreadyExists (void);
       AdapterAlreadyExists (const AdapterAlreadyExists &);
       ~AdapterAlreadyExists (void);
 
       AdapterAlreadyExists &operator= (const AdapterAlreadyExists &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static AdapterAlreadyExists *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2702,32 +3062,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_AdapterAlreadyExists;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_)
 #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_
-
+    
     class TAO_PortableServer_Export AdapterNonExistent : public CORBA::UserException
     {
     public:
-
+      
       AdapterNonExistent (void);
       AdapterNonExistent (const AdapterNonExistent &);
       ~AdapterNonExistent (void);
 
       AdapterNonExistent &operator= (const AdapterNonExistent &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static AdapterNonExistent *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2739,33 +3110,44 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_AdapterNonExistent;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_)
 #define _PORTABLESERVER_POA_INVALIDPOLICY_CH_
-
+    
     class TAO_PortableServer_Export InvalidPolicy : public CORBA::UserException
     {
     public:
+      
       CORBA::UShort index;
-
       InvalidPolicy (void);
       InvalidPolicy (const InvalidPolicy &);
       ~InvalidPolicy (void);
 
       InvalidPolicy &operator= (const InvalidPolicy &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static InvalidPolicy *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2777,36 +3159,52 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-            InvalidPolicy (
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+      
+      InvalidPolicy (
           CORBA::UShort _tao_index
         );
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_InvalidPolicy;
 
 #endif /* end #if !defined */
-
+    
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
 #define _PORTABLESERVER_POA_NOSERVANT_CH_
-
+    
     class TAO_PortableServer_Export NoServant : public CORBA::UserException
     {
     public:
-
+      
       NoServant (void);
       NoServant (const NoServant &);
       ~NoServant (void);
 
       NoServant &operator= (const NoServant &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static NoServant *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2818,33 +3216,45 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_NoServant;
 
 #endif /* end #if !defined */
-
+    
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
+
 #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
-
+    
     class TAO_PortableServer_Export ObjectAlreadyActive : public CORBA::UserException
     {
     public:
-
+      
       ObjectAlreadyActive (void);
       ObjectAlreadyActive (const ObjectAlreadyActive &);
       ~ObjectAlreadyActive (void);
 
       ObjectAlreadyActive &operator= (const ObjectAlreadyActive &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static ObjectAlreadyActive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2856,32 +3266,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_ObjectAlreadyActive;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_
-
+    
     class TAO_PortableServer_Export ObjectNotActive : public CORBA::UserException
     {
     public:
-
+      
       ObjectNotActive (void);
       ObjectNotActive (const ObjectNotActive &);
       ~ObjectNotActive (void);
 
       ObjectNotActive &operator= (const ObjectNotActive &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static ObjectNotActive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2893,31 +3314,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_ObjectNotActive;
 
 #endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
-
+    
     class TAO_PortableServer_Export ServantAlreadyActive : public CORBA::UserException
     {
     public:
-
+      
       ServantAlreadyActive (void);
       ServantAlreadyActive (const ServantAlreadyActive &);
       ~ServantAlreadyActive (void);
 
       ServantAlreadyActive &operator= (const ServantAlreadyActive &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static ServantAlreadyActive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2929,32 +3362,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_ServantAlreadyActive;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_
-
+    
     class TAO_PortableServer_Export ServantNotActive : public CORBA::UserException
     {
     public:
-
+      
       ServantNotActive (void);
       ServantNotActive (const ServantNotActive &);
       ~ServantNotActive (void);
 
       ServantNotActive &operator= (const ServantNotActive &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static ServantNotActive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2966,32 +3410,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_ServantNotActive;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_)
 #define _PORTABLESERVER_POA_WRONGADAPTER_CH_
-
+    
     class TAO_PortableServer_Export WrongAdapter : public CORBA::UserException
     {
     public:
-
+      
       WrongAdapter (void);
       WrongAdapter (const WrongAdapter &);
       ~WrongAdapter (void);
 
       WrongAdapter &operator= (const WrongAdapter &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static WrongAdapter *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3003,32 +3458,43 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_WrongAdapter;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_)
 #define _PORTABLESERVER_POA_WRONGPOLICY_CH_
-
+    
     class TAO_PortableServer_Export WrongPolicy : public CORBA::UserException
     {
     public:
-
+      
       WrongPolicy (void);
       WrongPolicy (const WrongPolicy &);
       ~WrongPolicy (void);
 
       WrongPolicy &operator= (const WrongPolicy &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static WrongPolicy *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3040,18 +3506,28 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_WrongPolicy;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::POA_ptr create_POA (
         const char * adapter_name,
         PortableServer::POAManager_ptr a_POAManager,
@@ -3063,7 +3539,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , PortableServer::POA::AdapterAlreadyExists
         , PortableServer::POA::InvalidPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::POA_ptr find_POA (
         const char * adapter_name,
         CORBA::Boolean activate_it
@@ -3073,7 +3552,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
         , PortableServer::POA::AdapterNonExistent
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
         CORBA::Boolean etherealize_objects,
         CORBA::Boolean wait_for_completion
@@ -3082,9 +3564,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
         PortableServer::ThreadPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3092,9 +3577,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy (
         PortableServer::LifespanPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3102,7 +3590,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
         PortableServer::IdUniquenessPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3110,7 +3601,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
         PortableServer::IdAssignmentPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3118,9 +3612,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
         PortableServer::ImplicitActivationPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3128,7 +3625,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
         PortableServer::ServantRetentionPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3136,7 +3636,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
         PortableServer::RequestProcessingPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3144,50 +3647,64 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * the_name (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::POA_ptr the_parent (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::POAList * the_children (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::POAManager_ptr the_POAManager (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
 #if (TAO_HAS_MINIMUM_POA == 0)
-    virtual ::PortableServer::AdapterActivator_ptr the_activator (
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableServer::AdapterActivator_ptr the_activator (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void the_activator (
         PortableServer::AdapterActivator_ptr the_activator
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3195,16 +3712,21 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::ServantManager_ptr get_servant_manager (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_servant_manager (
         PortableServer::ServantManager_ptr imgr
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3213,9 +3735,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::Servant get_servant (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3223,7 +3747,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , PortableServer::POA::NoServant
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void set_servant (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3232,9 +3759,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::ObjectId * activate_object (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3244,7 +3774,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , PortableServer::POA::ServantAlreadyActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void activate_object_with_id (
         const PortableServer::ObjectId & id,
         PortableServer::Servant p_servant
@@ -3256,7 +3789,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , PortableServer::POA::ObjectAlreadyActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void deactivate_object (
         const PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3266,7 +3802,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , PortableServer::POA::ObjectNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr create_reference (
         const char * intf
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3275,7 +3814,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr create_reference_with_id (
         const PortableServer::ObjectId & oid,
         const char * intf
@@ -3285,7 +3827,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::ObjectId * servant_to_id (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3295,7 +3840,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , PortableServer::POA::ServantNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr servant_to_reference (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3305,7 +3853,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , PortableServer::POA::ServantNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::Servant reference_to_servant (
         CORBA::Object_ptr reference
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3316,7 +3867,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , PortableServer::POA::WrongAdapter
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::ObjectId * reference_to_id (
         CORBA::Object_ptr reference
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3326,7 +3880,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , PortableServer::POA::WrongAdapter
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3336,7 +3893,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , PortableServer::POA::ObjectNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr id_to_reference (
         const PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3346,17 +3906,22 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         , PortableServer::POA::ObjectNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::OctetSeq * id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::ObjectId * create_id_for_reference (
         CORBA::Object_ptr the_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3365,7 +3930,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
         , PortableServer::NotAGroupObject
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::IDs * reference_to_ids (
         CORBA::Object_ptr the_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3374,7 +3942,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
         , PortableServer::NotAGroupObject
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void associate_reference_with_id (
         CORBA::Object_ptr ref,
         const PortableServer::ObjectId & oid
@@ -3384,7 +3955,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
         , PortableServer::NotAGroupObject
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void disassociate_reference_with_id (
         CORBA::Object_ptr ref,
         const PortableServer::ObjectId & oid
@@ -3394,60 +3968,71 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         CORBA::SystemException
         , PortableServer::NotAGroupObject
       )) = 0;
-
+    
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     POA (void);
-
     virtual ~POA (void);
-
+    
   private:
     POA (const POA &);
     void operator= (const POA &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_POA;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_PORTABLESERVER_CURRENT___PTR_CH_)
 #define _PORTABLESERVER_CURRENT___PTR_CH_
-
+  
   class Current;
   typedef Current *Current_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_CURRENT___VAR_CH_)
 #define _PORTABLESERVER_CURRENT___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_PortableServer_Export Current_var : public TAO_Base_var
   {
   public:
     Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -3458,7 +4043,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Current_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -3466,13 +4051,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     Current_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_CURRENT___OUT_CH_)
 #define _PORTABLESERVER_CURRENT___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_PortableServer_Export Current_out
   {
   public:
@@ -3485,61 +4071,65 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     operator Current_ptr &();
     Current_ptr &ptr (void);
     Current_ptr operator-> (void);
-
+  
   private:
     Current_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_PORTABLESERVER_CURRENT_CH_)
 #define _PORTABLESERVER_CURRENT_CH_
-
+  
   class TAO_PortableServer_Export Current
     : public virtual CORBA::Current
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_)
 #define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_
-
+    
     class TAO_PortableServer_Export NoContext : public CORBA::UserException
     {
     public:
-
+      
       NoContext (void);
       NoContext (const NoContext &);
       ~NoContext (void);
 
       NoContext &operator= (const NoContext &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static NoContext *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3551,61 +4141,93 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_NoContext;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::POA_ptr get_POA (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableServer::Current::NoContext
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableServer::ObjectId * get_object_id (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableServer::Current::NoContext
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     Current (void);
-
     virtual ~Current (void);
-
+    
   private:
     Current (const Current &);
     void operator= (const Current &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id);
   TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
   TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id);
   TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
 }
 TAO_NAMESPACE_CLOSE // module PortableServer
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POAList &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAList*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAList *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POAList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ObjectId &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated
@@ -3613,6 +4235,9 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
@@ -3622,39 +4247,277 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::NotAGroupObject &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::NotAGroupObject*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::NotAGroupObject *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::NotAGroupObject *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::IDs &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IDs*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IDs *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::IDs *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicy_ptr &);
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr &);
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POAManager::AdapterInactive &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager::AdapterInactive*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::AdapterInactive *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POAManager::AdapterInactive *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager::State);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::State &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::AdapterActivator_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantManager_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantActivator_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::AdapterAlreadyExists*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::AdapterAlreadyExists *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::AdapterNonExistent &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::AdapterNonExistent*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::AdapterNonExistent *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::AdapterNonExistent *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::InvalidPolicy &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::InvalidPolicy*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::InvalidPolicy *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::InvalidPolicy *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::NoServant *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ObjectAlreadyActive*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ObjectAlreadyActive *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ObjectNotActive &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ObjectNotActive*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ObjectNotActive *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ObjectNotActive *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ServantAlreadyActive &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ServantAlreadyActive*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ServantAlreadyActive *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ServantAlreadyActive *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ServantNotActive &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ServantNotActive*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ServantNotActive *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ServantNotActive *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::WrongAdapter &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::WrongAdapter*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::WrongAdapter *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::WrongAdapter *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::WrongPolicy &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::WrongPolicy*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::WrongPolicy *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::WrongPolicy *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::Current::NoContext &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current::NoContext*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current::NoContext *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::Current::NoContext *&);
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_PortableServer_ObjectId_H_
 #define _TAO_CDR_OP_PortableServer_ObjectId_H_
@@ -3672,6 +4535,9 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
 
@@ -3679,9 +4545,14 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::NotAGroupObject &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::NotAGroupObject &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_PortableServer_IDs_H_
 #define _TAO_CDR_OP_PortableServer_IDs_H_
@@ -3697,31 +4568,61 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_PortableServer_IDs_H_ */
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); //
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); //
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); //
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); //
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); //
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); //
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); //
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "PortableServerC.i"
@@ -3737,3 +4638,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i
index d471a191885..384d237e94f 100644
--- a/TAO/tao/PortableServer/PortableServerC.i
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -20,31 +20,39 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// 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_PORTABLESERVER_POALIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_
 
-ACE_INLINE PortableServer::POA **
+ACE_INLINE
+PortableServer::POA **
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (CORBA::ULong nelems)
 {
   PortableServer::POA **buf = 0;
-
+  
   ACE_NEW_RETURN (buf, PortableServer::POA*[nelems], 0);
-
+  
   for (CORBA::ULong i = 0; i < nelems; i++)
     {
       buf[i] = PortableServer::POA::_nil ();
     }
-
+  
   return buf;
 }
 
-ACE_INLINE void
+ACE_INLINE
+void 
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (PortableServer::POA **buffer)
 {
   if (buffer == 0)
-    return;
+    {
+      return;
+    }
+  
   delete[] buffer;
 }
 
@@ -60,137 +68,164 @@ PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbo
 }
 
 ACE_INLINE
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum,
-  CORBA::ULong length,
-  PortableServer::POA* *value,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    PortableServer::POA* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
 ACE_INLINE
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList(const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs)
+PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList(
+    const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    PortableServer::POA **tmp1 = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (this->maximum_);
-    PortableServer::POA ** const tmp2 = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
-
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      {
-        tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
-      }
-
-    this->buffer_ = tmp1;
-  }
+    {
+      PortableServer::POA **tmp1 =
+        _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (this->maximum_);
+      PortableServer::POA ** const tmp2 =
+        ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList &
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator= (const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs)
+ACE_INLINE
+PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList &
+PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator= (
+    const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-  {
-    PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = PortableServer::POA::_nil ();
+      return *this;
     }
-    if (this->maximum_ < rhs.maximum_)
+  
+  if (this->release_)
     {
-      _TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (rhs.maximum_);
+      PortableServer::POA **tmp =
+        ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::release (tmp[i]);
+          tmp[i] = PortableServer::POA::_nil ();
+        }
+      
+      if (this->maximum_ < rhs.maximum_)
+        {
+          _TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (tmp);
+          this->buffer_ = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (rhs.maximum_);
-
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (rhs.maximum_);
+    }
+  
   TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  PortableServer::POA **tmp1 = ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
-  PortableServer::POA ** const tmp2 = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
-
+  
+  PortableServer::POA **tmp1 =
+    ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
+  
+  PortableServer::POA ** const tmp2 =
+    ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
+  
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
       tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
     }
-
+  
   return *this;
 }
 
-ACE_INLINE TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>
+ACE_INLINE
+TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator[] (CORBA::ULong index) const
-// read-write accessor
 {
   ACE_ASSERT (index < this->maximum_);
-  PortableServer::POA ** const tmp = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
+  PortableServer::POA ** const tmp =
+    ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
   return TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var> (tmp + index, this->release_);
 }
 
-ACE_INLINE PortableServer::POA* *
+ACE_INLINE
+PortableServer::POA* *
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (CORBA::Boolean orphan)
 {
   PortableServer::POA **result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (this->maximum_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (this->maximum_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(PortableServer::POA**,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(PortableServer::POA**,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const PortableServer::POA* *
+ACE_INLINE
+const PortableServer::POA* *
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLESERVER_POALIST_CI_)
 #define _PORTABLESERVER_POALIST_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class PortableServer::POAList_var
 // *************************************************************
 
 ACE_INLINE
-PortableServer::POAList_var::POAList_var (void) // default constructor
+PortableServer::POAList_var::POAList_var (void)
   : ptr_ (0)
 {}
 
@@ -200,21 +235,26 @@ PortableServer::POAList_var::POAList_var (POAList *p)
 {}
 
 ACE_INLINE
-PortableServer::POAList_var::POAList_var (const ::PortableServer::POAList_var &p) // copy constructor
+PortableServer::POAList_var::POAList_var (const ::PortableServer::POAList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::PortableServer::POAList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::PortableServer::POAList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-PortableServer::POAList_var::~POAList_var (void) // destructor
+PortableServer::POAList_var::~POAList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE PortableServer::POAList_var &
+ACE_INLINE
+PortableServer::POAList_var &
 PortableServer::POAList_var::operator= (POAList *p)
 {
   delete this->ptr_;
@@ -222,7 +262,8 @@ PortableServer::POAList_var::operator= (POAList *p)
   return *this;
 }
 
-ACE_INLINE ::PortableServer::POAList_var &
+ACE_INLINE
+::PortableServer::POAList_var &
 PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
 {
   if (this != &p)
@@ -234,9 +275,13 @@ PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
         }
       else
         {
-          POAList *deep_copy =
-            new POAList (*p.ptr_);
-
+          POAList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              POAList (*p.ptr_),
+              *this
+            );
+          
           if (deep_copy != 0)
             {
               POAList *tmp = deep_copy;
@@ -246,17 +291,19 @@ PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
             }
         }
     }
-
+  
   return *this;
 }
 
-ACE_INLINE const ::PortableServer::POAList *
+ACE_INLINE
+const ::PortableServer::POAList *
 PortableServer::POAList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::POAList *
+ACE_INLINE
+::PortableServer::POAList *
 PortableServer::POAList_var::operator-> (void)
 {
   return this->ptr_;
@@ -269,44 +316,47 @@ PortableServer::POAList_var::operator const ::PortableServer::POAList &() const
 }
 
 ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast
+PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast
+PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast
+PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var>
+ACE_INLINE
+TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var>
 PortableServer::POAList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::PortableServer::POAList &
+ACE_INLINE
+const ::PortableServer::POAList &
 PortableServer::POAList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::POAList &
+ACE_INLINE
+::PortableServer::POAList &
 PortableServer::POAList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE ::PortableServer::POAList *&
+ACE_INLINE
+::PortableServer::POAList *&
 PortableServer::POAList_var::out (void)
 {
   delete this->ptr_;
@@ -314,7 +364,8 @@ PortableServer::POAList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::POAList *
+ACE_INLINE
+::PortableServer::POAList *
 PortableServer::POAList_var::_retn (void)
 {
   ::PortableServer::POAList *tmp = this->ptr_;
@@ -322,12 +373,16 @@ PortableServer::POAList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::PortableServer::POAList *
+ACE_INLINE
+::PortableServer::POAList *
 PortableServer::POAList_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 PortableServer::POAList_out
 // *************************************************************
@@ -340,7 +395,7 @@ PortableServer::POAList_out::POAList_out (POAList *&p)
 }
 
 ACE_INLINE
-PortableServer::POAList_out::POAList_out (POAList_var &p) // constructor from _var
+PortableServer::POAList_out::POAList_out (POAList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -348,18 +403,20 @@ PortableServer::POAList_out::POAList_out (POAList_var &p) // constructor from _v
 }
 
 ACE_INLINE
-PortableServer::POAList_out::POAList_out (const ::PortableServer::POAList_out &p) // copy constructor
+PortableServer::POAList_out::POAList_out (const ::PortableServer::POAList_out &p)
   : ptr_ (ACE_const_cast (POAList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::PortableServer::POAList_out &
+ACE_INLINE
+::PortableServer::POAList_out &
 PortableServer::POAList_out::operator= (const ::PortableServer::POAList_out &p)
 {
   this->ptr_ = ACE_const_cast (POAList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::PortableServer::POAList_out &
+ACE_INLINE
+::PortableServer::POAList_out &
 PortableServer::POAList_out::operator= (POAList *p)
 {
   this->ptr_ = p;
@@ -372,37 +429,41 @@ PortableServer::POAList_out::operator ::PortableServer::POAList *&() // cast
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::POAList *&
+ACE_INLINE
+::PortableServer::POAList *&
 PortableServer::POAList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::POAList *
+ACE_INLINE
+::PortableServer::POAList *
 PortableServer::POAList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var>
+ACE_INLINE
+TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var>
 PortableServer::POAList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_PORTABLESERVER_OBJECTID_CI_)
 #define _PORTABLESERVER_OBJECTID_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class PortableServer::ObjectId_var
 // *************************************************************
 
 ACE_INLINE
-PortableServer::ObjectId_var::ObjectId_var (void) // default constructor
+PortableServer::ObjectId_var::ObjectId_var (void)
   : ptr_ (0)
 {}
 
@@ -412,15 +473,19 @@ PortableServer::ObjectId_var::ObjectId_var (ObjectId *p)
 {}
 
 ACE_INLINE
-PortableServer::ObjectId_var::ObjectId_var (const ::PortableServer::ObjectId_var &p) // copy constructor
+PortableServer::ObjectId_var::ObjectId_var (const ::PortableServer::ObjectId_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::PortableServer::ObjectId (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::PortableServer::ObjectId (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size base types only
+// Fixed-size base types only.
 ACE_INLINE
 PortableServer::ObjectId_var::ObjectId_var (const ::PortableServer::ObjectId &p)
 {
@@ -428,12 +493,13 @@ PortableServer::ObjectId_var::ObjectId_var (const ::PortableServer::ObjectId &p)
 }
 
 ACE_INLINE
-PortableServer::ObjectId_var::~ObjectId_var (void) // destructor
+PortableServer::ObjectId_var::~ObjectId_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE PortableServer::ObjectId_var &
+ACE_INLINE
+PortableServer::ObjectId_var &
 PortableServer::ObjectId_var::operator= (ObjectId *p)
 {
   delete this->ptr_;
@@ -441,7 +507,8 @@ PortableServer::ObjectId_var::operator= (ObjectId *p)
   return *this;
 }
 
-ACE_INLINE ::PortableServer::ObjectId_var &
+ACE_INLINE
+::PortableServer::ObjectId_var &
 PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p)
 {
   if (this != &p)
@@ -453,9 +520,13 @@ PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p
         }
       else
         {
-          ObjectId *deep_copy =
-            new ObjectId (*p.ptr_);
-
+          ObjectId *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ObjectId (*p.ptr_),
+              *this
+            );
+          
           if (deep_copy != 0)
             {
               ObjectId *tmp = deep_copy;
@@ -465,29 +536,33 @@ PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p
             }
         }
     }
-
+  
   return *this;
 }
 
-// fixed-size types only
-ACE_INLINE ::PortableServer::ObjectId_var &
+// Fixed-size types only.
+ACE_INLINE
+::PortableServer::ObjectId_var &
 PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId &p)
 {
   if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::PortableServer::ObjectId (p), *this);
-  }
+    {
+      delete this->ptr_;
+      ACE_NEW_RETURN (this->ptr_, ::PortableServer::ObjectId (p), *this);
+    }
+  
   return *this;
 }
 
-ACE_INLINE const ::PortableServer::ObjectId *
+ACE_INLINE
+const ::PortableServer::ObjectId *
 PortableServer::ObjectId_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::ObjectId *
+ACE_INLINE
+::PortableServer::ObjectId *
 PortableServer::ObjectId_var::operator-> (void)
 {
   return this->ptr_;
@@ -500,43 +575,47 @@ PortableServer::ObjectId_var::operator const ::PortableServer::ObjectId &() cons
 }
 
 ACE_INLINE
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast
+PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast
+PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA::Octet &
+ACE_INLINE
+CORBA::Octet &
 PortableServer::ObjectId_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::Octet &
+ACE_INLINE
+const CORBA::Octet &
 PortableServer::ObjectId_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::PortableServer::ObjectId &
+ACE_INLINE
+const ::PortableServer::ObjectId &
 PortableServer::ObjectId_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::ObjectId &
+ACE_INLINE
+::PortableServer::ObjectId &
 PortableServer::ObjectId_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE ::PortableServer::ObjectId *&
+ACE_INLINE
+::PortableServer::ObjectId *&
 PortableServer::ObjectId_var::out (void)
 {
   delete this->ptr_;
@@ -544,7 +623,8 @@ PortableServer::ObjectId_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::ObjectId *
+ACE_INLINE
+::PortableServer::ObjectId *
 PortableServer::ObjectId_var::_retn (void)
 {
   ::PortableServer::ObjectId *tmp = this->ptr_;
@@ -552,12 +632,16 @@ PortableServer::ObjectId_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::PortableServer::ObjectId *
+ACE_INLINE
+::PortableServer::ObjectId *
 PortableServer::ObjectId_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 PortableServer::ObjectId_out
 // *************************************************************
@@ -570,7 +654,7 @@ PortableServer::ObjectId_out::ObjectId_out (ObjectId *&p)
 }
 
 ACE_INLINE
-PortableServer::ObjectId_out::ObjectId_out (ObjectId_var &p) // constructor from _var
+PortableServer::ObjectId_out::ObjectId_out (ObjectId_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -578,18 +662,20 @@ PortableServer::ObjectId_out::ObjectId_out (ObjectId_var &p) // constructor from
 }
 
 ACE_INLINE
-PortableServer::ObjectId_out::ObjectId_out (const ::PortableServer::ObjectId_out &p) // copy constructor
+PortableServer::ObjectId_out::ObjectId_out (const ::PortableServer::ObjectId_out &p)
   : ptr_ (ACE_const_cast (ObjectId_out&, p).ptr_)
 {}
 
-ACE_INLINE ::PortableServer::ObjectId_out &
+ACE_INLINE
+::PortableServer::ObjectId_out &
 PortableServer::ObjectId_out::operator= (const ::PortableServer::ObjectId_out &p)
 {
   this->ptr_ = ACE_const_cast (ObjectId_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::PortableServer::ObjectId_out &
+ACE_INLINE
+::PortableServer::ObjectId_out &
 PortableServer::ObjectId_out::operator= (ObjectId *p)
 {
   this->ptr_ = p;
@@ -602,223 +688,256 @@ PortableServer::ObjectId_out::operator ::PortableServer::ObjectId *&() // cast
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::ObjectId *&
+ACE_INLINE
+::PortableServer::ObjectId *&
 PortableServer::ObjectId_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::ObjectId *
+ACE_INLINE
+::PortableServer::ObjectId *
 PortableServer::ObjectId_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Octet &
+ACE_INLINE
+CORBA::Octet &
 PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception PortableServer::ForwardRequest
-// *************************************************************
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// *************************************************************
-// Inline operations for exception PortableServer::NotAGroupObject
-// *************************************************************
-
+// 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_PORTABLESERVER_IDS_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CI_
 
-// = Static operations.
-ACE_INLINE PortableServer::ObjectId *
+ACE_INLINE
+PortableServer::ObjectId *
 PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   PortableServer::ObjectId *retval = 0;
   ACE_NEW_RETURN (retval, PortableServer::ObjectId[size], 0);
   return retval;
 }
 
-ACE_INLINE void PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (PortableServer::ObjectId *buffer)
-// Free the sequence.
+ACE_INLINE
+void PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (PortableServer::ObjectId *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (void) // Default constructor.
+PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (void)
 {
 }
 
 ACE_INLINE
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum) // Constructor using a maximum length value.
+PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum,
-  CORBA::ULong length,
-  PortableServer::ObjectId *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    PortableServer::ObjectId *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs)
-// Copy constructor.
+PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (
+    const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    PortableServer::ObjectId *tmp1 = _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (this->maximum_);
-    PortableServer::ObjectId * const tmp2 = ACE_reinterpret_cast (PortableServer::ObjectId * ACE_CAST_CONST, rhs.buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-
-    this->buffer_ = tmp1;
-  }
+    {
+      PortableServer::ObjectId *tmp1 =
+        _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (this->maximum_);
+      PortableServer::ObjectId * const tmp2 =
+        ACE_reinterpret_cast (PortableServer::ObjectId * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs &
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator= (const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs)
-// Assignment operator.
+ACE_INLINE
+PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs &
+PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator= (
+    const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
-
+    {
+      return *this;
+    }
+  
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      PortableServer::ObjectId *tmp = ACE_reinterpret_cast (PortableServer::ObjectId *, this->buffer_);
-      _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          PortableServer::ObjectId *tmp =
+            ACE_reinterpret_cast (PortableServer::ObjectId *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (rhs.maximum_);
-
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (rhs.maximum_);
+    }
+  
   TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  PortableServer::ObjectId *tmp1 = ACE_reinterpret_cast (PortableServer::ObjectId *, this->buffer_);
-  PortableServer::ObjectId * const tmp2 = ACE_reinterpret_cast (PortableServer::ObjectId * ACE_CAST_CONST, rhs.buffer_);
-
+  
+  PortableServer::ObjectId *tmp1 =
+    ACE_reinterpret_cast (PortableServer::ObjectId *, this->buffer_);
+  PortableServer::ObjectId * const tmp2 =
+    ACE_reinterpret_cast (PortableServer::ObjectId * ACE_CAST_CONST, rhs.buffer_);
+  
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
+    {
+      tmp1[i] = tmp2[i];
+    }
+  
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE PortableServer::ObjectId &
+ACE_INLINE
+PortableServer::ObjectId &
 PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  PortableServer::ObjectId* tmp = ACE_reinterpret_cast(PortableServer::ObjectId*,this->buffer_);
+  PortableServer::ObjectId* tmp =
+    ACE_reinterpret_cast (PortableServer::ObjectId*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const PortableServer::ObjectId &
+ACE_INLINE
+const PortableServer::ObjectId &
 PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  PortableServer::ObjectId * const tmp = ACE_reinterpret_cast (PortableServer::ObjectId* ACE_CAST_CONST, this->buffer_);
+  PortableServer::ObjectId * const tmp =
+    ACE_reinterpret_cast (PortableServer::ObjectId* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE PortableServer::ObjectId *
+ACE_INLINE
+PortableServer::ObjectId *
 PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::get_buffer (CORBA::Boolean orphan)
 {
   PortableServer::ObjectId *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (PortableServer::ObjectId*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (PortableServer::ObjectId*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(PortableServer::ObjectId*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(PortableServer::ObjectId*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const PortableServer::ObjectId *
+ACE_INLINE
+const PortableServer::ObjectId *
 PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const PortableServer::ObjectId * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const PortableServer::ObjectId * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::replace (CORBA::ULong max,
-CORBA::ULong length,
-PortableServer::ObjectId *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    PortableServer::ObjectId *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    PortableServer::ObjectId *tmp = ACE_reinterpret_cast(PortableServer::ObjectId*,this->buffer_);
-    _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (tmp);
-  }
+    {
+      PortableServer::ObjectId *tmp =
+        ACE_reinterpret_cast (PortableServer::ObjectId*, this->buffer_);
+      _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLESERVER_IDS_CI_)
 #define _PORTABLESERVER_IDS_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class PortableServer::IDs_var
 // *************************************************************
 
 ACE_INLINE
-PortableServer::IDs_var::IDs_var (void) // default constructor
+PortableServer::IDs_var::IDs_var (void)
   : ptr_ (0)
 {}
 
@@ -828,21 +947,26 @@ PortableServer::IDs_var::IDs_var (IDs *p)
 {}
 
 ACE_INLINE
-PortableServer::IDs_var::IDs_var (const ::PortableServer::IDs_var &p) // copy constructor
+PortableServer::IDs_var::IDs_var (const ::PortableServer::IDs_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::PortableServer::IDs (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::PortableServer::IDs (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-PortableServer::IDs_var::~IDs_var (void) // destructor
+PortableServer::IDs_var::~IDs_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE PortableServer::IDs_var &
+ACE_INLINE
+PortableServer::IDs_var &
 PortableServer::IDs_var::operator= (IDs *p)
 {
   delete this->ptr_;
@@ -850,7 +974,8 @@ PortableServer::IDs_var::operator= (IDs *p)
   return *this;
 }
 
-ACE_INLINE ::PortableServer::IDs_var &
+ACE_INLINE
+::PortableServer::IDs_var &
 PortableServer::IDs_var::operator= (const ::PortableServer::IDs_var &p)
 {
   if (this != &p)
@@ -862,9 +987,13 @@ PortableServer::IDs_var::operator= (const ::PortableServer::IDs_var &p)
         }
       else
         {
-          IDs *deep_copy =
-            new IDs (*p.ptr_);
-
+          IDs *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              IDs (*p.ptr_),
+              *this
+            );
+          
           if (deep_copy != 0)
             {
               IDs *tmp = deep_copy;
@@ -874,17 +1003,19 @@ PortableServer::IDs_var::operator= (const ::PortableServer::IDs_var &p)
             }
         }
     }
-
+  
   return *this;
 }
 
-ACE_INLINE const ::PortableServer::IDs *
+ACE_INLINE
+const ::PortableServer::IDs *
 PortableServer::IDs_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::IDs *
+ACE_INLINE
+::PortableServer::IDs *
 PortableServer::IDs_var::operator-> (void)
 {
   return this->ptr_;
@@ -897,50 +1028,54 @@ PortableServer::IDs_var::operator const ::PortableServer::IDs &() const // cast
 }
 
 ACE_INLINE
-PortableServer::IDs_var::operator ::PortableServer::IDs &() // cast
+PortableServer::IDs_var::operator ::PortableServer::IDs &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-PortableServer::IDs_var::operator ::PortableServer::IDs &() const // cast
+PortableServer::IDs_var::operator ::PortableServer::IDs &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
-PortableServer::IDs_var::operator ::PortableServer::IDs *&() // cast
+PortableServer::IDs_var::operator ::PortableServer::IDs *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE PortableServer::ObjectId &
+ACE_INLINE
+PortableServer::ObjectId &
 PortableServer::IDs_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const PortableServer::ObjectId &
+ACE_INLINE
+const PortableServer::ObjectId &
 PortableServer::IDs_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const PortableServer::ObjectId &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::PortableServer::IDs &
+ACE_INLINE
+const ::PortableServer::IDs &
 PortableServer::IDs_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::IDs &
+ACE_INLINE
+::PortableServer::IDs &
 PortableServer::IDs_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE ::PortableServer::IDs *&
+ACE_INLINE
+::PortableServer::IDs *&
 PortableServer::IDs_var::out (void)
 {
   delete this->ptr_;
@@ -948,7 +1083,8 @@ PortableServer::IDs_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::IDs *
+ACE_INLINE
+::PortableServer::IDs *
 PortableServer::IDs_var::_retn (void)
 {
   ::PortableServer::IDs *tmp = this->ptr_;
@@ -956,12 +1092,16 @@ PortableServer::IDs_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::PortableServer::IDs *
+ACE_INLINE
+::PortableServer::IDs *
 PortableServer::IDs_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 PortableServer::IDs_out
 // *************************************************************
@@ -974,7 +1114,7 @@ PortableServer::IDs_out::IDs_out (IDs *&p)
 }
 
 ACE_INLINE
-PortableServer::IDs_out::IDs_out (IDs_var &p) // constructor from _var
+PortableServer::IDs_out::IDs_out (IDs_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -982,18 +1122,20 @@ PortableServer::IDs_out::IDs_out (IDs_var &p) // constructor from _var
 }
 
 ACE_INLINE
-PortableServer::IDs_out::IDs_out (const ::PortableServer::IDs_out &p) // copy constructor
+PortableServer::IDs_out::IDs_out (const ::PortableServer::IDs_out &p)
   : ptr_ (ACE_const_cast (IDs_out&, p).ptr_)
 {}
 
-ACE_INLINE ::PortableServer::IDs_out &
+ACE_INLINE
+::PortableServer::IDs_out &
 PortableServer::IDs_out::operator= (const ::PortableServer::IDs_out &p)
 {
   this->ptr_ = ACE_const_cast (IDs_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::PortableServer::IDs_out &
+ACE_INLINE
+::PortableServer::IDs_out &
 PortableServer::IDs_out::operator= (IDs *p)
 {
   this->ptr_ = p;
@@ -1006,183 +1148,243 @@ PortableServer::IDs_out::operator ::PortableServer::IDs *&() // cast
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::IDs *&
+ACE_INLINE
+::PortableServer::IDs *&
 PortableServer::IDs_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::PortableServer::IDs *
+ACE_INLINE
+::PortableServer::IDs *
 PortableServer::IDs_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE PortableServer::ObjectId &
+ACE_INLINE
+PortableServer::ObjectId &
 PortableServer::IDs_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-
-#if (TAO_HAS_MINIMUM_POA == 0)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_THREADPOLICY___CI_)
 #define _PORTABLESERVER_THREADPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::ThreadPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___CI_)
 #define _PORTABLESERVER_LIFESPANPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::LifespanPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___CI_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::IdUniquenessPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___CI_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::IdAssignmentPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-
-#if (TAO_HAS_MINIMUM_POA == 0)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::ImplicitActivationPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::ServantRetentionPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// *************************************************************
-// Inline operations for exception PortableServer::POAManager::AdapterInactive
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_POAMANAGER___CI_)
 #define _PORTABLESERVER_POAMANAGER___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::POAManager::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___CI_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::AdapterActivator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___CI_)
 #define _PORTABLESERVER_SERVANTMANAGER___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::ServantManager::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___CI_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::ServantActivator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___CI_)
 #define _PORTABLESERVER_SERVANTLOCATOR___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::ServantLocator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-// *************************************************************
-// Inline operations for exception PortableServer::POA::AdapterAlreadyExists
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::AdapterNonExistent
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::InvalidPolicy
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::NoServant
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::ObjectAlreadyActive
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::ObjectNotActive
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::ServantAlreadyActive
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::ServantNotActive
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::WrongAdapter
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception PortableServer::POA::WrongPolicy
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_POA___CI_)
 #define _PORTABLESERVER_POA___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::POA::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception PortableServer::Current::NoContext
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_CURRENT___CI_)
 #define _PORTABLESERVER_CURRENT___CI_
 
+ACE_INLINE
+CORBA::Boolean
+PortableServer::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_PortableServer_ObjectId_I_
 #define _TAO_CDR_OP_PortableServer_ObjectId_I_
@@ -1191,6 +1393,7 @@ CORBA::Boolean TAO_PortableServer_Export operator<< (
     TAO_OutputCDR &,
     const PortableServer::ObjectId &
   );
+
 CORBA::Boolean TAO_PortableServer_Export operator>> (
     TAO_InputCDR &,
     PortableServer::ObjectId &
@@ -1200,52 +1403,90 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const PortableServer::ForwardRequest &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-  {
-    // now marshal the members (if any)
-    if (
-      (strm << _tao_aggregate.forward_reference.in ())
-    )
-      return 1;
-    else
-      return 0;
-  }
+    {
+      // Now marshal the members (if any).
+      if (
+        (strm << _tao_aggregate.forward_reference.in ())
+       )
+        {
+          return 1;
+        }
+      else
+        {
+          return 0;
+        }
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableServer::ForwardRequest &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    PortableServer::ForwardRequest &_tao_aggregate
+  )
 {
-  // now marshal the members
+  // Demarshal the members.
   if (
     (strm >> _tao_aggregate.forward_reference.out ())
   )
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::NotAGroupObject &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const PortableServer::NotAGroupObject &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,PortableServer::NotAGroupObject&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    PortableServer::NotAGroupObject&
+  )
 {
   return 1;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_PortableServer_IDs_I_
 #define _TAO_CDR_OP_PortableServer_IDs_I_
@@ -1254,6 +1495,7 @@ CORBA::Boolean TAO_PortableServer_Export operator<< (
     TAO_OutputCDR &,
     const PortableServer::IDs &
   );
+
 CORBA::Boolean TAO_PortableServer_Export operator>> (
     TAO_InputCDR &,
     PortableServer::IDs &
@@ -1261,144 +1503,176 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 
 #endif /* _TAO_CDR_OP_PortableServer_IDs_I_ */
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::ThreadPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::LifespanPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdUniquenessPolicyValue &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdUniquenessPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::IdUniquenessPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdAssignmentPolicyValue &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdAssignmentPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::IdAssignmentPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::ImplicitActivationPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ServantRetentionPolicyValue &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ServantRetentionPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::ServantRetentionPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::RequestProcessingPolicyValue &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::RequestProcessingPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessingPolicyValue &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessingPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::RequestProcessingPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index eae00f394d4..2b6843ed37f 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "Servant_Base.h"
 #include "POA.h"
 #include "Operation_Table.h"
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 6c4a47ea519..c03f51ea213 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -60,11 +60,13 @@ public:
 
   /// Query the Interface Repository for the interface definition.
   virtual CORBA::InterfaceDef_ptr _get_interface (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    );
 
-  /// Default @c _get_component>: always returns CORBA::Object::_nil().
+  /// Default <_get_component>: always returns CORBA::Object::_nil().
   virtual CORBA::Object_ptr _get_component (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    );
 
   /// Get the correct vtable.
   virtual void *_downcast (const char *repository_id) = 0;
diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i
index 2037908841a..e98c343b561 100644
--- a/TAO/tao/PortableServer/Servant_Base.i
+++ b/TAO/tao/PortableServer/Servant_Base.i
@@ -13,10 +13,10 @@ TAO_Local_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
   PortableServer::ObjectId_var invalid_oid =
     PortableServer::string_to_ObjectId ("invalid");
 
-  TAO_ObjectKey tmp_key (invalid_oid->length (),
-                         invalid_oid->length (),
-                         invalid_oid->get_buffer (),
-                         0);
+  TAO::ObjectKey tmp_key (invalid_oid->length (),
+                          invalid_oid->length (),
+                          invalid_oid->get_buffer (),
+                          0);
 
   // It is ok to use TAO_ORB_Core_instance here since the locality
   // constrained servant does not really register with a POA or get
diff --git a/TAO/tao/PortableServer/TAO_PortableServer.dsp b/TAO/tao/PortableServer/TAO_PortableServer.dsp
index 62465713000..899f548c072 100644
--- a/TAO/tao/PortableServer/TAO_PortableServer.dsp
+++ b/TAO/tao/PortableServer/TAO_PortableServer.dsp
@@ -173,6 +173,21 @@ SOURCE=.\Default_Acceptor_Filter.cpp
 # Begin Source File

 

 SOURCE=.\Default_ORTC.cpp

+

+!IF  "$(CFG)" == "PortableServer - Win32 Release"

+

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 Debug"

+

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 MFC Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

@@ -193,6 +208,7 @@ SOURCE=.\ImplRepo_i.cpp
 # Begin Source File

 

 SOURCE=.\ImplRepoC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -201,6 +217,7 @@ SOURCE=.\ImplRepoS.cpp
 # Begin Source File

 

 SOURCE=.\ImR_ActivatorC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -209,6 +226,7 @@ SOURCE=.\ImR_ActivatorS.cpp
 # Begin Source File

 

 SOURCE=.\ImR_LocatorC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -281,6 +299,21 @@ SOURCE=.\PortableServer_PolicyFactory.cpp
 # Begin Source File

 

 SOURCE=.\PortableServerC.cpp

+

+!IF  "$(CFG)" == "PortableServer - Win32 Release"

+

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 Debug"

+

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 MFC Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
index cdcf0596013..34b16c9200a 100644
--- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
+++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
@@ -7,7 +7,9 @@
 #include "tao/Stub.h"
 
 
-ACE_RCSID(tao, TAO_ThruPOA_Object_Proxy_Impl, "$Id$")
+ACE_RCSID (tao, 
+           TAO_ThruPOA_Object_Proxy_Impl, 
+           "$Id$")
 
 TAO_ThruPOA_Object_Proxy_Impl::TAO_ThruPOA_Object_Proxy_Impl (void)
 {
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 2860a202041..b41fc592757 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "Profile.h"
 #include "Object_KeyC.h"
 
@@ -13,12 +12,10 @@
 #include "Profile.i"
 #endif /* __ACE_INLINE__ */
 
-
 ACE_RCSID (tao,
            Profile,
            "$Id$")
 
-
 // ****************************************************************
 
 TAO_Profile::~TAO_Profile (void)
@@ -416,15 +413,15 @@ TAO_Unknown_Profile::encode_endpoints (void)
   return 0;
 }
 
-const TAO_ObjectKey &
+const TAO::ObjectKey &
 TAO_Unknown_Profile::object_key (void) const
 {
   // @@ TODO this is wrong, but the function is deprecated anyway....
-  static TAO_ObjectKey empty_key;
+  static TAO::ObjectKey empty_key;
   return empty_key;
 }
 
-TAO_ObjectKey *
+TAO::ObjectKey *
 TAO_Unknown_Profile::_key (void) const
 {
   return 0;
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index a1fb45772ba..ad85bb0eac6 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -23,6 +23,7 @@
 #include "Tagged_Components.h"
 #include "PolicyC.h"
 #include "GIOP_Message_Version.h"
+#include "Object_KeyC.h"
 
 class TAO_MProfile;
 class TAO_Stub;
@@ -107,11 +108,11 @@ public:
   virtual int encode_endpoints (void) = 0;
 
   /// @@ deprecated. return a reference to the Object Key.
-  virtual const TAO_ObjectKey &object_key (void) const = 0;
+  virtual const TAO::ObjectKey &object_key (void) const = 0;
 
   /// Obtain the object key, return 0 if the profile cannot be parsed.
   /// The memory is owned by the caller!
-  virtual TAO_ObjectKey *_key (void) const = 0;
+  virtual TAO::ObjectKey *_key (void) const = 0;
 
   /**
    * Return pointer to this profile's endpoint.  If the profile
@@ -291,8 +292,8 @@ public:
   virtual int decode (TAO_InputCDR& cdr);
   virtual int encode (TAO_OutputCDR &stream) const;
   virtual int encode_endpoints (void);
-  virtual const TAO_ObjectKey &object_key (void) const;
-  virtual TAO_ObjectKey *_key (void) const;
+  virtual const TAO::ObjectKey &object_key (void) const;
+  virtual TAO::ObjectKey *_key (void) const;
   virtual TAO_Endpoint *endpoint (void);
   virtual size_t endpoint_count (void);
   virtual CORBA::Boolean is_equivalent (const TAO_Profile* other_profile);
diff --git a/TAO/tao/RTCORBA/Makefile b/TAO/tao/RTCORBA/Makefile
index d636a30e442..54065b2d4b2 100644
--- a/TAO/tao/RTCORBA/Makefile
+++ b/TAO/tao/RTCORBA/Makefile
@@ -109,12 +109,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i rtcorba_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h rtcorba_export.h \
   Priority_Mapping.h RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -127,7 +129,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -162,7 +163,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -191,7 +193,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -214,6 +217,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -222,11 +254,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -249,8 +289,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i Priority_Mapping.i \
-  Continuous_Priority_Mapping.i \
+  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  Priority_Mapping.i Continuous_Priority_Mapping.i \
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
 
@@ -262,13 +302,15 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i Direct_Priority_Mapping.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h Direct_Priority_Mapping.h \
   Priority_Mapping.h RTCORBAC.h rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -281,7 +323,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -316,7 +357,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -345,7 +387,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -368,6 +411,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -376,11 +448,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -403,8 +483,9 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i Priority_Mapping.i \
-  Direct_Priority_Mapping.i $(ACE_ROOT)/ace/Sched_Params.h \
+  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  Priority_Mapping.i Direct_Priority_Mapping.i \
+  $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
 
 .obj/Linear_Priority_Mapping.o .obj/Linear_Priority_Mapping.so .shobj/Linear_Priority_Mapping.o .shobj/Linear_Priority_Mapping.so: Linear_Priority_Mapping.cpp \
@@ -415,13 +496,15 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i Linear_Priority_Mapping.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h Linear_Priority_Mapping.h \
   rtcorba_export.h Priority_Mapping.h RTCORBAC.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -434,7 +517,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -469,7 +551,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -498,7 +581,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -521,6 +605,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -529,11 +642,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -556,8 +677,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i Priority_Mapping.i \
-  Linear_Priority_Mapping.i $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  Priority_Mapping.i Linear_Priority_Mapping.i \
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
 
@@ -571,12 +692,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   rtcorba_export.h \
   $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -589,7 +712,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -609,7 +731,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -640,7 +763,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -690,7 +814,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -703,22 +828,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -734,6 +874,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -751,16 +893,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -784,14 +929,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -866,12 +1003,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i Priority_Mapping.h RTCORBAC.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h Priority_Mapping.h RTCORBAC.h \
   rtcorba_export.h $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -884,7 +1023,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -919,7 +1057,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -948,7 +1087,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -971,6 +1111,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -979,11 +1148,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -1006,7 +1183,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i Priority_Mapping.i
+  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  Priority_Mapping.i
 
 .obj/Priority_Mapping_Manager.o .obj/Priority_Mapping_Manager.so .shobj/Priority_Mapping_Manager.o .shobj/Priority_Mapping_Manager.so: Priority_Mapping_Manager.cpp \
   Priority_Mapping_Manager.h $(ACE_ROOT)/ace/pre.h \
@@ -1016,12 +1194,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i rtcorba_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h rtcorba_export.h \
   Priority_Mapping.h RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -1034,7 +1214,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -1069,7 +1248,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1098,7 +1278,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1121,6 +1302,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -1129,11 +1339,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -1156,8 +1374,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i Priority_Mapping.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  Priority_Mapping.i $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   Priority_Mapping_Manager.i
 
@@ -1170,13 +1388,15 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   Linear_Network_Priority_Mapping.h rtcorba_export.h \
   Network_Priority_Mapping.h RTCORBAC.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -1189,7 +1409,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -1224,7 +1443,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1253,7 +1473,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1276,6 +1497,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -1284,11 +1534,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -1313,7 +1571,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
   Network_Priority_Mapping.i Linear_Network_Priority_Mapping.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
 
@@ -1325,12 +1582,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i Network_Priority_Mapping.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h Network_Priority_Mapping.h \
   RTCORBAC.h rtcorba_export.h $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -1343,7 +1602,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -1378,7 +1636,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1407,7 +1666,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1430,6 +1690,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -1438,11 +1727,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -1476,13 +1773,15 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i rtcorba_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h rtcorba_export.h \
   Network_Priority_Mapping.h RTCORBAC.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -1495,7 +1794,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -1530,7 +1828,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1559,7 +1858,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1582,6 +1882,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -1590,11 +1919,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -1631,12 +1968,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i rtcorba_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h rtcorba_export.h \
   $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -1649,7 +1988,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -1660,7 +1998,8 @@ endif # corba_messaging
   Private_Transport_Descriptor.inl \
   $(TAO_ROOT)/tao/Endpoint.h \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -1736,7 +2075,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1765,7 +2105,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1788,6 +2129,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -1796,11 +2166,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -1827,27 +2205,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h
+  $(ACE_ROOT)/ace/Service_Object.i
 
 .obj/RTCORBAC.o .obj/RTCORBAC.so .shobj/RTCORBAC.o .shobj/RTCORBAC.so: RTCORBAC.cpp RTCORBA.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
@@ -1910,7 +2269,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1939,7 +2299,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1962,6 +2323,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -1970,11 +2360,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -2002,10 +2400,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -2014,31 +2416,26 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -2048,21 +2445,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -2075,14 +2457,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -2126,10 +2500,30 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/PortableInterceptor.h \
   $(TAO_ROOT)/tao/RequestInfo_Util.h \
@@ -2146,12 +2540,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i RTCORBAC.h rtcorba_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h RTCORBAC.h rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -2164,7 +2560,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -2199,7 +2594,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2228,7 +2624,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2251,6 +2648,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -2259,11 +2685,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -2294,41 +2728,40 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -2338,21 +2771,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -2365,14 +2783,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -2447,7 +2857,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -2478,7 +2889,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2541,6 +2953,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -2549,11 +2971,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -2584,10 +3014,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -2596,9 +3030,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
@@ -2606,12 +3041,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -2633,14 +3066,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -2684,10 +3109,30 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/Protocols_Hooks.h
 
@@ -2744,12 +3189,9 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -2762,13 +3204,13 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2778,6 +3220,24 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -2796,31 +3256,11 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  RT_Endpoint_Selector_Factory.h \
-  $(TAO_ROOT)/tao/Endpoint_Selector_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -2835,16 +3275,41 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
-  RT_Invocation_Endpoint_Selectors.h RTCORBA.h RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  RT_Endpoint_Selector_Factory.h \
+  $(TAO_ROOT)/tao/Endpoint_Selector_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  RT_Invocation_Endpoint_Selectors.h RTCORBA.h RTCORBAC.h \
+  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -2890,19 +3355,45 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i RT_Stub.h \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -2911,7 +3402,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -2921,12 +3411,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -2946,14 +3434,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -3043,7 +3523,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3072,7 +3553,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -3095,6 +3577,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -3103,11 +3614,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -3153,10 +3672,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i RT_Policy_i.h \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i RT_Policy_i.i \
@@ -3164,41 +3710,33 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -3206,21 +3744,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -3233,14 +3756,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -3269,16 +3784,11 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Stub.i \
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/Profile.i \
   $(TAO_ROOT)/tao/Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.i RT_Stub.h \
-  Private_Transport_Descriptor.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  Private_Transport_Descriptor.inl \
+  Private_Transport_Descriptor.h Private_Transport_Descriptor.inl \
   $(TAO_ROOT)/tao/Base_Transport_Property.h \
   $(TAO_ROOT)/tao/Base_Transport_Property.inl \
   RT_Endpoint_Utils.h RT_Protocols_Hooks.h \
@@ -3295,12 +3805,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i RTCORBAC.h rtcorba_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h RTCORBAC.h rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -3313,7 +3825,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -3348,7 +3859,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3377,7 +3889,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -3400,6 +3913,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -3408,11 +3950,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -3437,34 +3987,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i RT_ORB.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RT_ORB.i
+  $(TAO_ROOT)/tao/LocalObject.i RT_ORB.h RT_ORB.i
 
 .obj/RT_ORB.o .obj/RT_ORB.so .shobj/RT_ORB.o .shobj/RT_ORB.so: RT_ORB.cpp RT_ORB.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
@@ -3473,12 +3996,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i RTCORBAC.h rtcorba_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h RTCORBAC.h rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -3491,7 +4016,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -3526,7 +4050,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3555,7 +4080,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -3578,6 +4104,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -3586,11 +4141,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -3615,48 +4178,24 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h RT_ORB.i RT_Policy_i.h \
+  $(TAO_ROOT)/tao/LocalObject.i RT_ORB.i RT_Policy_i.h \
   RT_Policy_i.i RT_Mutex.h Priority_Mapping_Manager.h Priority_Mapping.h \
   Priority_Mapping.i Priority_Mapping_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -3664,6 +4203,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
@@ -3671,12 +4212,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -3807,12 +4346,9 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -3825,13 +4361,13 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -3841,6 +4377,24 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -3859,34 +4413,58 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -3925,44 +4503,29 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i Priority_Mapping_Manager.h \
-  Priority_Mapping.h Priority_Mapping.i Priority_Mapping_Manager.i \
-  Network_Priority_Mapping_Manager.h Network_Priority_Mapping.h \
-  Network_Priority_Mapping.i Network_Priority_Mapping_Manager.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h RT_Protocols_Hooks.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Priority_Mapping_Manager.h Priority_Mapping.h Priority_Mapping.i \
+  Priority_Mapping_Manager.i Network_Priority_Mapping_Manager.h \
+  Network_Priority_Mapping.h Network_Priority_Mapping.i \
+  Network_Priority_Mapping_Manager.i RT_Protocols_Hooks.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
@@ -3983,14 +4546,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -4079,7 +4634,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -4110,7 +4666,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4179,6 +4736,18 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -4187,21 +4756,27 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -4216,8 +4791,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i RT_PolicyFactory.h \
-  $(TAO_ROOT)/tao/debug.h
+  $(TAO_ROOT)/tao/LocalObject.i RT_PolicyFactory.h
 
 .obj/RT_PolicyFactory.o .obj/RT_PolicyFactory.so .shobj/RT_PolicyFactory.o .shobj/RT_PolicyFactory.so: RT_PolicyFactory.cpp RT_PolicyFactory.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -4275,12 +4849,9 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -4293,13 +4864,13 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4309,6 +4880,24 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -4327,34 +4916,58 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -4394,12 +5007,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i RTCORBAC.h rtcorba_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h RTCORBAC.h rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -4412,7 +5027,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -4447,7 +5061,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4476,7 +5091,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -4499,6 +5115,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -4507,11 +5152,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -4539,40 +5192,39 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/LocalObject.i RT_Policy_i.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -4582,21 +5234,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -4609,14 +5246,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -4695,12 +5324,9 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -4713,13 +5339,13 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4729,6 +5355,24 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -4747,15 +5391,33 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
@@ -4763,19 +5425,24 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i Priority_Mapping_Manager.h \
-  rtcorba_export.h Priority_Mapping.h RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Priority_Mapping_Manager.h rtcorba_export.h Priority_Mapping.h \
+  RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -4798,32 +5465,13 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i Priority_Mapping.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  Priority_Mapping.i $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   Priority_Mapping_Manager.i Network_Priority_Mapping_Manager.h \
   Network_Priority_Mapping.h Network_Priority_Mapping.i \
-  Network_Priority_Mapping_Manager.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h RT_Protocols_Hooks.i \
-  RT_Policy_i.h RT_Policy_i.i \
-  $(TAO_ROOT)/tao/Invocation.h \
+  Network_Priority_Mapping_Manager.i RT_Protocols_Hooks.i RT_Policy_i.h \
+  RT_Policy_i.i $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Condition.h \
@@ -4842,26 +5490,51 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -4871,12 +5544,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -4896,14 +5567,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -4965,8 +5628,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Module.cpp \
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
   $(ACE_ROOT)/ace/Svc_Handler.cpp \
   $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
   $(ACE_ROOT)/ace/Dynamic.h \
@@ -5022,7 +5683,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5055,12 +5717,9 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -5073,6 +5732,23 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
@@ -5097,33 +5773,55 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -5138,13 +5836,11 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -5161,16 +5857,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -5182,21 +5881,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -5209,14 +5893,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -5295,7 +5971,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -5326,7 +6003,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5389,6 +6067,18 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -5397,20 +6087,24 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -5422,6 +6116,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -5439,16 +6135,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -5472,14 +6171,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -5515,12 +6206,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i RTCORBAC.h rtcorba_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h RTCORBAC.h rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -5533,7 +6226,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -5568,7 +6260,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5597,7 +6290,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -5620,6 +6314,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -5628,11 +6351,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -5657,33 +6388,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
   $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/New_Leader_Generator.h \
@@ -5714,7 +6418,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
@@ -5732,10 +6437,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Stream_Modules.cpp Thread_Pool.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
@@ -5743,9 +6452,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/Adapter.h \
@@ -5753,12 +6463,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl
index 468ce6aa711..2329ee4157b 100644
--- a/TAO/tao/RTCORBA/RTCORBA.pidl
+++ b/TAO/tao/RTCORBA/RTCORBA.pidl
@@ -225,7 +225,8 @@ module RTCORBA
                                                      in long recv_buffer_size,
                                                      in boolean keep_alive,
                                                      in boolean dont_route,
-                                                     in boolean no_delay );
+                                                     in boolean no_delay,
+						     in boolean enable_network_priority);
 
     // Threadpool creation/destruction.
     exception InvalidThreadpool {};
@@ -266,6 +267,4 @@ module RTCORBA
   };
 };
 
-#pragma prefix ""
-
 #endif /* _RT_CORBA_IDL_ */
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index d70d4d60bc4..a76911215f5 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "RTCORBA.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
+
+#include "RTCORBA.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -31,6 +34,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -54,26 +59,29 @@ RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
   return 1;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_RTCORBA_NativePriority[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x4e617469),
-  ACE_NTOHL (0x76655072),
-  ACE_NTOHL (0x696f7269),
-  ACE_NTOHL (0x74793a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x4e617469), 
+  ACE_NTOHL (0x76655072), 
+  ACE_NTOHL (0x696f7269), 
+  ACE_NTOHL (0x74793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/NativePriority:1.0
-  15,
-  ACE_NTOHL (0x4e617469),
-  ACE_NTOHL (0x76655072),
-  ACE_NTOHL (0x696f7269),
+    15,
+  ACE_NTOHL (0x4e617469), 
+  ACE_NTOHL (0x76655072), 
+  ACE_NTOHL (0x696f7269), 
   ACE_NTOHL (0x74790000),  // name = NativePriority
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -87,27 +95,34 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NativePriority (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_NativePriority, &_tc_TAO_tc_RTCORBA_NativePriority)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_NativePriority,
+    &_tc_TAO_tc_RTCORBA_NativePriority
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_RTCORBA_Priority[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-  9,
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
+    9,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
   ACE_NTOHL (0x0),  // name = Priority
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -121,37 +136,79 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Priority (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_Priority, &_tc_TAO_tc_RTCORBA_Priority)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Priority,
+    &_tc_TAO_tc_RTCORBA_Priority
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, minPriority, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_NetworkPriority[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x4e657477), 
+  ACE_NTOHL (0x6f726b50), 
+  ACE_NTOHL (0x72696f72), 
+  ACE_NTOHL (0x6974793a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/NetworkPriority:1.0
+    16,
+  ACE_NTOHL (0x4e657477), 
+  ACE_NTOHL (0x6f726b50), 
+  ACE_NTOHL (0x72696f72), 
+  ACE_NTOHL (0x69747900),  // name = NetworkPriority
+    CORBA::tk_long,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NetworkPriority (
+    CORBA::tk_alias,
+    sizeof (_oc_RTCORBA_NetworkPriority),
+    (char *) &_oc_RTCORBA_NetworkPriority,
+    0,
+    sizeof (RTCORBA::NetworkPriority)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, maxPriority, 32767)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_NetworkPriority,
+    &_tc_TAO_tc_RTCORBA_NetworkPriority
+  )
 TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_RTCORBA_ThreadpoolId[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c4964),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4964), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolId:1.0
-  13,
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c4964),
+    13,
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4964), 
   ACE_NTOHL (0x0),  // name = ThreadpoolId
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
 };
 
@@ -165,67 +222,74 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolId (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ThreadpoolId, &_tc_TAO_tc_RTCORBA_ThreadpoolId)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ThreadpoolId,
+    &_tc_TAO_tc_RTCORBA_ThreadpoolId
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_RTCORBA_ThreadpoolLane[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c4c61),
-  ACE_NTOHL (0x6e653a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4c61), 
+  ACE_NTOHL (0x6e653a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
-  15,
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c4c61),
+    15,
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4c61), 
   ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
   3, // member count
-  14,
-  ACE_NTOHL (0x6c616e65),
-  ACE_NTOHL (0x5f707269),
-  ACE_NTOHL (0x6f726974),
+    14,
+  ACE_NTOHL (0x6c616e65), 
+  ACE_NTOHL (0x5f707269), 
+  ACE_NTOHL (0x6f726974), 
   ACE_NTOHL (0x79000000),  // name = lane_priority
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x5254434f),
-    ACE_NTOHL (0x5242412f),
-    ACE_NTOHL (0x5072696f),
-    ACE_NTOHL (0x72697479),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-    9,
-    ACE_NTOHL (0x5072696f),
-    ACE_NTOHL (0x72697479),
+        9,
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
     ACE_NTOHL (0x0),  // name = Priority
-    CORBA::tk_short,
+        CORBA::tk_short,
 
 
   15,
-  ACE_NTOHL (0x73746174),
-  ACE_NTOHL (0x69635f74),
-  ACE_NTOHL (0x68726561),
+  ACE_NTOHL (0x73746174), 
+  ACE_NTOHL (0x69635f74), 
+  ACE_NTOHL (0x68726561), 
   ACE_NTOHL (0x64730000),  // name = static_threads
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
   16,
-  ACE_NTOHL (0x64796e61),
-  ACE_NTOHL (0x6d69635f),
-  ACE_NTOHL (0x74687265),
+  ACE_NTOHL (0x64796e61), 
+  ACE_NTOHL (0x6d69635f), 
+  ACE_NTOHL (0x74687265), 
   ACE_NTOHL (0x61647300),  // name = dynamic_threads
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
 };
 
@@ -239,15 +303,24 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLane (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ThreadpoolLane, &_tc_TAO_tc_RTCORBA_ThreadpoolLane)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ThreadpoolLane,
+    &_tc_TAO_tc_RTCORBA_ThreadpoolLane
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void RTCORBA::ThreadpoolLane::_tao_any_destructor (void *_tao_void_pointer)
 {
   ThreadpoolLane *tmp = ACE_static_cast (ThreadpoolLane*, _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)
 
@@ -259,18 +332,23 @@ RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_allocate_buffer (CORB
 {
   RTCORBA::ThreadpoolLane* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    RTCORBA::ThreadpoolLane *old = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (old);
-
-  }
+    {
+      RTCORBA::ThreadpoolLane *old =
+        ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -278,152 +356,173 @@ void
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  RTCORBA::ThreadpoolLane *tmp = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  RTCORBA::ThreadpoolLane *tmp =
+    ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_);
   _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::~_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void) // Dtor.
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::~_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CS_)
 #define _RTCORBA_THREADPOOLLANES_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // RTCORBA::ThreadpoolLanes
 // *************************************************************
 
 RTCORBA::ThreadpoolLanes::ThreadpoolLanes (void)
 {}
-RTCORBA::ThreadpoolLanes::ThreadpoolLanes (CORBA::ULong max) // uses max size
-  :
+
+RTCORBA::ThreadpoolLanes::ThreadpoolLanes (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<RTCORBA::ThreadpoolLane>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-RTCORBA::ThreadpoolLanes::ThreadpoolLanes (CORBA::ULong max, CORBA::ULong length, RTCORBA::ThreadpoolLane *buffer, CORBA::Boolean release)
-  :
+
+RTCORBA::ThreadpoolLanes::ThreadpoolLanes (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    RTCORBA::ThreadpoolLane *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<RTCORBA::ThreadpoolLane>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-RTCORBA::ThreadpoolLanes::ThreadpoolLanes (const ThreadpoolLanes &seq) // copy ctor
-  :
+
+RTCORBA::ThreadpoolLanes::ThreadpoolLanes (const ThreadpoolLanes &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<RTCORBA::ThreadpoolLane>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 RTCORBA::ThreadpoolLanes::~ThreadpoolLanes (void) // dtor
 {}
+
 void RTCORBA::ThreadpoolLanes::_tao_any_destructor (void *_tao_void_pointer)
 {
   ThreadpoolLanes *tmp = ACE_static_cast (ThreadpoolLanes*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c4c61),
-  ACE_NTOHL (0x6e65733a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4c61), 
+  ACE_NTOHL (0x6e65733a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0
-  16,
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c4c61),
+    16,
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4c61), 
   ACE_NTOHL (0x6e657300),  // name = ThreadpoolLanes
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   228, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     212, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       39,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x5254434f),
-      ACE_NTOHL (0x5242412f),
-      ACE_NTOHL (0x54687265),
-      ACE_NTOHL (0x6164706f),
-      ACE_NTOHL (0x6f6c4c61),
-      ACE_NTOHL (0x6e653a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x5254434f), 
+      ACE_NTOHL (0x5242412f), 
+      ACE_NTOHL (0x54687265), 
+      ACE_NTOHL (0x6164706f), 
+      ACE_NTOHL (0x6f6c4c61), 
+      ACE_NTOHL (0x6e653a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
-      15,
-      ACE_NTOHL (0x54687265),
-      ACE_NTOHL (0x6164706f),
-      ACE_NTOHL (0x6f6c4c61),
+            15,
+      ACE_NTOHL (0x54687265), 
+      ACE_NTOHL (0x6164706f), 
+      ACE_NTOHL (0x6f6c4c61), 
       ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
       3, // member count
-      14,
-      ACE_NTOHL (0x6c616e65),
-      ACE_NTOHL (0x5f707269),
-      ACE_NTOHL (0x6f726974),
+            14,
+      ACE_NTOHL (0x6c616e65), 
+      ACE_NTOHL (0x5f707269), 
+      ACE_NTOHL (0x6f726974), 
       ACE_NTOHL (0x79000000),  // name = lane_priority
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x5254434f),
-        ACE_NTOHL (0x5242412f),
-        ACE_NTOHL (0x5072696f),
-        ACE_NTOHL (0x72697479),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-        9,
-        ACE_NTOHL (0x5072696f),
-        ACE_NTOHL (0x72697479),
+                9,
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
         ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
+                CORBA::tk_short,
 
 
       15,
-      ACE_NTOHL (0x73746174),
-      ACE_NTOHL (0x69635f74),
-      ACE_NTOHL (0x68726561),
+      ACE_NTOHL (0x73746174), 
+      ACE_NTOHL (0x69635f74), 
+      ACE_NTOHL (0x68726561), 
       ACE_NTOHL (0x64730000),  // name = static_threads
-      CORBA::tk_ulong,
+            CORBA::tk_ulong,
 
       16,
-      ACE_NTOHL (0x64796e61),
-      ACE_NTOHL (0x6d69635f),
-      ACE_NTOHL (0x74687265),
+      ACE_NTOHL (0x64796e61), 
+      ACE_NTOHL (0x6d69635f), 
+      ACE_NTOHL (0x74687265), 
       ACE_NTOHL (0x61647300),  // name = dynamic_threads
-      CORBA::tk_ulong,
+            CORBA::tk_ulong,
 
 
     0U,
@@ -440,45 +539,48 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLanes (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ThreadpoolLanes, &_tc_TAO_tc_RTCORBA_ThreadpoolLanes)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ThreadpoolLanes,
+    &_tc_TAO_tc_RTCORBA_ThreadpoolLanes
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIORITY_MODEL_POLICY_TYPE, 40U)
-TAO_NAMESPACE_END
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_RTCORBA_PriorityModel[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x4d6f6465),
-  ACE_NTOHL (0x6c3a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x6c3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModel:1.0
   14,
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x4d6f6465),
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x4d6f6465), 
   ACE_NTOHL (0x6c000000),  // name = PriorityModel
   2, // member count
   18,
-  ACE_NTOHL (0x434c4945),
-  ACE_NTOHL (0x4e545f50),
-  ACE_NTOHL (0x524f5041),
-  ACE_NTOHL (0x47415445),
+  ACE_NTOHL (0x434c4945), 
+  ACE_NTOHL (0x4e545f50), 
+  ACE_NTOHL (0x524f5041), 
+  ACE_NTOHL (0x47415445), 
   ACE_NTOHL (0x44000000),  // name = CLIENT_PROPAGATED
   16,
-  ACE_NTOHL (0x53455256),
-  ACE_NTOHL (0x45525f44),
-  ACE_NTOHL (0x45434c41),
+  ACE_NTOHL (0x53455256), 
+  ACE_NTOHL (0x45525f44), 
+  ACE_NTOHL (0x45434c41), 
   ACE_NTOHL (0x52454400),  // name = SERVER_DECLARED
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModel (
     CORBA::tk_enum,
@@ -490,9 +592,16 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModel (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PriorityModel, &_tc_TAO_tc_RTCORBA_PriorityModel)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PriorityModel,
+    &_tc_TAO_tc_RTCORBA_PriorityModel
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::PriorityModelPolicy::_tao_class_id = 0;
 
 RTCORBA::PriorityModelPolicy_ptr
@@ -538,13 +647,23 @@ tao_RTCORBA_PriorityModelPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_PriorityModelPolicy_marshal (
+    RTCORBA::PriorityModelPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::PriorityModelPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::PriorityModelPolicy_var::PriorityModelPolicy_var (void) // default constructor
+RTCORBA::PriorityModelPolicy_var::PriorityModelPolicy_var (void)
   : ptr_ (PriorityModelPolicy::_nil ())
 {}
 
@@ -554,12 +673,12 @@ RTCORBA::PriorityModelPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::PriorityModelPolicy_var::PriorityModelPolicy_var (const ::RTCORBA::PriorityModelPolicy_var &p) // copy constructor
+RTCORBA::PriorityModelPolicy_var::PriorityModelPolicy_var (const ::RTCORBA::PriorityModelPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (PriorityModelPolicy::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::PriorityModelPolicy_var::~PriorityModelPolicy_var (void) // destructor
+RTCORBA::PriorityModelPolicy_var::~PriorityModelPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -588,7 +707,7 @@ RTCORBA::PriorityModelPolicy_var::operator const ::RTCORBA::PriorityModelPolicy_
   return this->ptr_;
 }
 
-RTCORBA::PriorityModelPolicy_var::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast
+RTCORBA::PriorityModelPolicy_var::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -663,10 +782,11 @@ RTCORBA::PriorityModelPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::PriorityModelPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (PriorityModelPolicy_ptr &p)
@@ -675,14 +795,14 @@ RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (PriorityModelPolicy_p
   this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
 }
 
-RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (PriorityModelPolicy_var &p) // constructor from _var
+RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (PriorityModelPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
 }
 
-RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (const ::RTCORBA::PriorityModelPolicy_out &p) // copy constructor
+RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (const ::RTCORBA::PriorityModelPolicy_out &p)
   : ptr_ (ACE_const_cast (PriorityModelPolicy_out &, p).ptr_)
 {}
 
@@ -713,7 +833,7 @@ RTCORBA::PriorityModelPolicy_out::operator ::RTCORBA::PriorityModelPolicy_ptr &(
 }
 
 ::RTCORBA::PriorityModelPolicy_ptr &
-RTCORBA::PriorityModelPolicy_out::ptr (void) // ptr
+RTCORBA::PriorityModelPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -724,9 +844,8 @@ RTCORBA::PriorityModelPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void)
 {}
@@ -734,7 +853,15 @@ RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void)
 RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void)
 {}
 
-RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_narrow (
+void 
+RTCORBA::PriorityModelPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  PriorityModelPolicy *tmp = ACE_static_cast (PriorityModelPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::PriorityModelPolicy_ptr
+RTCORBA::PriorityModelPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -742,62 +869,82 @@ RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_narrow (
   return PriorityModelPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::PriorityModelPolicy_ptr
+RTCORBA::PriorityModelPolicy_ptr 
 RTCORBA::PriorityModelPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return PriorityModelPolicy::_nil ();
+    {
+      return PriorityModelPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           PriorityModelPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &PriorityModelPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &PriorityModelPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::PriorityModelPolicy_ptr
 RTCORBA::PriorityModelPolicy::_duplicate (PriorityModelPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::PriorityModelPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, PriorityModelPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, PriorityModelPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -806,10 +953,52 @@ const char* RTCORBA::PriorityModelPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0";
 }
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_PriorityModelPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0
+    20,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x69637900),  // name = PriorityModelPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModelPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_PriorityModelPolicy),
+    (char *) &_oc_RTCORBA_PriorityModelPolicy,
+    0,
+    sizeof (RTCORBA::PriorityModelPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREADPOOL_POLICY_TYPE, 41U)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PriorityModelPolicy,
+    &_tc_TAO_tc_RTCORBA_PriorityModelPolicy
+  )
 TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::ThreadpoolPolicy::_tao_class_id = 0;
 
 RTCORBA::ThreadpoolPolicy_ptr
@@ -855,13 +1044,23 @@ tao_RTCORBA_ThreadpoolPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_ThreadpoolPolicy_marshal (
+    RTCORBA::ThreadpoolPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::ThreadpoolPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::ThreadpoolPolicy_var::ThreadpoolPolicy_var (void) // default constructor
+RTCORBA::ThreadpoolPolicy_var::ThreadpoolPolicy_var (void)
   : ptr_ (ThreadpoolPolicy::_nil ())
 {}
 
@@ -871,12 +1070,12 @@ RTCORBA::ThreadpoolPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::ThreadpoolPolicy_var::ThreadpoolPolicy_var (const ::RTCORBA::ThreadpoolPolicy_var &p) // copy constructor
+RTCORBA::ThreadpoolPolicy_var::ThreadpoolPolicy_var (const ::RTCORBA::ThreadpoolPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ThreadpoolPolicy::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::ThreadpoolPolicy_var::~ThreadpoolPolicy_var (void) // destructor
+RTCORBA::ThreadpoolPolicy_var::~ThreadpoolPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -905,7 +1104,7 @@ RTCORBA::ThreadpoolPolicy_var::operator const ::RTCORBA::ThreadpoolPolicy_ptr &(
   return this->ptr_;
 }
 
-RTCORBA::ThreadpoolPolicy_var::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast
+RTCORBA::ThreadpoolPolicy_var::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -980,10 +1179,11 @@ RTCORBA::ThreadpoolPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::ThreadpoolPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (ThreadpoolPolicy_ptr &p)
@@ -992,14 +1192,14 @@ RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (ThreadpoolPolicy_ptr &p)
   this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
 }
 
-RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (ThreadpoolPolicy_var &p) // constructor from _var
+RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (ThreadpoolPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
 }
 
-RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (const ::RTCORBA::ThreadpoolPolicy_out &p) // copy constructor
+RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (const ::RTCORBA::ThreadpoolPolicy_out &p)
   : ptr_ (ACE_const_cast (ThreadpoolPolicy_out &, p).ptr_)
 {}
 
@@ -1030,7 +1230,7 @@ RTCORBA::ThreadpoolPolicy_out::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // c
 }
 
 ::RTCORBA::ThreadpoolPolicy_ptr &
-RTCORBA::ThreadpoolPolicy_out::ptr (void) // ptr
+RTCORBA::ThreadpoolPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1041,9 +1241,8 @@ RTCORBA::ThreadpoolPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void)
 {}
@@ -1051,7 +1250,15 @@ RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void)
 RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void)
 {}
 
-RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_narrow (
+void 
+RTCORBA::ThreadpoolPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ThreadpoolPolicy *tmp = ACE_static_cast (ThreadpoolPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::ThreadpoolPolicy_ptr
+RTCORBA::ThreadpoolPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1059,62 +1266,82 @@ RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_narrow (
   return ThreadpoolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::ThreadpoolPolicy_ptr
+RTCORBA::ThreadpoolPolicy_ptr 
 RTCORBA::ThreadpoolPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ThreadpoolPolicy::_nil ();
+    {
+      return ThreadpoolPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ThreadpoolPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ThreadpoolPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ThreadpoolPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::ThreadpoolPolicy_ptr
 RTCORBA::ThreadpoolPolicy::_duplicate (ThreadpoolPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::ThreadpoolPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, ThreadpoolPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, ThreadpoolPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1123,6 +1350,52 @@ const char* RTCORBA::ThreadpoolPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_ThreadpoolPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  41,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0
+    17,
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = ThreadpoolPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_ThreadpoolPolicy),
+    (char *) &_oc_RTCORBA_ThreadpoolPolicy,
+    0,
+    sizeof (RTCORBA::ThreadpoolPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ThreadpoolPolicy,
+    &_tc_TAO_tc_RTCORBA_ThreadpoolPolicy
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::ProtocolProperties::_tao_class_id = 0;
 
 RTCORBA::ProtocolProperties_ptr
@@ -1168,13 +1441,23 @@ tao_RTCORBA_ProtocolProperties_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_ProtocolProperties_marshal (
+    RTCORBA::ProtocolProperties_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::ProtocolProperties_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::ProtocolProperties_var::ProtocolProperties_var (void) // default constructor
+RTCORBA::ProtocolProperties_var::ProtocolProperties_var (void)
   : ptr_ (ProtocolProperties::_nil ())
 {}
 
@@ -1184,12 +1467,12 @@ RTCORBA::ProtocolProperties_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::ProtocolProperties_var::ProtocolProperties_var (const ::RTCORBA::ProtocolProperties_var &p) // copy constructor
+RTCORBA::ProtocolProperties_var::ProtocolProperties_var (const ::RTCORBA::ProtocolProperties_var &p)
   : TAO_Base_var (),
     ptr_ (ProtocolProperties::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::ProtocolProperties_var::~ProtocolProperties_var (void) // destructor
+RTCORBA::ProtocolProperties_var::~ProtocolProperties_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1218,7 +1501,7 @@ RTCORBA::ProtocolProperties_var::operator const ::RTCORBA::ProtocolProperties_pt
   return this->ptr_;
 }
 
-RTCORBA::ProtocolProperties_var::operator ::RTCORBA::ProtocolProperties_ptr &() // cast
+RTCORBA::ProtocolProperties_var::operator ::RTCORBA::ProtocolProperties_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1293,10 +1576,11 @@ RTCORBA::ProtocolProperties_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::ProtocolProperties_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_ptr &p)
@@ -1305,14 +1589,14 @@ RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_ptr
   this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
 }
 
-RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_var &p) // constructor from _var
+RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
 }
 
-RTCORBA::ProtocolProperties_out::ProtocolProperties_out (const ::RTCORBA::ProtocolProperties_out &p) // copy constructor
+RTCORBA::ProtocolProperties_out::ProtocolProperties_out (const ::RTCORBA::ProtocolProperties_out &p)
   : ptr_ (ACE_const_cast (ProtocolProperties_out &, p).ptr_)
 {}
 
@@ -1343,7 +1627,7 @@ RTCORBA::ProtocolProperties_out::operator ::RTCORBA::ProtocolProperties_ptr &()
 }
 
 ::RTCORBA::ProtocolProperties_ptr &
-RTCORBA::ProtocolProperties_out::ptr (void) // ptr
+RTCORBA::ProtocolProperties_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1354,9 +1638,8 @@ RTCORBA::ProtocolProperties_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::ProtocolProperties::ProtocolProperties (void)
 {}
@@ -1364,7 +1647,15 @@ RTCORBA::ProtocolProperties::ProtocolProperties (void)
 RTCORBA::ProtocolProperties::~ProtocolProperties (void)
 {}
 
-RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_narrow (
+void 
+RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ProtocolProperties *tmp = ACE_static_cast (ProtocolProperties *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1372,50 +1663,68 @@ RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_narrow (
   return ProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_ptr 
 RTCORBA::ProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ProtocolProperties::_nil ();
+    {
+      return ProtocolProperties::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ProtocolProperties_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ProtocolProperties::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ProtocolProperties::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::ProtocolProperties_ptr
 RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::ProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1424,6 +1733,164 @@ const char* RTCORBA::ProtocolProperties::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/ProtocolProperties:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_ProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  43,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
+    19,
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65730000),  // name = ProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_ProtocolProperties),
+    (char *) &_oc_RTCORBA_ProtocolProperties,
+    0,
+    sizeof (RTCORBA::ProtocolProperties)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ProtocolProperties,
+    &_tc_TAO_tc_RTCORBA_ProtocolProperties
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_Protocol[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
+    9,
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x0),  // name = Protocol
+  3, // member count
+    14,
+  ACE_NTOHL (0x70726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x5f747970), 
+  ACE_NTOHL (0x65000000),  // name = protocol_type
+    CORBA::tk_alias, // typecode kind for typedefs
+  60, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    30,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x50726f66), 
+    ACE_NTOHL (0x696c6549), 
+    ACE_NTOHL (0x643a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
+        10,
+    ACE_NTOHL (0x50726f66), 
+    ACE_NTOHL (0x696c6549), 
+    ACE_NTOHL (0x64000000),  // name = ProfileId
+        CORBA::tk_ulong,
+
+
+  24,
+  ACE_NTOHL (0x6f72625f), 
+  ACE_NTOHL (0x70726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x5f70726f), 
+  ACE_NTOHL (0x70657274), 
+  ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
+    CORBA::tk_objref, // typecode kind
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    43,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x50726f74), 
+    ACE_NTOHL (0x6f636f6c), 
+    ACE_NTOHL (0x50726f70), 
+    ACE_NTOHL (0x65727469), 
+    ACE_NTOHL (0x65733a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
+        19,
+    ACE_NTOHL (0x50726f74), 
+    ACE_NTOHL (0x6f636f6c), 
+    ACE_NTOHL (0x50726f70), 
+    ACE_NTOHL (0x65727469), 
+    ACE_NTOHL (0x65730000),  // name = ProtocolProperties
+    
+  30,
+  ACE_NTOHL (0x7472616e), 
+  ACE_NTOHL (0x73706f72), 
+  ACE_NTOHL (0x745f7072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c5f70), 
+  ACE_NTOHL (0x726f7065), 
+  ACE_NTOHL (0x72746965), 
+  ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
+    0xffffffff, // indirection
+  0xffffff84, // negative offset (-124)
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Protocol (
+    CORBA::tk_struct,
+    sizeof (_oc_RTCORBA_Protocol),
+    (char *) &_oc_RTCORBA_Protocol,
+    0,
+    sizeof (RTCORBA::Protocol)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Protocol,
+    &_tc_TAO_tc_RTCORBA_Protocol
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void RTCORBA::Protocol::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Protocol *tmp = ACE_static_cast (Protocol*, _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)
 
@@ -1435,18 +1902,23 @@ RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_allocate_buffer (CORBA::
 {
   RTCORBA::Protocol* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    RTCORBA::Protocol *old = ACE_reinterpret_cast (RTCORBA::Protocol *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (old);
-
-  }
+    {
+      RTCORBA::Protocol *old =
+        ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -1454,178 +1926,196 @@ void
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  RTCORBA::Protocol *tmp = ACE_reinterpret_cast (RTCORBA::Protocol *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  RTCORBA::Protocol *tmp =
+    ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
   _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void) // Dtor.
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CS_)
 #define _RTCORBA_PROTOCOLLIST_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // RTCORBA::ProtocolList
 // *************************************************************
 
 RTCORBA::ProtocolList::ProtocolList (void)
 {}
-RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max) // uses max size
-  :
+
+RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<RTCORBA::Protocol>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max, CORBA::ULong length, RTCORBA::Protocol *buffer, CORBA::Boolean release)
-  :
+
+RTCORBA::ProtocolList::ProtocolList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    RTCORBA::Protocol *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<RTCORBA::Protocol>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-RTCORBA::ProtocolList::ProtocolList (const ProtocolList &seq) // copy ctor
-  :
+
+RTCORBA::ProtocolList::ProtocolList (const ProtocolList &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<RTCORBA::Protocol>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 RTCORBA::ProtocolList::~ProtocolList (void) // dtor
 {}
+
 void RTCORBA::ProtocolList::_tao_any_destructor (void *_tao_void_pointer)
 {
   ProtocolList *tmp = ACE_static_cast (ProtocolList*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// C:\irfan\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_RTCORBA_ProtocolList[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x50726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ProtocolList:1.0
-  13,
-  ACE_NTOHL (0x50726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x4c697374),
+    13,
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x4c697374), 
   ACE_NTOHL (0x0),  // name = ProtocolList
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   324, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     308, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       33,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x5254434f),
-      ACE_NTOHL (0x5242412f),
-      ACE_NTOHL (0x50726f74),
-      ACE_NTOHL (0x6f636f6c),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x5254434f), 
+      ACE_NTOHL (0x5242412f), 
+      ACE_NTOHL (0x50726f74), 
+      ACE_NTOHL (0x6f636f6c), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
-      9,
-      ACE_NTOHL (0x50726f74),
-      ACE_NTOHL (0x6f636f6c),
+            9,
+      ACE_NTOHL (0x50726f74), 
+      ACE_NTOHL (0x6f636f6c), 
       ACE_NTOHL (0x0),  // name = Protocol
       3, // member count
-      14,
-      ACE_NTOHL (0x70726f74),
-      ACE_NTOHL (0x6f636f6c),
-      ACE_NTOHL (0x5f747970),
+            14,
+      ACE_NTOHL (0x70726f74), 
+      ACE_NTOHL (0x6f636f6c), 
+      ACE_NTOHL (0x5f747970), 
       ACE_NTOHL (0x65000000),  // name = protocol_type
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x50726f66),
-        ACE_NTOHL (0x696c6549),
-        ACE_NTOHL (0x643a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x50726f66), 
+        ACE_NTOHL (0x696c6549), 
+        ACE_NTOHL (0x643a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-        10,
-        ACE_NTOHL (0x50726f66),
-        ACE_NTOHL (0x696c6549),
+                10,
+        ACE_NTOHL (0x50726f66), 
+        ACE_NTOHL (0x696c6549), 
         ACE_NTOHL (0x64000000),  // name = ProfileId
-        CORBA::tk_ulong,
+                CORBA::tk_ulong,
 
 
       24,
-      ACE_NTOHL (0x6f72625f),
-      ACE_NTOHL (0x70726f74),
-      ACE_NTOHL (0x6f636f6c),
-      ACE_NTOHL (0x5f70726f),
-      ACE_NTOHL (0x70657274),
+      ACE_NTOHL (0x6f72625f), 
+      ACE_NTOHL (0x70726f74), 
+      ACE_NTOHL (0x6f636f6c), 
+      ACE_NTOHL (0x5f70726f), 
+      ACE_NTOHL (0x70657274), 
       ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
-      CORBA::tk_objref, // typecode kind
+            CORBA::tk_objref, // typecode kind
       76, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x5254434f),
-        ACE_NTOHL (0x5242412f),
-        ACE_NTOHL (0x50726f74),
-        ACE_NTOHL (0x6f636f6c),
-        ACE_NTOHL (0x50726f70),
-        ACE_NTOHL (0x65727469),
-        ACE_NTOHL (0x65733a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x50726f74), 
+        ACE_NTOHL (0x6f636f6c), 
+        ACE_NTOHL (0x50726f70), 
+        ACE_NTOHL (0x65727469), 
+        ACE_NTOHL (0x65733a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
-        19,
-        ACE_NTOHL (0x50726f74),
-        ACE_NTOHL (0x6f636f6c),
-        ACE_NTOHL (0x50726f70),
-        ACE_NTOHL (0x65727469),
+                19,
+        ACE_NTOHL (0x50726f74), 
+        ACE_NTOHL (0x6f636f6c), 
+        ACE_NTOHL (0x50726f70), 
+        ACE_NTOHL (0x65727469), 
         ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-
+        
       30,
-      ACE_NTOHL (0x7472616e),
-      ACE_NTOHL (0x73706f72),
-      ACE_NTOHL (0x745f7072),
-      ACE_NTOHL (0x6f746f63),
-      ACE_NTOHL (0x6f6c5f70),
-      ACE_NTOHL (0x726f7065),
-      ACE_NTOHL (0x72746965),
+      ACE_NTOHL (0x7472616e), 
+      ACE_NTOHL (0x73706f72), 
+      ACE_NTOHL (0x745f7072), 
+      ACE_NTOHL (0x6f746f63), 
+      ACE_NTOHL (0x6f6c5f70), 
+      ACE_NTOHL (0x726f7065), 
+      ACE_NTOHL (0x72746965), 
       ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
-      0xffffffff, // indirection
+            0xffffffff, // indirection
       0xffffff84, // negative offset (-124)
 
     0U,
@@ -1649,11 +2139,9 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SERVER_PROTOCOL_POLICY_TYPE, 42U)
-TAO_NAMESPACE_END
 int RTCORBA::ServerProtocolPolicy::_tao_class_id = 0;
 
 RTCORBA::ServerProtocolPolicy_ptr
@@ -1699,13 +2187,23 @@ tao_RTCORBA_ServerProtocolPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_ServerProtocolPolicy_marshal (
+    RTCORBA::ServerProtocolPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::ServerProtocolPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (void) // default constructor
+RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (void)
   : ptr_ (ServerProtocolPolicy::_nil ())
 {}
 
@@ -1715,12 +2213,12 @@ RTCORBA::ServerProtocolPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (const ::RTCORBA::ServerProtocolPolicy_var &p) // copy constructor
+RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (const ::RTCORBA::ServerProtocolPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ServerProtocolPolicy::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::ServerProtocolPolicy_var::~ServerProtocolPolicy_var (void) // destructor
+RTCORBA::ServerProtocolPolicy_var::~ServerProtocolPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -1749,7 +2247,7 @@ RTCORBA::ServerProtocolPolicy_var::operator const ::RTCORBA::ServerProtocolPolic
   return this->ptr_;
 }
 
-RTCORBA::ServerProtocolPolicy_var::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast
+RTCORBA::ServerProtocolPolicy_var::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -1824,10 +2322,11 @@ RTCORBA::ServerProtocolPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::ServerProtocolPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_ptr &p)
@@ -1836,14 +2335,14 @@ RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolic
   this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
 }
 
-RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_var &p) // constructor from _var
+RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
 }
 
-RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (const ::RTCORBA::ServerProtocolPolicy_out &p) // copy constructor
+RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (const ::RTCORBA::ServerProtocolPolicy_out &p)
   : ptr_ (ACE_const_cast (ServerProtocolPolicy_out &, p).ptr_)
 {}
 
@@ -1874,7 +2373,7 @@ RTCORBA::ServerProtocolPolicy_out::operator ::RTCORBA::ServerProtocolPolicy_ptr
 }
 
 ::RTCORBA::ServerProtocolPolicy_ptr &
-RTCORBA::ServerProtocolPolicy_out::ptr (void) // ptr
+RTCORBA::ServerProtocolPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -1885,9 +2384,8 @@ RTCORBA::ServerProtocolPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void)
 {}
@@ -1895,7 +2393,15 @@ RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void)
 RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void)
 {}
 
-RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_narrow (
+void 
+RTCORBA::ServerProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServerProtocolPolicy *tmp = ACE_static_cast (ServerProtocolPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -1903,62 +2409,82 @@ RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_narrow (
   return ServerProtocolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_ptr 
 RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ServerProtocolPolicy::_nil ();
+    {
+      return ServerProtocolPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ServerProtocolPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServerProtocolPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ServerProtocolPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::ServerProtocolPolicy_ptr
 RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::ServerProtocolPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, ServerProtocolPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, ServerProtocolPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -1967,10 +2493,54 @@ const char* RTCORBA::ServerProtocolPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0";
 }
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_ServerProtocolPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0
+    21,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = ServerProtocolPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ServerProtocolPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_ServerProtocolPolicy),
+    (char *) &_oc_RTCORBA_ServerProtocolPolicy,
+    0,
+    sizeof (RTCORBA::ServerProtocolPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, CLIENT_PROTOCOL_POLICY_TYPE, 43U)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServerProtocolPolicy,
+    &_tc_TAO_tc_RTCORBA_ServerProtocolPolicy
+  )
 TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::ClientProtocolPolicy::_tao_class_id = 0;
 
 RTCORBA::ClientProtocolPolicy_ptr
@@ -2016,13 +2586,23 @@ tao_RTCORBA_ClientProtocolPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_ClientProtocolPolicy_marshal (
+    RTCORBA::ClientProtocolPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::ClientProtocolPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (void) // default constructor
+RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (void)
   : ptr_ (ClientProtocolPolicy::_nil ())
 {}
 
@@ -2032,12 +2612,12 @@ RTCORBA::ClientProtocolPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (const ::RTCORBA::ClientProtocolPolicy_var &p) // copy constructor
+RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (const ::RTCORBA::ClientProtocolPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (ClientProtocolPolicy::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::ClientProtocolPolicy_var::~ClientProtocolPolicy_var (void) // destructor
+RTCORBA::ClientProtocolPolicy_var::~ClientProtocolPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2066,7 +2646,7 @@ RTCORBA::ClientProtocolPolicy_var::operator const ::RTCORBA::ClientProtocolPolic
   return this->ptr_;
 }
 
-RTCORBA::ClientProtocolPolicy_var::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast
+RTCORBA::ClientProtocolPolicy_var::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2141,10 +2721,11 @@ RTCORBA::ClientProtocolPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::ClientProtocolPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_ptr &p)
@@ -2153,14 +2734,14 @@ RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolic
   this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
 }
 
-RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_var &p) // constructor from _var
+RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
 }
 
-RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (const ::RTCORBA::ClientProtocolPolicy_out &p) // copy constructor
+RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (const ::RTCORBA::ClientProtocolPolicy_out &p)
   : ptr_ (ACE_const_cast (ClientProtocolPolicy_out &, p).ptr_)
 {}
 
@@ -2191,7 +2772,7 @@ RTCORBA::ClientProtocolPolicy_out::operator ::RTCORBA::ClientProtocolPolicy_ptr
 }
 
 ::RTCORBA::ClientProtocolPolicy_ptr &
-RTCORBA::ClientProtocolPolicy_out::ptr (void) // ptr
+RTCORBA::ClientProtocolPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2202,9 +2783,8 @@ RTCORBA::ClientProtocolPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void)
 {}
@@ -2212,7 +2792,15 @@ RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void)
 RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void)
 {}
 
-RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_narrow (
+void 
+RTCORBA::ClientProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ClientProtocolPolicy *tmp = ACE_static_cast (ClientProtocolPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2220,62 +2808,82 @@ RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_narrow (
   return ClientProtocolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_ptr 
 RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return ClientProtocolPolicy::_nil ();
+    {
+      return ClientProtocolPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           ClientProtocolPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ClientProtocolPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &ClientProtocolPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::ClientProtocolPolicy_ptr
 RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::ClientProtocolPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, ClientProtocolPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, ClientProtocolPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -2284,10 +2892,54 @@ const char* RTCORBA::ClientProtocolPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0";
 }
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_ClientProtocolPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0
+    21,
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = ClientProtocolPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ClientProtocolPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_ClientProtocolPolicy),
+    (char *) &_oc_RTCORBA_ClientProtocolPolicy,
+    0,
+    sizeof (RTCORBA::ClientProtocolPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIVATE_CONNECTION_POLICY_TYPE, 44U)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ClientProtocolPolicy,
+    &_tc_TAO_tc_RTCORBA_ClientProtocolPolicy
+  )
 TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::PrivateConnectionPolicy::_tao_class_id = 0;
 
 RTCORBA::PrivateConnectionPolicy_ptr
@@ -2333,13 +2985,23 @@ tao_RTCORBA_PrivateConnectionPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_PrivateConnectionPolicy_marshal (
+    RTCORBA::PrivateConnectionPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::PrivateConnectionPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (void) // default constructor
+RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (void)
   : ptr_ (PrivateConnectionPolicy::_nil ())
 {}
 
@@ -2349,12 +3011,12 @@ RTCORBA::PrivateConnectionPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (const ::RTCORBA::PrivateConnectionPolicy_var &p) // copy constructor
+RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (const ::RTCORBA::PrivateConnectionPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (PrivateConnectionPolicy::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::PrivateConnectionPolicy_var::~PrivateConnectionPolicy_var (void) // destructor
+RTCORBA::PrivateConnectionPolicy_var::~PrivateConnectionPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2383,7 +3045,7 @@ RTCORBA::PrivateConnectionPolicy_var::operator const ::RTCORBA::PrivateConnectio
   return this->ptr_;
 }
 
-RTCORBA::PrivateConnectionPolicy_var::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast
+RTCORBA::PrivateConnectionPolicy_var::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2458,10 +3120,11 @@ RTCORBA::PrivateConnectionPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::PrivateConnectionPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_ptr &p)
@@ -2470,14 +3133,14 @@ RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnec
   this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
 }
 
-RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_var &p) // constructor from _var
+RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
 }
 
-RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (const ::RTCORBA::PrivateConnectionPolicy_out &p) // copy constructor
+RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (const ::RTCORBA::PrivateConnectionPolicy_out &p)
   : ptr_ (ACE_const_cast (PrivateConnectionPolicy_out &, p).ptr_)
 {}
 
@@ -2508,7 +3171,7 @@ RTCORBA::PrivateConnectionPolicy_out::operator ::RTCORBA::PrivateConnectionPolic
 }
 
 ::RTCORBA::PrivateConnectionPolicy_ptr &
-RTCORBA::PrivateConnectionPolicy_out::ptr (void) // ptr
+RTCORBA::PrivateConnectionPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2519,9 +3182,8 @@ RTCORBA::PrivateConnectionPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void)
 {}
@@ -2529,7 +3191,15 @@ RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void)
 RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void)
 {}
 
-RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_narrow (
+void 
+RTCORBA::PrivateConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  PrivateConnectionPolicy *tmp = ACE_static_cast (PrivateConnectionPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2537,62 +3207,82 @@ RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_narrow (
   return PrivateConnectionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_ptr 
 RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return PrivateConnectionPolicy::_nil ();
+    {
+      return PrivateConnectionPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           PrivateConnectionPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &PrivateConnectionPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &PrivateConnectionPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr
 RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::PrivateConnectionPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, PrivateConnectionPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, PrivateConnectionPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -2601,6 +3291,54 @@ const char* RTCORBA::PrivateConnectionPolicy::_interface_repository_id (void) co
   return "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_PrivateConnectionPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x50726976), 
+  ACE_NTOHL (0x61746543), 
+  ACE_NTOHL (0x6f6e6e65), 
+  ACE_NTOHL (0x6374696f), 
+  ACE_NTOHL (0x6e506f6c), 
+  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0
+    24,
+  ACE_NTOHL (0x50726976), 
+  ACE_NTOHL (0x61746543), 
+  ACE_NTOHL (0x6f6e6e65), 
+  ACE_NTOHL (0x6374696f), 
+  ACE_NTOHL (0x6e506f6c), 
+  ACE_NTOHL (0x69637900),  // name = PrivateConnectionPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PrivateConnectionPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_PrivateConnectionPolicy),
+    (char *) &_oc_RTCORBA_PrivateConnectionPolicy,
+    0,
+    sizeof (RTCORBA::PrivateConnectionPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PrivateConnectionPolicy,
+    &_tc_TAO_tc_RTCORBA_PrivateConnectionPolicy
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::TCPProtocolProperties::_tao_class_id = 0;
 
 RTCORBA::TCPProtocolProperties_ptr
@@ -2646,13 +3384,23 @@ tao_RTCORBA_TCPProtocolProperties_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_TCPProtocolProperties_marshal (
+    RTCORBA::TCPProtocolProperties_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::TCPProtocolProperties_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::TCPProtocolProperties_var::TCPProtocolProperties_var (void) // default constructor
+RTCORBA::TCPProtocolProperties_var::TCPProtocolProperties_var (void)
   : ptr_ (TCPProtocolProperties::_nil ())
 {}
 
@@ -2662,12 +3410,12 @@ RTCORBA::TCPProtocolProperties_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::TCPProtocolProperties_var::TCPProtocolProperties_var (const ::RTCORBA::TCPProtocolProperties_var &p) // copy constructor
+RTCORBA::TCPProtocolProperties_var::TCPProtocolProperties_var (const ::RTCORBA::TCPProtocolProperties_var &p)
   : TAO_Base_var (),
     ptr_ (TCPProtocolProperties::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::TCPProtocolProperties_var::~TCPProtocolProperties_var (void) // destructor
+RTCORBA::TCPProtocolProperties_var::~TCPProtocolProperties_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -2696,7 +3444,7 @@ RTCORBA::TCPProtocolProperties_var::operator const ::RTCORBA::TCPProtocolPropert
   return this->ptr_;
 }
 
-RTCORBA::TCPProtocolProperties_var::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast
+RTCORBA::TCPProtocolProperties_var::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2771,10 +3519,11 @@ RTCORBA::TCPProtocolProperties_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::TCPProtocolProperties_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (TCPProtocolProperties_ptr &p)
@@ -2783,14 +3532,14 @@ RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (TCPProtocolProper
   this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
 }
 
-RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (TCPProtocolProperties_var &p) // constructor from _var
+RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (TCPProtocolProperties_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
 }
 
-RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (const ::RTCORBA::TCPProtocolProperties_out &p) // copy constructor
+RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (const ::RTCORBA::TCPProtocolProperties_out &p)
   : ptr_ (ACE_const_cast (TCPProtocolProperties_out &, p).ptr_)
 {}
 
@@ -2821,7 +3570,7 @@ RTCORBA::TCPProtocolProperties_out::operator ::RTCORBA::TCPProtocolProperties_pt
 }
 
 ::RTCORBA::TCPProtocolProperties_ptr &
-RTCORBA::TCPProtocolProperties_out::ptr (void) // ptr
+RTCORBA::TCPProtocolProperties_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -2832,8 +3581,8 @@ RTCORBA::TCPProtocolProperties_out::operator-> (void)
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void)
 {}
@@ -2841,7 +3590,15 @@ RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void)
 RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void)
 {}
 
-RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_narrow (
+void 
+RTCORBA::TCPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
+{
+  TCPProtocolProperties *tmp = ACE_static_cast (TCPProtocolProperties *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::TCPProtocolProperties_ptr
+RTCORBA::TCPProtocolProperties::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -2849,62 +3606,82 @@ RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_narrow (
   return TCPProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::TCPProtocolProperties_ptr
+RTCORBA::TCPProtocolProperties_ptr 
 RTCORBA::TCPProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return TCPProtocolProperties::_nil ();
+    {
+      return TCPProtocolProperties::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           TCPProtocolProperties_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &TCPProtocolProperties::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &TCPProtocolProperties::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::TCPProtocolProperties_ptr
 RTCORBA::TCPProtocolProperties::_duplicate (TCPProtocolProperties_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::TCPProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, TCPProtocolProperties)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            RTCORBA::ProtocolProperties_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, TCPProtocolProperties)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                RTCORBA::ProtocolProperties_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -2913,6 +3690,54 @@ const char* RTCORBA::TCPProtocolProperties::_interface_repository_id (void) cons
   return "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_TCPProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  46,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54435050), 
+  ACE_NTOHL (0x726f746f), 
+  ACE_NTOHL (0x636f6c50), 
+  ACE_NTOHL (0x726f7065), 
+  ACE_NTOHL (0x72746965), 
+  ACE_NTOHL (0x733a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0
+    22,
+  ACE_NTOHL (0x54435050), 
+  ACE_NTOHL (0x726f746f), 
+  ACE_NTOHL (0x636f6c50), 
+  ACE_NTOHL (0x726f7065), 
+  ACE_NTOHL (0x72746965), 
+  ACE_NTOHL (0x73000000),  // name = TCPProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_TCPProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_TCPProtocolProperties),
+    (char *) &_oc_RTCORBA_TCPProtocolProperties,
+    0,
+    sizeof (RTCORBA::TCPProtocolProperties)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TCPProtocolProperties,
+    &_tc_TAO_tc_RTCORBA_TCPProtocolProperties
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::GIOPProtocolProperties::_tao_class_id = 0;
 
 RTCORBA::GIOPProtocolProperties_ptr
@@ -2958,13 +3783,23 @@ tao_RTCORBA_GIOPProtocolProperties_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_GIOPProtocolProperties_marshal (
+    RTCORBA::GIOPProtocolProperties_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::GIOPProtocolProperties_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::GIOPProtocolProperties_var::GIOPProtocolProperties_var (void) // default constructor
+RTCORBA::GIOPProtocolProperties_var::GIOPProtocolProperties_var (void)
   : ptr_ (GIOPProtocolProperties::_nil ())
 {}
 
@@ -2974,12 +3809,12 @@ RTCORBA::GIOPProtocolProperties_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::GIOPProtocolProperties_var::GIOPProtocolProperties_var (const ::RTCORBA::GIOPProtocolProperties_var &p) // copy constructor
+RTCORBA::GIOPProtocolProperties_var::GIOPProtocolProperties_var (const ::RTCORBA::GIOPProtocolProperties_var &p)
   : TAO_Base_var (),
     ptr_ (GIOPProtocolProperties::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::GIOPProtocolProperties_var::~GIOPProtocolProperties_var (void) // destructor
+RTCORBA::GIOPProtocolProperties_var::~GIOPProtocolProperties_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3008,7 +3843,7 @@ RTCORBA::GIOPProtocolProperties_var::operator const ::RTCORBA::GIOPProtocolPrope
   return this->ptr_;
 }
 
-RTCORBA::GIOPProtocolProperties_var::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast
+RTCORBA::GIOPProtocolProperties_var::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3083,10 +3918,11 @@ RTCORBA::GIOPProtocolProperties_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::GIOPProtocolProperties_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (GIOPProtocolProperties_ptr &p)
@@ -3095,14 +3931,14 @@ RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (GIOPProtocolPro
   this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
 }
 
-RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (GIOPProtocolProperties_var &p) // constructor from _var
+RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (GIOPProtocolProperties_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
 }
 
-RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (const ::RTCORBA::GIOPProtocolProperties_out &p) // copy constructor
+RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (const ::RTCORBA::GIOPProtocolProperties_out &p)
   : ptr_ (ACE_const_cast (GIOPProtocolProperties_out &, p).ptr_)
 {}
 
@@ -3133,7 +3969,7 @@ RTCORBA::GIOPProtocolProperties_out::operator ::RTCORBA::GIOPProtocolProperties_
 }
 
 ::RTCORBA::GIOPProtocolProperties_ptr &
-RTCORBA::GIOPProtocolProperties_out::ptr (void) // ptr
+RTCORBA::GIOPProtocolProperties_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3144,9 +3980,8 @@ RTCORBA::GIOPProtocolProperties_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void)
 {}
@@ -3154,7 +3989,15 @@ RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void)
 RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void)
 {}
 
-RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_narrow (
+void 
+RTCORBA::GIOPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
+{
+  GIOPProtocolProperties *tmp = ACE_static_cast (GIOPProtocolProperties *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::GIOPProtocolProperties_ptr
+RTCORBA::GIOPProtocolProperties::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3162,62 +4005,82 @@ RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_narrow (
   return GIOPProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::GIOPProtocolProperties_ptr
+RTCORBA::GIOPProtocolProperties_ptr 
 RTCORBA::GIOPProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return GIOPProtocolProperties::_nil ();
+    {
+      return GIOPProtocolProperties::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           GIOPProtocolProperties_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &GIOPProtocolProperties::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &GIOPProtocolProperties::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::GIOPProtocolProperties_ptr
 RTCORBA::GIOPProtocolProperties::_duplicate (GIOPProtocolProperties_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::GIOPProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, GIOPProtocolProperties)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            RTCORBA::ProtocolProperties_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, GIOPProtocolProperties)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                RTCORBA::ProtocolProperties_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -3226,6 +4089,54 @@ const char* RTCORBA::GIOPProtocolProperties::_interface_repository_id (void) con
   return "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_GIOPProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  47,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0
+    23,
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65730000),  // name = GIOPProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_GIOPProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_GIOPProtocolProperties),
+    (char *) &_oc_RTCORBA_GIOPProtocolProperties,
+    0,
+    sizeof (RTCORBA::GIOPProtocolProperties)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_GIOPProtocolProperties,
+    &_tc_TAO_tc_RTCORBA_GIOPProtocolProperties
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::UnixDomainProtocolProperties::_tao_class_id = 0;
 
 RTCORBA::UnixDomainProtocolProperties_ptr
@@ -3271,13 +4182,23 @@ tao_RTCORBA_UnixDomainProtocolProperties_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_UnixDomainProtocolProperties_marshal (
+    RTCORBA::UnixDomainProtocolProperties_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::UnixDomainProtocolProperties_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (void) // default constructor
+RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (void)
   : ptr_ (UnixDomainProtocolProperties::_nil ())
 {}
 
@@ -3287,12 +4208,12 @@ RTCORBA::UnixDomainProtocolProperties_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (const ::RTCORBA::UnixDomainProtocolProperties_var &p) // copy constructor
+RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (const ::RTCORBA::UnixDomainProtocolProperties_var &p)
   : TAO_Base_var (),
     ptr_ (UnixDomainProtocolProperties::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::UnixDomainProtocolProperties_var::~UnixDomainProtocolProperties_var (void) // destructor
+RTCORBA::UnixDomainProtocolProperties_var::~UnixDomainProtocolProperties_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3321,7 +4242,7 @@ RTCORBA::UnixDomainProtocolProperties_var::operator const ::RTCORBA::UnixDomainP
   return this->ptr_;
 }
 
-RTCORBA::UnixDomainProtocolProperties_var::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast
+RTCORBA::UnixDomainProtocolProperties_var::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3396,10 +4317,11 @@ RTCORBA::UnixDomainProtocolProperties_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::UnixDomainProtocolProperties_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_ptr &p)
@@ -3408,14 +4330,14 @@ RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (Uni
   this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
 }
 
-RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_var &p) // constructor from _var
+RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
 }
 
-RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (const ::RTCORBA::UnixDomainProtocolProperties_out &p) // copy constructor
+RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (const ::RTCORBA::UnixDomainProtocolProperties_out &p)
   : ptr_ (ACE_const_cast (UnixDomainProtocolProperties_out &, p).ptr_)
 {}
 
@@ -3446,7 +4368,7 @@ RTCORBA::UnixDomainProtocolProperties_out::operator ::RTCORBA::UnixDomainProtoco
 }
 
 ::RTCORBA::UnixDomainProtocolProperties_ptr &
-RTCORBA::UnixDomainProtocolProperties_out::ptr (void) // ptr
+RTCORBA::UnixDomainProtocolProperties_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3457,9 +4379,8 @@ RTCORBA::UnixDomainProtocolProperties_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void)
 {}
@@ -3467,7 +4388,15 @@ RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void)
 RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void)
 {}
 
-RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_narrow (
+void 
+RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
+{
+  UnixDomainProtocolProperties *tmp = ACE_static_cast (UnixDomainProtocolProperties *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::UnixDomainProtocolProperties_ptr
+RTCORBA::UnixDomainProtocolProperties::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3475,62 +4404,82 @@ RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties:
   return UnixDomainProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::UnixDomainProtocolProperties_ptr
+RTCORBA::UnixDomainProtocolProperties_ptr 
 RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return UnixDomainProtocolProperties::_nil ();
+    {
+      return UnixDomainProtocolProperties::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           UnixDomainProtocolProperties_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &UnixDomainProtocolProperties::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &UnixDomainProtocolProperties::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::UnixDomainProtocolProperties_ptr
 RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::UnixDomainProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, UnixDomainProtocolProperties)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            RTCORBA::ProtocolProperties_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, UnixDomainProtocolProperties)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                RTCORBA::ProtocolProperties_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -3539,6 +4488,58 @@ const char* RTCORBA::UnixDomainProtocolProperties::_interface_repository_id (voi
   return "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_UnixDomainProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  53,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x556e6978), 
+  ACE_NTOHL (0x446f6d61), 
+  ACE_NTOHL (0x696e5072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c5072), 
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x74696573), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0
+    29,
+  ACE_NTOHL (0x556e6978), 
+  ACE_NTOHL (0x446f6d61), 
+  ACE_NTOHL (0x696e5072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c5072), 
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x74696573), 
+  ACE_NTOHL (0x0),  // name = UnixDomainProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_UnixDomainProtocolProperties),
+    (char *) &_oc_RTCORBA_UnixDomainProtocolProperties,
+    0,
+    sizeof (RTCORBA::UnixDomainProtocolProperties)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_UnixDomainProtocolProperties,
+    &_tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::SharedMemoryProtocolProperties::_tao_class_id = 0;
 
 RTCORBA::SharedMemoryProtocolProperties_ptr
@@ -3584,13 +4585,23 @@ tao_RTCORBA_SharedMemoryProtocolProperties_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_SharedMemoryProtocolProperties_marshal (
+    RTCORBA::SharedMemoryProtocolProperties_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::SharedMemoryProtocolProperties_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (void) // default constructor
+RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (void)
   : ptr_ (SharedMemoryProtocolProperties::_nil ())
 {}
 
@@ -3600,12 +4611,12 @@ RTCORBA::SharedMemoryProtocolProperties_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (const ::RTCORBA::SharedMemoryProtocolProperties_var &p) // copy constructor
+RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (const ::RTCORBA::SharedMemoryProtocolProperties_var &p)
   : TAO_Base_var (),
     ptr_ (SharedMemoryProtocolProperties::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::SharedMemoryProtocolProperties_var::~SharedMemoryProtocolProperties_var (void) // destructor
+RTCORBA::SharedMemoryProtocolProperties_var::~SharedMemoryProtocolProperties_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -3634,7 +4645,7 @@ RTCORBA::SharedMemoryProtocolProperties_var::operator const ::RTCORBA::SharedMem
   return this->ptr_;
 }
 
-RTCORBA::SharedMemoryProtocolProperties_var::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast
+RTCORBA::SharedMemoryProtocolProperties_var::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3709,10 +4720,11 @@ RTCORBA::SharedMemoryProtocolProperties_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::SharedMemoryProtocolProperties_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_ptr &p)
@@ -3721,14 +4733,14 @@ RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out
   this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
 }
 
-RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_var &p) // constructor from _var
+RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
 }
 
-RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (const ::RTCORBA::SharedMemoryProtocolProperties_out &p) // copy constructor
+RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (const ::RTCORBA::SharedMemoryProtocolProperties_out &p)
   : ptr_ (ACE_const_cast (SharedMemoryProtocolProperties_out &, p).ptr_)
 {}
 
@@ -3759,7 +4771,7 @@ RTCORBA::SharedMemoryProtocolProperties_out::operator ::RTCORBA::SharedMemoryPro
 }
 
 ::RTCORBA::SharedMemoryProtocolProperties_ptr &
-RTCORBA::SharedMemoryProtocolProperties_out::ptr (void) // ptr
+RTCORBA::SharedMemoryProtocolProperties_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -3770,9 +4782,8 @@ RTCORBA::SharedMemoryProtocolProperties_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void)
 {}
@@ -3780,7 +4791,15 @@ RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void)
 RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void)
 {}
 
-RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_narrow (
+void 
+RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
+{
+  SharedMemoryProtocolProperties *tmp = ACE_static_cast (SharedMemoryProtocolProperties *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::SharedMemoryProtocolProperties_ptr
+RTCORBA::SharedMemoryProtocolProperties::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -3788,62 +4807,82 @@ RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolPropert
   return SharedMemoryProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::SharedMemoryProtocolProperties_ptr
+RTCORBA::SharedMemoryProtocolProperties_ptr 
 RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return SharedMemoryProtocolProperties::_nil ();
+    {
+      return SharedMemoryProtocolProperties::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           SharedMemoryProtocolProperties_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &SharedMemoryProtocolProperties::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &SharedMemoryProtocolProperties::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::SharedMemoryProtocolProperties_ptr
 RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolProperties_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::SharedMemoryProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, SharedMemoryProtocolProperties)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            RTCORBA::ProtocolProperties_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, SharedMemoryProtocolProperties)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                RTCORBA::ProtocolProperties_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -3852,52 +4891,104 @@ const char* RTCORBA::SharedMemoryProtocolProperties::_interface_repository_id (v
   return "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_SharedMemoryProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  55,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x53686172), 
+  ACE_NTOHL (0x65644d65), 
+  ACE_NTOHL (0x6d6f7279), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0
+    31,
+  ACE_NTOHL (0x53686172), 
+  ACE_NTOHL (0x65644d65), 
+  ACE_NTOHL (0x6d6f7279), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65730000),  // name = SharedMemoryProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_SharedMemoryProtocolProperties),
+    (char *) &_oc_RTCORBA_SharedMemoryProtocolProperties,
+    0,
+    sizeof (RTCORBA::SharedMemoryProtocolProperties)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_SharedMemoryProtocolProperties,
+    &_tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x42616e64),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
-  13,
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x42616e64),
+    13,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
   ACE_NTOHL (0x0),  // name = PriorityBand
   2, // member count
-  4,
+    4,
   ACE_NTOHL (0x6c6f7700),  // name = low
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x5254434f),
-    ACE_NTOHL (0x5242412f),
-    ACE_NTOHL (0x5072696f),
-    ACE_NTOHL (0x72697479),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-    9,
-    ACE_NTOHL (0x5072696f),
-    ACE_NTOHL (0x72697479),
+        9,
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
     ACE_NTOHL (0x0),  // name = Priority
-    CORBA::tk_short,
+        CORBA::tk_short,
 
 
   5,
-  ACE_NTOHL (0x68696768),
+  ACE_NTOHL (0x68696768), 
   ACE_NTOHL (0x0),  // name = high
-  0xffffffff, // indirection
+    0xffffffff, // indirection
   0xffffffa8, // negative offset (-88)
 };
 
@@ -3911,15 +5002,24 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBand (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PriorityBand, &_tc_TAO_tc_RTCORBA_PriorityBand)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PriorityBand,
+    &_tc_TAO_tc_RTCORBA_PriorityBand
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void RTCORBA::PriorityBand::_tao_any_destructor (void *_tao_void_pointer)
 {
   PriorityBand *tmp = ACE_static_cast (PriorityBand*, _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)
 
@@ -3931,18 +5031,23 @@ RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_allocate_buffer (CORBA:
 {
   RTCORBA::PriorityBand* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (length);
-
+  
   if (this->buffer_ != 0)
-  {
-    RTCORBA::PriorityBand *old = ACE_reinterpret_cast (RTCORBA::PriorityBand *,this->buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp[i] = old[i];
-
-    if (this->release_)
-      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (old);
-
-  }
+    {
+      RTCORBA::PriorityBand *old =
+        ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (old);
+        }
+    }
+  
   this->buffer_ = tmp;
 }
 
@@ -3950,140 +5055,161 @@ void
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand *,this->buffer_);
-
+    {
+      return;
+    }
+  
+  RTCORBA::PriorityBand *tmp =
+    ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
   _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
   this->buffer_ = 0;
-}
+} 
 
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void) // Dtor.
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void)
 {
   this->_deallocate_buffer ();
 }
 
-
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_RTCORBA_PRIORITYBANDS_CS_)
 #define _RTCORBA_PRIORITYBANDS_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // RTCORBA::PriorityBands
 // *************************************************************
 
 RTCORBA::PriorityBands::PriorityBands (void)
 {}
-RTCORBA::PriorityBands::PriorityBands (CORBA::ULong max) // uses max size
-  :
+
+RTCORBA::PriorityBands::PriorityBands (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<RTCORBA::PriorityBand>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-RTCORBA::PriorityBands::PriorityBands (CORBA::ULong max, CORBA::ULong length, RTCORBA::PriorityBand *buffer, CORBA::Boolean release)
-  :
+
+RTCORBA::PriorityBands::PriorityBands (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    RTCORBA::PriorityBand *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<RTCORBA::PriorityBand>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-RTCORBA::PriorityBands::PriorityBands (const PriorityBands &seq) // copy ctor
-  :
+
+RTCORBA::PriorityBands::PriorityBands (const PriorityBands &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<RTCORBA::PriorityBand>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 RTCORBA::PriorityBands::~PriorityBands (void) // dtor
 {}
+
 void RTCORBA::PriorityBands::_tao_any_destructor (void *_tao_void_pointer)
 {
   PriorityBands *tmp = ACE_static_cast (PriorityBands*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x42616e64),
-  ACE_NTOHL (0x733a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x733a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBands:1.0
-  14,
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x42616e64),
+    14,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
   ACE_NTOHL (0x73000000),  // name = PriorityBands
-  CORBA::tk_sequence, // typecode kind
+    CORBA::tk_sequence, // typecode kind
   188, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     172, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       37,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x5254434f),
-      ACE_NTOHL (0x5242412f),
-      ACE_NTOHL (0x5072696f),
-      ACE_NTOHL (0x72697479),
-      ACE_NTOHL (0x42616e64),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x5254434f), 
+      ACE_NTOHL (0x5242412f), 
+      ACE_NTOHL (0x5072696f), 
+      ACE_NTOHL (0x72697479), 
+      ACE_NTOHL (0x42616e64), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
-      13,
-      ACE_NTOHL (0x5072696f),
-      ACE_NTOHL (0x72697479),
-      ACE_NTOHL (0x42616e64),
+            13,
+      ACE_NTOHL (0x5072696f), 
+      ACE_NTOHL (0x72697479), 
+      ACE_NTOHL (0x42616e64), 
       ACE_NTOHL (0x0),  // name = PriorityBand
       2, // member count
-      4,
+            4,
       ACE_NTOHL (0x6c6f7700),  // name = low
-      CORBA::tk_alias, // typecode kind for typedefs
+            CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x5254434f),
-        ACE_NTOHL (0x5242412f),
-        ACE_NTOHL (0x5072696f),
-        ACE_NTOHL (0x72697479),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-        9,
-        ACE_NTOHL (0x5072696f),
-        ACE_NTOHL (0x72697479),
+                9,
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
         ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
+                CORBA::tk_short,
 
 
       5,
-      ACE_NTOHL (0x68696768),
+      ACE_NTOHL (0x68696768), 
       ACE_NTOHL (0x0),  // name = high
-      0xffffffff, // indirection
+            0xffffffff, // indirection
       0xffffffa8, // negative offset (-88)
 
     0U,
@@ -4100,13 +5226,16 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBands (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_PriorityBands, &_tc_TAO_tc_RTCORBA_PriorityBands)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PriorityBands,
+    &_tc_TAO_tc_RTCORBA_PriorityBands
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIORITY_BANDED_CONNECTION_POLICY_TYPE, 45U)
-TAO_NAMESPACE_END
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::PriorityBandedConnectionPolicy::_tao_class_id = 0;
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
@@ -4152,13 +5281,23 @@ tao_RTCORBA_PriorityBandedConnectionPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_PriorityBandedConnectionPolicy_marshal (
+    RTCORBA::PriorityBandedConnectionPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::PriorityBandedConnectionPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (void) // default constructor
+RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (void)
   : ptr_ (PriorityBandedConnectionPolicy::_nil ())
 {}
 
@@ -4168,12 +5307,12 @@ RTCORBA::PriorityBandedConnectionPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p) // copy constructor
+RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (PriorityBandedConnectionPolicy::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::PriorityBandedConnectionPolicy_var::~PriorityBandedConnectionPolicy_var (void) // destructor
+RTCORBA::PriorityBandedConnectionPolicy_var::~PriorityBandedConnectionPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4202,7 +5341,7 @@ RTCORBA::PriorityBandedConnectionPolicy_var::operator const ::RTCORBA::PriorityB
   return this->ptr_;
 }
 
-RTCORBA::PriorityBandedConnectionPolicy_var::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast
+RTCORBA::PriorityBandedConnectionPolicy_var::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4277,10 +5416,11 @@ RTCORBA::PriorityBandedConnectionPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::PriorityBandedConnectionPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_ptr &p)
@@ -4289,14 +5429,14 @@ RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out
   this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
 }
 
-RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_var &p) // constructor from _var
+RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
 }
 
-RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (const ::RTCORBA::PriorityBandedConnectionPolicy_out &p) // copy constructor
+RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (const ::RTCORBA::PriorityBandedConnectionPolicy_out &p)
   : ptr_ (ACE_const_cast (PriorityBandedConnectionPolicy_out &, p).ptr_)
 {}
 
@@ -4327,7 +5467,7 @@ RTCORBA::PriorityBandedConnectionPolicy_out::operator ::RTCORBA::PriorityBandedC
 }
 
 ::RTCORBA::PriorityBandedConnectionPolicy_ptr &
-RTCORBA::PriorityBandedConnectionPolicy_out::ptr (void) // ptr
+RTCORBA::PriorityBandedConnectionPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4338,9 +5478,8 @@ RTCORBA::PriorityBandedConnectionPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void)
 {}
@@ -4348,7 +5487,15 @@ RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void)
 RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void)
 {}
 
-RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_narrow (
+void 
+RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  PriorityBandedConnectionPolicy *tmp = ACE_static_cast (PriorityBandedConnectionPolicy *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4356,62 +5503,82 @@ RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPol
   return PriorityBandedConnectionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_ptr 
 RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return PriorityBandedConnectionPolicy::_nil ();
+    {
+      return PriorityBandedConnectionPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           PriorityBandedConnectionPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &PriorityBandedConnectionPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &PriorityBandedConnectionPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
 RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::PriorityBandedConnectionPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, PriorityBandedConnectionPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, PriorityBandedConnectionPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -4420,6 +5587,58 @@ const char* RTCORBA::PriorityBandedConnectionPolicy::_interface_repository_id (v
   return "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_PriorityBandedConnectionPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  55,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6e6e6563), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0
+    31,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6e6e6563), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63790000),  // name = PriorityBandedConnectionPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_PriorityBandedConnectionPolicy),
+    (char *) &_oc_RTCORBA_PriorityBandedConnectionPolicy,
+    0,
+    sizeof (RTCORBA::PriorityBandedConnectionPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_PriorityBandedConnectionPolicy,
+    &_tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::Current::_tao_class_id = 0;
 
 RTCORBA::Current_ptr
@@ -4465,13 +5684,23 @@ tao_RTCORBA_Current_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_Current_marshal (
+    RTCORBA::Current_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::Current_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::Current_var::Current_var (void) // default constructor
+RTCORBA::Current_var::Current_var (void)
   : ptr_ (Current::_nil ())
 {}
 
@@ -4481,12 +5710,12 @@ RTCORBA::Current_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::Current_var::Current_var (const ::RTCORBA::Current_var &p) // copy constructor
+RTCORBA::Current_var::Current_var (const ::RTCORBA::Current_var &p)
   : TAO_Base_var (),
     ptr_ (Current::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::Current_var::~Current_var (void) // destructor
+RTCORBA::Current_var::~Current_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4515,7 +5744,7 @@ RTCORBA::Current_var::operator const ::RTCORBA::Current_ptr &() const // cast
   return this->ptr_;
 }
 
-RTCORBA::Current_var::operator ::RTCORBA::Current_ptr &() // cast
+RTCORBA::Current_var::operator ::RTCORBA::Current_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4590,10 +5819,11 @@ RTCORBA::Current_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::Current_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::Current_out::Current_out (Current_ptr &p)
@@ -4602,14 +5832,14 @@ RTCORBA::Current_out::Current_out (Current_ptr &p)
   this->ptr_ = ::RTCORBA::Current::_nil ();
 }
 
-RTCORBA::Current_out::Current_out (Current_var &p) // constructor from _var
+RTCORBA::Current_out::Current_out (Current_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::Current::_nil ();
 }
 
-RTCORBA::Current_out::Current_out (const ::RTCORBA::Current_out &p) // copy constructor
+RTCORBA::Current_out::Current_out (const ::RTCORBA::Current_out &p)
   : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
 {}
 
@@ -4640,7 +5870,7 @@ RTCORBA::Current_out::operator ::RTCORBA::Current_ptr &() // cast
 }
 
 ::RTCORBA::Current_ptr &
-RTCORBA::Current_out::ptr (void) // ptr
+RTCORBA::Current_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4651,9 +5881,8 @@ RTCORBA::Current_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::Current::Current (void)
 {}
@@ -4661,7 +5890,15 @@ RTCORBA::Current::Current (void)
 RTCORBA::Current::~Current (void)
 {}
 
-RTCORBA::Current_ptr RTCORBA::Current::_narrow (
+void 
+RTCORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::Current_ptr
+RTCORBA::Current::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4669,62 +5906,82 @@ RTCORBA::Current_ptr RTCORBA::Current::_narrow (
   return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::Current_ptr
+RTCORBA::Current_ptr 
 RTCORBA::Current::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return Current::_nil ();
+    {
+      return Current::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Current_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Current::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Current::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::Current_ptr
 RTCORBA::Current::_duplicate (Current_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::Current::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, Current)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Current::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Current_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, Current)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Current::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Current_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -4733,6 +5990,46 @@ const char* RTCORBA::Current::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/Current:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_Current[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  32,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/Current:1.0
+    8,
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_Current),
+    (char *) &_oc_RTCORBA_Current,
+    0,
+    sizeof (RTCORBA::Current)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Current,
+    &_tc_TAO_tc_RTCORBA_Current
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::Mutex::_tao_class_id = 0;
 
 RTCORBA::Mutex_ptr
@@ -4778,13 +6075,23 @@ tao_RTCORBA_Mutex_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_Mutex_marshal (
+    RTCORBA::Mutex_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::Mutex_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::Mutex_var::Mutex_var (void) // default constructor
+RTCORBA::Mutex_var::Mutex_var (void)
   : ptr_ (Mutex::_nil ())
 {}
 
@@ -4794,12 +6101,12 @@ RTCORBA::Mutex_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::Mutex_var::Mutex_var (const ::RTCORBA::Mutex_var &p) // copy constructor
+RTCORBA::Mutex_var::Mutex_var (const ::RTCORBA::Mutex_var &p)
   : TAO_Base_var (),
     ptr_ (Mutex::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::Mutex_var::~Mutex_var (void) // destructor
+RTCORBA::Mutex_var::~Mutex_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -4828,7 +6135,7 @@ RTCORBA::Mutex_var::operator const ::RTCORBA::Mutex_ptr &() const // cast
   return this->ptr_;
 }
 
-RTCORBA::Mutex_var::operator ::RTCORBA::Mutex_ptr &() // cast
+RTCORBA::Mutex_var::operator ::RTCORBA::Mutex_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4903,10 +6210,11 @@ RTCORBA::Mutex_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::Mutex_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::Mutex_out::Mutex_out (Mutex_ptr &p)
@@ -4915,14 +6223,14 @@ RTCORBA::Mutex_out::Mutex_out (Mutex_ptr &p)
   this->ptr_ = ::RTCORBA::Mutex::_nil ();
 }
 
-RTCORBA::Mutex_out::Mutex_out (Mutex_var &p) // constructor from _var
+RTCORBA::Mutex_out::Mutex_out (Mutex_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::Mutex::_nil ();
 }
 
-RTCORBA::Mutex_out::Mutex_out (const ::RTCORBA::Mutex_out &p) // copy constructor
+RTCORBA::Mutex_out::Mutex_out (const ::RTCORBA::Mutex_out &p)
   : ptr_ (ACE_const_cast (Mutex_out &, p).ptr_)
 {}
 
@@ -4953,7 +6261,7 @@ RTCORBA::Mutex_out::operator ::RTCORBA::Mutex_ptr &() // cast
 }
 
 ::RTCORBA::Mutex_ptr &
-RTCORBA::Mutex_out::ptr (void) // ptr
+RTCORBA::Mutex_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -4964,9 +6272,8 @@ RTCORBA::Mutex_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::Mutex::Mutex (void)
 {}
@@ -4974,7 +6281,15 @@ RTCORBA::Mutex::Mutex (void)
 RTCORBA::Mutex::~Mutex (void)
 {}
 
-RTCORBA::Mutex_ptr RTCORBA::Mutex::_narrow (
+void 
+RTCORBA::Mutex::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Mutex *tmp = ACE_static_cast (Mutex *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::Mutex_ptr
+RTCORBA::Mutex::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -4982,50 +6297,68 @@ RTCORBA::Mutex_ptr RTCORBA::Mutex::_narrow (
   return Mutex::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::Mutex_ptr
+RTCORBA::Mutex_ptr 
 RTCORBA::Mutex::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return Mutex::_nil ();
+    {
+      return Mutex::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           Mutex_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Mutex::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &Mutex::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::Mutex_ptr
 RTCORBA::Mutex::_duplicate (Mutex_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::Mutex::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, Mutex)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, Mutex)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -5034,6 +6367,46 @@ const char* RTCORBA::Mutex::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/Mutex:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_Mutex[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  30,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x4d757465), 
+  ACE_NTOHL (0x783a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/Mutex:1.0
+    6,
+  ACE_NTOHL (0x4d757465), 
+  ACE_NTOHL (0x78000000),  // name = Mutex
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Mutex (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_Mutex),
+    (char *) &_oc_RTCORBA_Mutex,
+    0,
+    sizeof (RTCORBA::Mutex)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_Mutex,
+    &_tc_TAO_tc_RTCORBA_Mutex
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTCORBA::RTORB::_tao_class_id = 0;
 
 RTCORBA::RTORB_ptr
@@ -5079,13 +6452,23 @@ tao_RTCORBA_RTORB_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_RTCORBA_RTORB_marshal (
+    RTCORBA::RTORB_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // RTCORBA::RTORB_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-RTCORBA::RTORB_var::RTORB_var (void) // default constructor
+RTCORBA::RTORB_var::RTORB_var (void)
   : ptr_ (RTORB::_nil ())
 {}
 
@@ -5095,12 +6478,12 @@ RTCORBA::RTORB_var::ptr (void) const
   return this->ptr_;
 }
 
-RTCORBA::RTORB_var::RTORB_var (const ::RTCORBA::RTORB_var &p) // copy constructor
+RTCORBA::RTORB_var::RTORB_var (const ::RTCORBA::RTORB_var &p)
   : TAO_Base_var (),
     ptr_ (RTORB::_duplicate (p.ptr ()))
 {}
 
-RTCORBA::RTORB_var::~RTORB_var (void) // destructor
+RTCORBA::RTORB_var::~RTORB_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -5129,7 +6512,7 @@ RTCORBA::RTORB_var::operator const ::RTCORBA::RTORB_ptr &() const // cast
   return this->ptr_;
 }
 
-RTCORBA::RTORB_var::operator ::RTCORBA::RTORB_ptr &() // cast
+RTCORBA::RTORB_var::operator ::RTCORBA::RTORB_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -5204,10 +6587,11 @@ RTCORBA::RTORB_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // RTCORBA::RTORB_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 RTCORBA::RTORB_out::RTORB_out (RTORB_ptr &p)
@@ -5216,14 +6600,14 @@ RTCORBA::RTORB_out::RTORB_out (RTORB_ptr &p)
   this->ptr_ = ::RTCORBA::RTORB::_nil ();
 }
 
-RTCORBA::RTORB_out::RTORB_out (RTORB_var &p) // constructor from _var
+RTCORBA::RTORB_out::RTORB_out (RTORB_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTCORBA::RTORB::_nil ();
 }
 
-RTCORBA::RTORB_out::RTORB_out (const ::RTCORBA::RTORB_out &p) // copy constructor
+RTCORBA::RTORB_out::RTORB_out (const ::RTCORBA::RTORB_out &p)
   : ptr_ (ACE_const_cast (RTORB_out &, p).ptr_)
 {}
 
@@ -5254,7 +6638,7 @@ RTCORBA::RTORB_out::operator ::RTCORBA::RTORB_ptr &() // cast
 }
 
 ::RTCORBA::RTORB_ptr &
-RTCORBA::RTORB_out::ptr (void) // ptr
+RTCORBA::RTORB_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -5265,9 +6649,8 @@ RTCORBA::RTORB_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:209
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 RTCORBA::RTORB::RTORB (void)
 {}
@@ -5275,7 +6658,15 @@ RTCORBA::RTORB::RTORB (void)
 RTCORBA::RTORB::~RTORB (void)
 {}
 
-RTCORBA::RTORB_ptr RTCORBA::RTORB::_narrow (
+void 
+RTCORBA::RTORB::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RTORB *tmp = ACE_static_cast (RTORB *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTCORBA::RTORB_ptr
+RTCORBA::RTORB::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -5283,50 +6674,68 @@ RTCORBA::RTORB_ptr RTCORBA::RTORB::_narrow (
   return RTORB::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::RTORB_ptr
+RTCORBA::RTORB_ptr 
 RTCORBA::RTORB::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return RTORB::_nil ();
+    {
+      return RTORB::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           RTORB_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &RTORB::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &RTORB::_tao_class_id
+                )
+            )
         );
 }
 
 RTCORBA::RTORB_ptr
 RTCORBA::RTORB::_duplicate (RTORB_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTCORBA::RTORB::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, RTORB)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTCORBA, RTORB)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -5335,27 +6744,29 @@ const char* RTCORBA::RTORB::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/RTORB:1.0";
 }
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void)
-  : CORBA::UserException ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0",
-                          "MutexNotFound")
+  : CORBA::UserException (
+        "IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0",
+        "MutexNotFound"
+      )
 {
 }
 
-// Destructor - all members are of self managing types.
 RTCORBA::RTORB::MutexNotFound::~MutexNotFound (void)
 {
 }
 
-// Copy constructor.
 RTCORBA::RTORB::MutexNotFound::MutexNotFound (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp)
-  : CORBA::UserException (_tao_excp._rep_id () ,
-                          _tao_excp._name ()
-)
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
-// Assignment operator.
 RTCORBA::RTORB::MutexNotFound&
 RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp)
 {
@@ -5363,12 +6774,18 @@ RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound
   return *this;
 }
 
+void RTCORBA::RTORB::MutexNotFound::_tao_any_destructor (void *_tao_void_pointer)
+{
+  MutexNotFound *tmp = ACE_static_cast (MutexNotFound*, _tao_void_pointer);
+  delete tmp;
+}
+
 RTCORBA::RTORB::MutexNotFound *
-RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception *exc)
+RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (MutexNotFound *, exc);
+      return ACE_dynamic_cast (MutexNotFound *, _tao_excp);
     }
   else
     {
@@ -5389,13 +6806,13 @@ RTCORBA::RTORB::MutexNotFound::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      RTCORBA::RTORB::MutexNotFound (*this),
+      ::RTCORBA::RTORB::MutexNotFound (*this),
       0
     );
   return result;
 }
 
-void RTCORBA::RTORB::MutexNotFound::_raise ()
+void RTCORBA::RTORB::MutexNotFound::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5416,28 +6833,72 @@ void RTCORBA::RTORB::MutexNotFound::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// Default constructor.
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_type (void) const
+{
+  return ::RTCORBA::RTORB::_tc_MutexNotFound;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_RTORB_MutexNotFound[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x52544f52), 
+  ACE_NTOHL (0x422f4d75), 
+  ACE_NTOHL (0x7465784e), 
+  ACE_NTOHL (0x6f74466f), 
+  ACE_NTOHL (0x756e643a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0
+    14,
+  ACE_NTOHL (0x4d757465), 
+  ACE_NTOHL (0x784e6f74), 
+  ACE_NTOHL (0x466f756e), 
+  ACE_NTOHL (0x64000000),  // name = MutexNotFound
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_MutexNotFound (
+    CORBA::tk_except,
+    sizeof (_oc_RTCORBA_RTORB_MutexNotFound),
+    (char *) &_oc_RTCORBA_RTORB_MutexNotFound,
+    0,
+    sizeof (RTCORBA::RTORB::MutexNotFound)
+  );
+
+::CORBA::TypeCode_ptr RTCORBA::RTORB::_tc_MutexNotFound =
+  &_tc_TAO_tc_RTCORBA_RTORB_MutexNotFound;
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void)
-  : CORBA::UserException ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0",
-                          "InvalidThreadpool"
-                          )
+  : CORBA::UserException (
+        "IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0",
+        "InvalidThreadpool"
+      )
 {
 }
 
-// Destructor - all members are of self managing types.
 RTCORBA::RTORB::InvalidThreadpool::~InvalidThreadpool (void)
 {
 }
 
-// Copy constructor.
 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp)
-  : CORBA::UserException (_tao_excp._rep_id (),
-                          _tao_excp._name ()
-                         )
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
 {
 }
 
-// Assignment operator.
 RTCORBA::RTORB::InvalidThreadpool&
 RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp)
 {
@@ -5445,12 +6906,18 @@ RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThr
   return *this;
 }
 
+void RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor (void *_tao_void_pointer)
+{
+  InvalidThreadpool *tmp = ACE_static_cast (InvalidThreadpool*, _tao_void_pointer);
+  delete tmp;
+}
+
 RTCORBA::RTORB::InvalidThreadpool *
-RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception *exc)
+RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InvalidThreadpool *, exc);
+      return ACE_dynamic_cast (InvalidThreadpool *, _tao_excp);
     }
   else
     {
@@ -5471,13 +6938,13 @@ RTCORBA::RTORB::InvalidThreadpool::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      RTCORBA::RTORB::InvalidThreadpool (*this),
+      ::RTCORBA::RTORB::InvalidThreadpool (*this),
       0
     );
   return result;
 }
 
-void RTCORBA::RTORB::InvalidThreadpool::_raise ()
+void RTCORBA::RTORB::InvalidThreadpool::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -5498,513 +6965,1094 @@ void RTCORBA::RTORB::InvalidThreadpool::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-void operator<<= (CORBA::Any &_tao_any, const RTCORBA::ThreadpoolLane &_tao_elem) // copying
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr RTCORBA::RTORB::InvalidThreadpool::_type (void) const
+{
+  return ::RTCORBA::RTORB::_tc_InvalidThreadpool;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_RTORB_InvalidThreadpool[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x52544f52), 
+  ACE_NTOHL (0x422f496e), 
+  ACE_NTOHL (0x76616c69), 
+  ACE_NTOHL (0x64546872), 
+  ACE_NTOHL (0x65616470), 
+  ACE_NTOHL (0x6f6f6c3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0
+    18,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696454), 
+  ACE_NTOHL (0x68726561), 
+  ACE_NTOHL (0x64706f6f), 
+  ACE_NTOHL (0x6c000000),  // name = InvalidThreadpool
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_InvalidThreadpool (
+    CORBA::tk_except,
+    sizeof (_oc_RTCORBA_RTORB_InvalidThreadpool),
+    (char *) &_oc_RTCORBA_RTORB_InvalidThreadpool,
+    0,
+    sizeof (RTCORBA::RTORB::InvalidThreadpool)
+  );
+
+::CORBA::TypeCode_ptr RTCORBA::RTORB::_tc_InvalidThreadpool =
+  &_tc_TAO_tc_RTCORBA_RTORB_InvalidThreadpool;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTCORBA_RTORB[] =
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  30,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x52544f52), 
+  ACE_NTOHL (0x423a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/RTORB:1.0
+    6,
+  ACE_NTOHL (0x52544f52), 
+  ACE_NTOHL (0x42000000),  // name = RTORB
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_RTORB),
+    (char *) &_oc_RTCORBA_RTORB,
+    0,
+    sizeof (RTCORBA::RTORB)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_RTORB,
+    &_tc_TAO_tc_RTCORBA_RTORB
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const RTCORBA::ThreadpoolLane &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>::insert_copy (
+      _tao_any,
+      RTCORBA::ThreadpoolLane::_tao_any_destructor,
       RTCORBA::_tc_ThreadpoolLane,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, RTCORBA::ThreadpoolLane *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolLane *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>::insert (
+      _tao_any,
+      RTCORBA::ThreadpoolLane::_tao_any_destructor,
       RTCORBA::_tc_ThreadpoolLane,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      RTCORBA::ThreadpoolLane::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, RTCORBA::ThreadpoolLane *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolLane *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const RTCORBA::ThreadpoolLane*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::ThreadpoolLane *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::ThreadpoolLane *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::ThreadpoolLane *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLane ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>::extract (
+        _tao_any,
+        RTCORBA::ThreadpoolLane::_tao_any_destructor,
+        RTCORBA::_tc_ThreadpoolLane,
+        _tao_elem
+      );
+}
 
-    if (!result)
-      return 0; // not equivalent
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const RTCORBA::ThreadpoolLane*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      RTCORBA::ThreadpoolLane *tmp;
-      ACE_NEW_RETURN (tmp, RTCORBA::ThreadpoolLane, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            RTCORBA::_tc_ThreadpoolLane,
-            1,
-            ACE_static_cast (void *, tmp),
-            RTCORBA::ThreadpoolLane::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const RTCORBA::ThreadpoolLanes &_tao_elem
-  ) // copying
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        RTCORBA::_tc_ThreadpoolLanes,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::insert_copy (
+      _tao_any,
+      RTCORBA::ThreadpoolLanes::_tao_any_destructor,
+      RTCORBA::_tc_ThreadpoolLanes,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, RTCORBA::ThreadpoolLanes *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolLanes *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::insert (
+      _tao_any,
+      RTCORBA::ThreadpoolLanes::_tao_any_destructor,
       RTCORBA::_tc_ThreadpoolLanes,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      RTCORBA::ThreadpoolLanes::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, RTCORBA::ThreadpoolLanes *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolLanes *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const RTCORBA::ThreadpoolLanes*&,
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::ThreadpoolLanes *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::ThreadpoolLanes *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::ThreadpoolLanes *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLanes ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const RTCORBA::ThreadpoolLanes*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      RTCORBA::ThreadpoolLanes *tmp;
-      ACE_NEW_RETURN (tmp, RTCORBA::ThreadpoolLanes, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            RTCORBA::_tc_ThreadpoolLanes,
-            1,
-            ACE_static_cast (void *, tmp),
-            RTCORBA::ThreadpoolLanes::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::extract (
+        _tao_any,
+        RTCORBA::ThreadpoolLanes::_tao_any_destructor,
+        RTCORBA::_tc_ThreadpoolLanes,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, RTCORBA::PriorityModel _tao_elem)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PriorityModel _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::insert (
+      _tao_any,
       RTCORBA::_tc_PriorityModel,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, RTCORBA::PriorityModel &_tao_elem)
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::PriorityModel &_tao_elem
+  )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityModel ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
+  return
+    TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::extract (
+        _tao_any,
+        RTCORBA::_tc_PriorityModel,
+        _tao_elem 
       );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<RTCORBA::PriorityModelPolicy,RTCORBA::PriorityModelPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::PriorityModelPolicy,RTCORBA::PriorityModelPolicy_var>
+  template class TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    RTCORBA::PriorityModelPolicy_ptr _tao_elem
+  )
+{
+  RTCORBA::PriorityModelPolicy_ptr _tao_objptr =
+    RTCORBA::PriorityModelPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PriorityModelPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::insert (
+      _tao_any,
+      RTCORBA::PriorityModelPolicy::_tao_any_destructor,
+      RTCORBA::_tc_PriorityModelPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::PriorityModelPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::extract (
+        _tao_any,
+        RTCORBA::PriorityModelPolicy::_tao_any_destructor,
+        RTCORBA::_tc_PriorityModelPolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::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<RTCORBA::ThreadpoolPolicy,RTCORBA::ThreadpoolPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::ThreadpoolPolicy,RTCORBA::ThreadpoolPolicy_var>
+  template class TAO_Object_Manager<RTCORBA::PriorityModelPolicy,RTCORBA::PriorityModelPolicy_var>;
+  template class TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::PriorityModelPolicy, RTCORBA::PriorityModelPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    RTCORBA::ThreadpoolPolicy_ptr _tao_elem
+  )
+{
+  RTCORBA::ThreadpoolPolicy_ptr _tao_objptr =
+    RTCORBA::ThreadpoolPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::insert (
+      _tao_any,
+      RTCORBA::ThreadpoolPolicy::_tao_any_destructor,
+      RTCORBA::_tc_ThreadpoolPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::extract (
+        _tao_any,
+        RTCORBA::ThreadpoolPolicy::_tao_any_destructor,
+        RTCORBA::_tc_ThreadpoolPolicy,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<RTCORBA::ProtocolProperties,RTCORBA::ProtocolProperties_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::ProtocolProperties,RTCORBA::ProtocolProperties_var>
+  template class TAO_Object_Manager<RTCORBA::ThreadpoolPolicy,RTCORBA::ThreadpoolPolicy_var>;
+  template class TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::ThreadpoolPolicy, RTCORBA::ThreadpoolPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    RTCORBA::ProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::ProtocolProperties_ptr _tao_objptr =
+    RTCORBA::ProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ProtocolProperties_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::ProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_ProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::ProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_ProtocolProperties,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::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<RTCORBA::ServerProtocolPolicy,RTCORBA::ServerProtocolPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::ServerProtocolPolicy,RTCORBA::ServerProtocolPolicy_var>
+  template class TAO_Object_Manager<RTCORBA::ProtocolProperties,RTCORBA::ProtocolProperties_var>;
+  template class TAO::Any_Impl_T<RTCORBA::ProtocolProperties>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::ProtocolProperties, RTCORBA::ProtocolProperties_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::ProtocolProperties>
 #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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const RTCORBA::Protocol &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::insert_copy (
+      _tao_any,
+      RTCORBA::Protocol::_tao_any_destructor,
+      RTCORBA::_tc_Protocol,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::Protocol *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::insert (
+      _tao_any,
+      RTCORBA::Protocol::_tao_any_destructor,
+      RTCORBA::_tc_Protocol,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::Protocol *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::Protocol *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::Protocol *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::extract (
+        _tao_any,
+        RTCORBA::Protocol::_tao_any_destructor,
+        RTCORBA::_tc_Protocol,
+        _tao_elem
+      );
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<RTCORBA::ClientProtocolPolicy,RTCORBA::ClientProtocolPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::ClientProtocolPolicy,RTCORBA::ClientProtocolPolicy_var>
+  template class TAO::Any_Dual_Impl_T<RTCORBA::Protocol>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<RTCORBA::Protocol>
 #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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const RTCORBA::ProtocolList &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::insert_copy (
+      _tao_any,
+      RTCORBA::ProtocolList::_tao_any_destructor,
+      RTCORBA::_tc_ProtocolList,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ProtocolList *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::insert (
+      _tao_any,
+      RTCORBA::ProtocolList::_tao_any_destructor,
+      RTCORBA::_tc_ProtocolList,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ProtocolList *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::ProtocolList *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::ProtocolList *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::extract (
+        _tao_any,
+        RTCORBA::ProtocolList::_tao_any_destructor,
+        RTCORBA::_tc_ProtocolList,
+        _tao_elem
+      );
+}
+
+// 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,
+    RTCORBA::ServerProtocolPolicy_ptr _tao_elem
+  )
+{
+  RTCORBA::ServerProtocolPolicy_ptr _tao_objptr =
+    RTCORBA::ServerProtocolPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ServerProtocolPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::insert (
+      _tao_any,
+      RTCORBA::ServerProtocolPolicy::_tao_any_destructor,
+      RTCORBA::_tc_ServerProtocolPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ServerProtocolPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::extract (
+        _tao_any,
+        RTCORBA::ServerProtocolPolicy::_tao_any_destructor,
+        RTCORBA::_tc_ServerProtocolPolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::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<RTCORBA::PrivateConnectionPolicy,RTCORBA::PrivateConnectionPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::PrivateConnectionPolicy,RTCORBA::PrivateConnectionPolicy_var>
+  template class TAO_Object_Manager<RTCORBA::ServerProtocolPolicy,RTCORBA::ServerProtocolPolicy_var>;
+  template class TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::ServerProtocolPolicy, RTCORBA::ServerProtocolPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    RTCORBA::ClientProtocolPolicy_ptr _tao_elem
+  )
+{
+  RTCORBA::ClientProtocolPolicy_ptr _tao_objptr =
+    RTCORBA::ClientProtocolPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ClientProtocolPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::insert (
+      _tao_any,
+      RTCORBA::ClientProtocolPolicy::_tao_any_destructor,
+      RTCORBA::_tc_ClientProtocolPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ClientProtocolPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::extract (
+        _tao_any,
+        RTCORBA::ClientProtocolPolicy::_tao_any_destructor,
+        RTCORBA::_tc_ClientProtocolPolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::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<RTCORBA::TCPProtocolProperties,RTCORBA::TCPProtocolProperties_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::TCPProtocolProperties,RTCORBA::TCPProtocolProperties_var>
+  template class TAO_Object_Manager<RTCORBA::ClientProtocolPolicy,RTCORBA::ClientProtocolPolicy_var>;
+  template class TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::ClientProtocolPolicy, RTCORBA::ClientProtocolPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    RTCORBA::PrivateConnectionPolicy_ptr _tao_elem
+  )
+{
+  RTCORBA::PrivateConnectionPolicy_ptr _tao_objptr =
+    RTCORBA::PrivateConnectionPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PrivateConnectionPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::insert (
+      _tao_any,
+      RTCORBA::PrivateConnectionPolicy::_tao_any_destructor,
+      RTCORBA::_tc_PrivateConnectionPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::PrivateConnectionPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::extract (
+        _tao_any,
+        RTCORBA::PrivateConnectionPolicy::_tao_any_destructor,
+        RTCORBA::_tc_PrivateConnectionPolicy,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::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<RTCORBA::GIOPProtocolProperties,RTCORBA::GIOPProtocolProperties_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::GIOPProtocolProperties,RTCORBA::GIOPProtocolProperties_var>
+  template class TAO_Object_Manager<RTCORBA::PrivateConnectionPolicy,RTCORBA::PrivateConnectionPolicy_var>;
+  template class TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::PrivateConnectionPolicy, RTCORBA::PrivateConnectionPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    RTCORBA::TCPProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::TCPProtocolProperties_ptr _tao_objptr =
+    RTCORBA::TCPProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::TCPProtocolProperties_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::TCPProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_TCPProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::TCPProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::TCPProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_TCPProtocolProperties,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::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<RTCORBA::UnixDomainProtocolProperties,RTCORBA::UnixDomainProtocolProperties_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::UnixDomainProtocolProperties,RTCORBA::UnixDomainProtocolProperties_var>
+  template class TAO_Object_Manager<RTCORBA::TCPProtocolProperties,RTCORBA::TCPProtocolProperties_var>;
+  template class TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::TCPProtocolProperties, RTCORBA::TCPProtocolProperties_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    RTCORBA::GIOPProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::GIOPProtocolProperties_ptr _tao_objptr =
+    RTCORBA::GIOPProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::GIOPProtocolProperties_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::GIOPProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_GIOPProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::GIOPProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::GIOPProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_GIOPProtocolProperties,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::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<RTCORBA::SharedMemoryProtocolProperties,RTCORBA::SharedMemoryProtocolProperties_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::SharedMemoryProtocolProperties,RTCORBA::SharedMemoryProtocolProperties_var>
+  template class TAO_Object_Manager<RTCORBA::GIOPProtocolProperties,RTCORBA::GIOPProtocolProperties_var>;
+  template class TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::GIOPProtocolProperties, RTCORBA::GIOPProtocolProperties_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const RTCORBA::PriorityBand &_tao_elem) // copying
+// 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,
+    RTCORBA::UnixDomainProtocolProperties_ptr _tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      RTCORBA::_tc_PriorityBand,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
+  RTCORBA::UnixDomainProtocolProperties_ptr _tao_objptr =
+    RTCORBA::UnixDomainProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (CORBA::Any &_tao_any, RTCORBA::PriorityBand *_tao_elem) // non copying
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::UnixDomainProtocolProperties_ptr *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      RTCORBA::_tc_PriorityBand,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      RTCORBA::PriorityBand::_tao_any_destructor
+  TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_UnixDomainProtocolProperties,
+      *_tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, RTCORBA::PriorityBand *&_tao_elem)
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::UnixDomainProtocolProperties_ptr &_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const RTCORBA::PriorityBand*&,_tao_elem);
+  return
+    TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_UnixDomainProtocolProperties,
+        _tao_elem
+      );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::PriorityBand *&_tao_elem)
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
 
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBand ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO_Object_Manager<RTCORBA::UnixDomainProtocolProperties,RTCORBA::UnixDomainProtocolProperties_var>;
+  template class TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::UnixDomainProtocolProperties, RTCORBA::UnixDomainProtocolProperties_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    if (!result)
-      return 0; // not equivalent
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const RTCORBA::PriorityBand*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      RTCORBA::PriorityBand *tmp;
-      ACE_NEW_RETURN (tmp, RTCORBA::PriorityBand, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            RTCORBA::_tc_PriorityBand,
-            1,
-            ACE_static_cast (void *, tmp),
-            RTCORBA::PriorityBand::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::SharedMemoryProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::SharedMemoryProtocolProperties_ptr _tao_objptr =
+    RTCORBA::SharedMemoryProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
-    const RTCORBA::PriorityBands &_tao_elem
-  ) // copying
+    RTCORBA::SharedMemoryProtocolProperties_ptr *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        RTCORBA::_tc_PriorityBands,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
+  TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_SharedMemoryProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::SharedMemoryProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_SharedMemoryProtocolProperties,
+        _tao_elem
       );
-  }
 }
 
-void operator<<= (CORBA::Any &_tao_any, RTCORBA::PriorityBands *_tao_elem) // non copying
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      RTCORBA::_tc_PriorityBands,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      RTCORBA::PriorityBands::_tao_any_destructor
-    );
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, RTCORBA::PriorityBands *&_tao_elem)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO_Object_Manager<RTCORBA::SharedMemoryProtocolProperties,RTCORBA::SharedMemoryProtocolProperties_var>;
+  template class TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::SharedMemoryProtocolProperties, RTCORBA::SharedMemoryProtocolProperties_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>
+#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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const RTCORBA::PriorityBand &_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const RTCORBA::PriorityBands*&,
+  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>::insert_copy (
+      _tao_any,
+      RTCORBA::PriorityBand::_tao_any_destructor,
+      RTCORBA::_tc_PriorityBand,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::PriorityBands *&_tao_elem)
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PriorityBand *_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBands ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>::insert (
+      _tao_any,
+      RTCORBA::PriorityBand::_tao_any_destructor,
+      RTCORBA::_tc_PriorityBand,
+      _tao_elem
+    );
+}
 
-    if (!result)
-      return 0; // not equivalent
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::PriorityBand *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::PriorityBand *&,
+      _tao_elem
+    );
+}
 
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const RTCORBA::PriorityBands*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      RTCORBA::PriorityBands *tmp;
-      ACE_NEW_RETURN (tmp, RTCORBA::PriorityBands, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            RTCORBA::_tc_PriorityBands,
-            1,
-            ACE_static_cast (void *, tmp),
-            RTCORBA::PriorityBands::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::PriorityBand *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>::extract (
+        _tao_any,
+        RTCORBA::PriorityBand::_tao_any_destructor,
+        RTCORBA::_tc_PriorityBand,
+        _tao_elem
+      );
 }
 
-// TAO_IDL - Generated from
-// C:\irfan\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:57
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>
+#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
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const RTCORBA::ProtocolList &_tao_elem
+    const RTCORBA::PriorityBands &_tao_elem
   )
 {
-  RTCORBA::ProtocolList *_tao_elem_copy = 0;
-  ACE_NEW (
-      _tao_elem_copy,
-      RTCORBA::ProtocolList (_tao_elem)
-    );
-
-  _tao_any._tao_replace (
-      RTCORBA::_tc_ProtocolList,
-      1,
-      _tao_elem_copy,
-      RTCORBA::ProtocolList::_tao_any_destructor
+  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::insert_copy (
+      _tao_any,
+      RTCORBA::PriorityBands::_tao_any_destructor,
+      RTCORBA::_tc_PriorityBands,
+      _tao_elem
     );
-
-  _tao_any.contains_local (1);
 }
 
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    RTCORBA::ProtocolList *_tao_elem
+    RTCORBA::PriorityBands *_tao_elem
   )
 {
-  _tao_any._tao_replace (
-      RTCORBA::_tc_ProtocolList,
-      1,
-      _tao_elem,
-      RTCORBA::ProtocolList::_tao_any_destructor
+  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::insert (
+      _tao_any,
+      RTCORBA::PriorityBands::_tao_any_destructor,
+      RTCORBA::_tc_PriorityBands,
+      _tao_elem
     );
-
-  _tao_any.contains_local (1);
 }
 
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    RTCORBA::ProtocolList *&_tao_elem
+    RTCORBA::PriorityBands *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast(
-      const RTCORBA::ProtocolList*&,
+  return _tao_any >>= ACE_const_cast (
+      const RTCORBA::PriorityBands *&,
       _tao_elem
     );
 }
@@ -6012,87 +8060,294 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const RTCORBA::ProtocolList *&_tao_elem
+    const RTCORBA::PriorityBands *&_tao_elem
   )
 {
-  _tao_elem = 0;
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::extract (
+        _tao_any,
+        RTCORBA::PriorityBands::_tao_any_destructor,
+        RTCORBA::_tc_PriorityBands,
+        _tao_elem
+      );
+}
 
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-    CORBA::Boolean result =
-      type->equivalent (
-          RTCORBA::_tc_ProtocolList
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PriorityBandedConnectionPolicy_ptr _tao_elem
+  )
+{
+  RTCORBA::PriorityBandedConnectionPolicy_ptr _tao_objptr =
+    RTCORBA::PriorityBandedConnectionPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
 
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PriorityBandedConnectionPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::insert (
+      _tao_any,
+      RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor,
+      RTCORBA::_tc_PriorityBandedConnectionPolicy,
+      *_tao_elem
+    );
+}
 
-    _tao_elem = ACE_static_cast(
-        const RTCORBA::ProtocolList*,
-        _tao_any.value ()
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::PriorityBandedConnectionPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::extract (
+        _tao_any,
+        RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor,
+        RTCORBA::_tc_PriorityBandedConnectionPolicy,
+        _tao_elem
       );
-
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
 }
 
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::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<RTCORBA::PriorityBandedConnectionPolicy,RTCORBA::PriorityBandedConnectionPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::PriorityBandedConnectionPolicy,RTCORBA::PriorityBandedConnectionPolicy_var>
+  template class TAO_Object_Manager<RTCORBA::PriorityBandedConnectionPolicy,RTCORBA::PriorityBandedConnectionPolicy_var>;
+  template class TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::PriorityBandedConnectionPolicy, RTCORBA::PriorityBandedConnectionPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    RTCORBA::Current_ptr _tao_elem
+  )
+{
+  RTCORBA::Current_ptr _tao_objptr =
+    RTCORBA::Current::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::Current_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::Current>::insert (
+      _tao_any,
+      RTCORBA::Current::_tao_any_destructor,
+      RTCORBA::_tc_Current,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::Current_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::Current>::extract (
+        _tao_any,
+        RTCORBA::Current::_tao_any_destructor,
+        RTCORBA::_tc_Current,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Current>::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<RTCORBA::Current,RTCORBA::Current_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::Current,RTCORBA::Current_var>
+  template class TAO_Object_Manager<RTCORBA::Current,RTCORBA::Current_var>;
+  template class TAO::Any_Impl_T<RTCORBA::Current>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::Current, RTCORBA::Current_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::Current>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    RTCORBA::Mutex_ptr _tao_elem
+  )
+{
+  RTCORBA::Mutex_ptr _tao_objptr =
+    RTCORBA::Mutex::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::Mutex_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::Mutex>::insert (
+      _tao_any,
+      RTCORBA::Mutex::_tao_any_destructor,
+      RTCORBA::_tc_Mutex,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::Mutex_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::Mutex>::extract (
+        _tao_any,
+        RTCORBA::Mutex::_tao_any_destructor,
+        RTCORBA::_tc_Mutex,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Mutex>::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<RTCORBA::Mutex,RTCORBA::Mutex_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::Mutex,RTCORBA::Mutex_var>
+  template class TAO_Object_Manager<RTCORBA::Mutex,RTCORBA::Mutex_var>;
+  template class TAO::Any_Impl_T<RTCORBA::Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::Mutex, RTCORBA::Mutex_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// 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,
+    RTCORBA::RTORB_ptr _tao_elem
+  )
+{
+  RTCORBA::RTORB_ptr _tao_objptr =
+    RTCORBA::RTORB::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::RTORB_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::RTORB>::insert (
+      _tao_any,
+      RTCORBA::RTORB::_tao_any_destructor,
+      RTCORBA::_tc_RTORB,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::RTORB_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::RTORB>::extract (
+        _tao_any,
+        RTCORBA::RTORB::_tao_any_destructor,
+        RTCORBA::_tc_RTORB,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::RTORB>::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<RTCORBA::RTORB,RTCORBA::RTORB_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::RTORB,RTCORBA::RTORB_var>
+  template class TAO_Object_Manager<RTCORBA::RTORB,RTCORBA::RTORB_var>;
+  template class TAO::Any_Impl_T<RTCORBA::RTORB>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTCORBA::RTORB, RTCORBA::RTORB_var>
+# pragma instantiate TAO::Any_Impl_T<RTCORBA::RTORB>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const RTCORBA::ThreadpoolLanes &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -6101,45 +8356,229 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 58.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:64
+
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const RTCORBA::PriorityBands &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -6148,25 +8587,97 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // Add a check to the length of the sequence
-    // to make sure it does not exceed the length
-    // of the stream. (See bug 58.)
-    if (_tao_seq_len > strm.length())
-      return 0;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
 }
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Current>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Current>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Mutex>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Mutex>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::RTORB>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::RTORB>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index aeed8da14e8..9d3e69e550e 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_RTCORBAC_H_
 #define _TAO_IDL_ORIG_RTCORBAC_H_
 
@@ -72,6 +75,9 @@ class TAO_Network_Priority_Mapping;
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  RTCORBA
 {
   // TAO-specific
@@ -91,40 +97,78 @@ TAO_NAMESPACE  RTCORBA
   typedef TAO_Network_Priority_Mapping NetworkPriorityMapping;
   // End TAO-specific
 
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short NativePriority;
   typedef CORBA::Short_out NativePriority_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_NativePriority;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short Priority;
   typedef CORBA::Short_out Priority_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_Priority;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short minPriority;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short maxPriority;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short minPriority = 0;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short maxPriority = 32767;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
+  typedef CORBA::Long NetworkPriority;
+  typedef CORBA::Long_out NetworkPriority_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_NetworkPriority;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::ULong ThreadpoolId;
   typedef CORBA::ULong_out ThreadpoolId_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_ThreadpoolId;
-
-  struct ThreadpoolLane;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class ThreadpoolLane_var;
-
+  
   struct TAO_RTCORBA_Export ThreadpoolLane
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ThreadpoolLane_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
-
-    ACE_NESTED_CLASS (RTCORBA, Priority) lane_priority;
+    
+    static void _tao_any_destructor (void *);
+    RTCORBA::Priority lane_priority;
     CORBA::ULong static_threads;
     CORBA::ULong dynamic_threads;
-
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_RTCORBA_Export ThreadpoolLane_var
   {
   public:
@@ -134,46 +178,55 @@ TAO_NAMESPACE  RTCORBA
     // Fixed-size types only.
     ThreadpoolLane_var (const ThreadpoolLane &);
     ~ThreadpoolLane_var (void);
-
+    
     ThreadpoolLane_var &operator= (ThreadpoolLane *);
     ThreadpoolLane_var &operator= (const ThreadpoolLane_var &);
+    
     // Fixed-size types only.
     ThreadpoolLane_var &operator= (const ThreadpoolLane &);
+    
     ThreadpoolLane *operator-> (void);
     const ThreadpoolLane *operator-> (void) const;
-
+    
     operator const ThreadpoolLane &() const;
     operator ThreadpoolLane &();
     operator ThreadpoolLane &() const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ThreadpoolLane &in (void) const;
     ThreadpoolLane &inout (void);
     ThreadpoolLane &out (void);
     ThreadpoolLane _retn (void);
     ThreadpoolLane *ptr (void) const;
-
+  
   private:
     ThreadpoolLane *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
+  
   typedef ThreadpoolLane &ThreadpoolLane_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_ThreadpoolLane;
-
+  
+  // 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_RTCORBA_THREADPOOLLANES_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CH_
-
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes
+  
+  class TAO_RTCORBA_Export _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void);
-    _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -187,15 +240,15 @@ TAO_NAMESPACE  RTCORBA
         const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void);
-
+    
     // = Accessors.
     ThreadpoolLane &operator[] (CORBA::ULong i);
     const ThreadpoolLane &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static ThreadpoolLane *allocbuf (CORBA::ULong size);
     static void freebuf (ThreadpoolLane *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -211,98 +264,108 @@ TAO_NAMESPACE  RTCORBA
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CH_)
 #define _RTCORBA_THREADPOOLLANES_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ThreadpoolLanes;
   class ThreadpoolLanes_var;
-
+  
   // *************************************************************
-  // ThreadpoolLanes
+  // RTCORBA::ThreadpoolLanes
   // *************************************************************
+  
+  class TAO_RTCORBA_Export ThreadpoolLanes : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-  class TAO_RTCORBA_Export ThreadpoolLanes : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ThreadpoolLane>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    ThreadpoolLanes (void); // default ctor
-    ThreadpoolLanes (CORBA::ULong max); // uses max size
+    ThreadpoolLanes (void);
+    ThreadpoolLanes (CORBA::ULong max);
     ThreadpoolLanes (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ThreadpoolLane *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        ThreadpoolLane *buffer, 
         CORBA::Boolean release = 0
       );
-    ThreadpoolLanes (const ThreadpoolLanes &); // copy ctor
+    ThreadpoolLanes (const ThreadpoolLanes &);
     ~ThreadpoolLanes (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef ThreadpoolLanes_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
   };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_THREADPOOLLANES___VAR_CH_)
 #define _RTCORBA_THREADPOOLLANES___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class RTCORBA::ThreadpoolLanes_var
   // *************************************************************
-
+  
   class TAO_RTCORBA_Export ThreadpoolLanes_var
   {
   public:
     ThreadpoolLanes_var (void);
     ThreadpoolLanes_var (ThreadpoolLanes *);
     ThreadpoolLanes_var (const ThreadpoolLanes_var &);
+    
     // Fixed-size base types only.
     ThreadpoolLanes_var (const ThreadpoolLanes &);
+    
     ~ThreadpoolLanes_var (void);
-
+    
     ThreadpoolLanes_var &operator= (ThreadpoolLanes *);
     ThreadpoolLanes_var &operator= (const ThreadpoolLanes_var &);
+    
     // Fixed-size base types only.
     ThreadpoolLanes_var &operator= (const ThreadpoolLanes &);
+    
     ThreadpoolLanes *operator-> (void);
     const ThreadpoolLanes *operator-> (void) const;
-
+    
     operator const ThreadpoolLanes &() const;
     operator ThreadpoolLanes &();
     operator ThreadpoolLanes &() const;
-
     ThreadpoolLane & operator[] (CORBA::ULong index);
     const ThreadpoolLane & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ThreadpoolLanes &in (void) const;
     ThreadpoolLanes &inout (void);
     ThreadpoolLanes *&out (void);
     ThreadpoolLanes *_retn (void);
     ThreadpoolLanes *ptr (void) const;
-
+  
   private:
     ThreadpoolLanes *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_THREADPOOLLANES___OUT_CH_)
 #define _RTCORBA_THREADPOOLLANES___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_RTCORBA_Export ThreadpoolLanes_out
   {
   public:
@@ -315,63 +378,79 @@ TAO_NAMESPACE  RTCORBA
     ThreadpoolLanes *&ptr (void);
     ThreadpoolLanes *operator-> (void);
     ThreadpoolLane & operator[] (CORBA::ULong index);
-
+  
   private:
     ThreadpoolLanes *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ThreadpoolLanes_var &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ThreadpoolLanes;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong PRIORITY_MODEL_POLICY_TYPE;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong PRIORITY_MODEL_POLICY_TYPE = 40U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum PriorityModel
   {
     CLIENT_PROPAGATED,
     SERVER_DECLARED
   };
-
+  
   typedef PriorityModel &PriorityModel_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_PriorityModel;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY___PTR_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY___PTR_CH_
-
+  
   class PriorityModelPolicy;
   typedef PriorityModelPolicy *PriorityModelPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY___VAR_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export PriorityModelPolicy_var : public TAO_Base_var
   {
   public:
     PriorityModelPolicy_var (void); // default constructor
-    PriorityModelPolicy_var (PriorityModelPolicy_ptr p) : ptr_ (p) {}
+    PriorityModelPolicy_var (PriorityModelPolicy_ptr p) : ptr_ (p) {} 
     PriorityModelPolicy_var (const PriorityModelPolicy_var &); // copy constructor
     ~PriorityModelPolicy_var (void); // destructor
-
+    
     PriorityModelPolicy_var &operator= (PriorityModelPolicy_ptr);
     PriorityModelPolicy_var &operator= (const PriorityModelPolicy_var &);
     PriorityModelPolicy_ptr operator-> (void) const;
-
+    
     operator const PriorityModelPolicy_ptr &() const;
     operator PriorityModelPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     PriorityModelPolicy_ptr in (void) const;
     PriorityModelPolicy_ptr &inout (void);
     PriorityModelPolicy_ptr &out (void);
     PriorityModelPolicy_ptr _retn (void);
     PriorityModelPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static PriorityModelPolicy_ptr tao_duplicate (PriorityModelPolicy_ptr);
@@ -382,7 +461,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     PriorityModelPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -390,13 +469,14 @@ TAO_NAMESPACE  RTCORBA
     PriorityModelPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY___OUT_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export PriorityModelPolicy_out
   {
   public:
@@ -409,116 +489,138 @@ TAO_NAMESPACE  RTCORBA
     operator PriorityModelPolicy_ptr &();
     PriorityModelPolicy_ptr &ptr (void);
     PriorityModelPolicy_ptr operator-> (void);
-
+  
   private:
     PriorityModelPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY_CH_
-
+  
   class TAO_RTCORBA_Export PriorityModelPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PriorityModelPolicy_ptr _ptr_type;
     typedef PriorityModelPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static PriorityModelPolicy_ptr _duplicate (PriorityModelPolicy_ptr obj);
-
+    
     static PriorityModelPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PriorityModelPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PriorityModelPolicy_ptr _nil (void)
       {
         return (PriorityModelPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::PriorityModel priority_model (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual RTCORBA::Priority server_priority (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     PriorityModelPolicy (void);
-
     virtual ~PriorityModelPolicy (void);
-
+    
+    friend class _TAO_PriorityModelPolicy_Remote_Proxy_Impl;
+    friend class _TAO_PriorityModelPolicy_ThruPOA_Proxy_Impl;
+    friend class _TAO_PriorityModelPolicy_Direct_Proxy_Impl;
+  
   private:
     PriorityModelPolicy (const PriorityModelPolicy &);
     void operator= (const PriorityModelPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREADPOOL_POLICY_TYPE;
-
+  
+  // 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_PriorityModelPolicy;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong THREADPOOL_POLICY_TYPE = 41U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY___PTR_CH_)
 #define _RTCORBA_THREADPOOLPOLICY___PTR_CH_
-
+  
   class ThreadpoolPolicy;
   typedef ThreadpoolPolicy *ThreadpoolPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_THREADPOOLPOLICY___VAR_CH_)
 #define _RTCORBA_THREADPOOLPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export ThreadpoolPolicy_var : public TAO_Base_var
   {
   public:
     ThreadpoolPolicy_var (void); // default constructor
-    ThreadpoolPolicy_var (ThreadpoolPolicy_ptr p) : ptr_ (p) {}
+    ThreadpoolPolicy_var (ThreadpoolPolicy_ptr p) : ptr_ (p) {} 
     ThreadpoolPolicy_var (const ThreadpoolPolicy_var &); // copy constructor
     ~ThreadpoolPolicy_var (void); // destructor
-
+    
     ThreadpoolPolicy_var &operator= (ThreadpoolPolicy_ptr);
     ThreadpoolPolicy_var &operator= (const ThreadpoolPolicy_var &);
     ThreadpoolPolicy_ptr operator-> (void) const;
-
+    
     operator const ThreadpoolPolicy_ptr &() const;
     operator ThreadpoolPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ThreadpoolPolicy_ptr in (void) const;
     ThreadpoolPolicy_ptr &inout (void);
     ThreadpoolPolicy_ptr &out (void);
     ThreadpoolPolicy_ptr _retn (void);
     ThreadpoolPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ThreadpoolPolicy_ptr tao_duplicate (ThreadpoolPolicy_ptr);
@@ -529,7 +631,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ThreadpoolPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -537,13 +639,14 @@ TAO_NAMESPACE  RTCORBA
     ThreadpoolPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_THREADPOOLPOLICY___OUT_CH_)
 #define _RTCORBA_THREADPOOLPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export ThreadpoolPolicy_out
   {
   public:
@@ -556,106 +659,123 @@ TAO_NAMESPACE  RTCORBA
     operator ThreadpoolPolicy_ptr &();
     ThreadpoolPolicy_ptr &ptr (void);
     ThreadpoolPolicy_ptr operator-> (void);
-
+  
   private:
     ThreadpoolPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY_CH_)
 #define _RTCORBA_THREADPOOLPOLICY_CH_
-
+  
   class TAO_RTCORBA_Export ThreadpoolPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ThreadpoolPolicy_ptr _ptr_type;
     typedef ThreadpoolPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ThreadpoolPolicy_ptr _duplicate (ThreadpoolPolicy_ptr obj);
-
+    
     static ThreadpoolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ThreadpoolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ThreadpoolPolicy_ptr _nil (void)
       {
         return (ThreadpoolPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual RTCORBA::ThreadpoolId threadpool (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ThreadpoolPolicy (void);
-
     virtual ~ThreadpoolPolicy (void);
-
+    
+    friend class _TAO_ThreadpoolPolicy_Remote_Proxy_Impl;
+    friend class _TAO_ThreadpoolPolicy_ThruPOA_Proxy_Impl;
+    friend class _TAO_ThreadpoolPolicy_Direct_Proxy_Impl;
+  
   private:
     ThreadpoolPolicy (const ThreadpoolPolicy &);
     void operator= (const ThreadpoolPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_ThreadpoolPolicy;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES___PTR_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES___PTR_CH_
-
+  
   class ProtocolProperties;
   typedef ProtocolProperties *ProtocolProperties_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES___VAR_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export ProtocolProperties_var : public TAO_Base_var
   {
   public:
     ProtocolProperties_var (void); // default constructor
-    ProtocolProperties_var (ProtocolProperties_ptr p) : ptr_ (p) {}
+    ProtocolProperties_var (ProtocolProperties_ptr p) : ptr_ (p) {} 
     ProtocolProperties_var (const ProtocolProperties_var &); // copy constructor
     ~ProtocolProperties_var (void); // destructor
-
+    
     ProtocolProperties_var &operator= (ProtocolProperties_ptr);
     ProtocolProperties_var &operator= (const ProtocolProperties_var &);
     ProtocolProperties_ptr operator-> (void) const;
-
+    
     operator const ProtocolProperties_ptr &() const;
     operator ProtocolProperties_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ProtocolProperties_ptr in (void) const;
     ProtocolProperties_ptr &inout (void);
     ProtocolProperties_ptr &out (void);
     ProtocolProperties_ptr _retn (void);
     ProtocolProperties_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ProtocolProperties_ptr tao_duplicate (ProtocolProperties_ptr);
@@ -666,7 +786,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -674,13 +794,14 @@ TAO_NAMESPACE  RTCORBA
     ProtocolProperties_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES___OUT_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export ProtocolProperties_out
   {
   public:
@@ -693,52 +814,56 @@ TAO_NAMESPACE  RTCORBA
     operator ProtocolProperties_ptr &();
     ProtocolProperties_ptr &ptr (void);
     ProtocolProperties_ptr operator-> (void);
-
+  
   private:
     ProtocolProperties_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES_CH_
-
+  
   class TAO_RTCORBA_Export ProtocolProperties
     : public virtual CORBA::Object
     , public TAO_Encodable
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ProtocolProperties_ptr _ptr_type;
     typedef ProtocolProperties_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj);
-
+    
     static ProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ProtocolProperties_ptr _nil (void)
       {
         return (ProtocolProperties_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
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
     // CDR Encoder/Decoder methods.
 
     virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -746,33 +871,42 @@ TAO_NAMESPACE  RTCORBA
 
   protected:
     ProtocolProperties (void);
-
     virtual ~ProtocolProperties (void);
-
+    
+    friend class _TAO_ProtocolProperties_Remote_Proxy_Impl;
+    friend class _TAO_ProtocolProperties_ThruPOA_Proxy_Impl;
+    friend class _TAO_ProtocolProperties_Direct_Proxy_Impl;
+  
   private:
     ProtocolProperties (const ProtocolProperties &);
     void operator= (const ProtocolProperties &);
   };
 
-
 #endif /* end #if !defined */
-
-  struct Protocol;
+  
+  // 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_ProtocolProperties;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class Protocol_var;
-
+  
   struct TAO_RTCORBA_Export Protocol
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Protocol_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
+    
+    static void _tao_any_destructor (void *);
     IOP::ProfileId protocol_type;
-    ACE_NESTED_CLASS (RTCORBA, ProtocolProperties_var) orb_protocol_properties;
-    ACE_NESTED_CLASS (RTCORBA, ProtocolProperties_var) transport_protocol_properties;
-
+    RTCORBA::ProtocolProperties_var orb_protocol_properties;
+    RTCORBA::ProtocolProperties_var transport_protocol_properties;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_RTCORBA_Export Protocol_var
   {
   public:
@@ -780,29 +914,33 @@ TAO_NAMESPACE  RTCORBA
     Protocol_var (Protocol *);
     Protocol_var (const Protocol_var &);
     ~Protocol_var (void);
-
+    
     Protocol_var &operator= (Protocol *);
     Protocol_var &operator= (const Protocol_var &);
     Protocol *operator-> (void);
     const Protocol *operator-> (void) const;
-
+    
     operator const Protocol &() const;
     operator Protocol &();
     operator Protocol &() const;
+    
     // Variable-size types only.
     operator Protocol *&();
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const Protocol &in (void) const;
     Protocol &inout (void);
     Protocol *&out (void);
     Protocol *_retn (void);
     Protocol *ptr (void) const;
-
+  
   private:
     Protocol *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
   class TAO_RTCORBA_Export Protocol_out
   {
   public:
@@ -814,26 +952,32 @@ TAO_NAMESPACE  RTCORBA
     operator Protocol *&();
     Protocol *&ptr (void);
     Protocol *operator-> (void);
-
+    
   private:
     Protocol *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const Protocol_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_Protocol;
+  
+  // 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_RTCORBA_PROTOCOLLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_
-
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
+  
+  class TAO_RTCORBA_Export _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void);
-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -847,15 +991,15 @@ TAO_NAMESPACE  RTCORBA
         const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void);
-
+    
     // = Accessors.
     Protocol &operator[] (CORBA::ULong i);
     const Protocol &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static Protocol *allocbuf (CORBA::ULong size);
     static void freebuf (Protocol *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -871,56 +1015,62 @@ TAO_NAMESPACE  RTCORBA
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CH_)
 #define _RTCORBA_PROTOCOLLIST_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class ProtocolList;
   class ProtocolList_var;
-
+  
   // *************************************************************
-  // ProtocolList
+  // RTCORBA::ProtocolList
   // *************************************************************
+  
+  class TAO_RTCORBA_Export ProtocolList : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-  class TAO_RTCORBA_Export ProtocolList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<Protocol>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    ProtocolList (void); // default ctor
-    ProtocolList (CORBA::ULong max); // uses max size
+    ProtocolList (void);
+    ProtocolList (CORBA::ULong max);
     ProtocolList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Protocol *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        Protocol *buffer, 
         CORBA::Boolean release = 0
       );
-    ProtocolList (const ProtocolList &); // copy ctor
+    ProtocolList (const ProtocolList &);
     ~ProtocolList (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef ProtocolList_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
   };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_PROTOCOLLIST___VAR_CH_)
 #define _RTCORBA_PROTOCOLLIST___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class RTCORBA::ProtocolList_var
   // *************************************************************
-
+  
   class TAO_RTCORBA_Export ProtocolList_var
   {
   public:
@@ -928,38 +1078,41 @@ TAO_NAMESPACE  RTCORBA
     ProtocolList_var (ProtocolList *);
     ProtocolList_var (const ProtocolList_var &);
     ~ProtocolList_var (void);
-
+    
     ProtocolList_var &operator= (ProtocolList *);
     ProtocolList_var &operator= (const ProtocolList_var &);
     ProtocolList *operator-> (void);
     const ProtocolList *operator-> (void) const;
-
+    
     operator const ProtocolList &() const;
     operator ProtocolList &();
     operator ProtocolList &() const;
-    operator ProtocolList *&(); // variable-size base types only
-
+    
+    // Variable-size base types only.
+    operator ProtocolList *&();
+    
     Protocol & operator[] (CORBA::ULong index);
     const Protocol & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const ProtocolList &in (void) const;
     ProtocolList &inout (void);
     ProtocolList *&out (void);
     ProtocolList *_retn (void);
     ProtocolList *ptr (void) const;
-
+  
   private:
     ProtocolList *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_PROTOCOLLIST___OUT_CH_)
 #define _RTCORBA_PROTOCOLLIST___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_RTCORBA_Export ProtocolList_out
   {
   public:
@@ -972,57 +1125,63 @@ TAO_NAMESPACE  RTCORBA
     ProtocolList *&ptr (void);
     ProtocolList *operator-> (void);
     Protocol & operator[] (CORBA::ULong index);
-
+  
   private:
     ProtocolList *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ProtocolList_var &);
   };
 
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\irfan\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolList;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SERVER_PROTOCOL_POLICY_TYPE;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong SERVER_PROTOCOL_POLICY_TYPE = 42U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___PTR_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY___PTR_CH_
-
+  
   class ServerProtocolPolicy;
   typedef ServerProtocolPolicy *ServerProtocolPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___VAR_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export ServerProtocolPolicy_var : public TAO_Base_var
   {
   public:
     ServerProtocolPolicy_var (void); // default constructor
-    ServerProtocolPolicy_var (ServerProtocolPolicy_ptr p) : ptr_ (p) {}
+    ServerProtocolPolicy_var (ServerProtocolPolicy_ptr p) : ptr_ (p) {} 
     ServerProtocolPolicy_var (const ServerProtocolPolicy_var &); // copy constructor
     ~ServerProtocolPolicy_var (void); // destructor
-
+    
     ServerProtocolPolicy_var &operator= (ServerProtocolPolicy_ptr);
     ServerProtocolPolicy_var &operator= (const ServerProtocolPolicy_var &);
     ServerProtocolPolicy_ptr operator-> (void) const;
-
+    
     operator const ServerProtocolPolicy_ptr &() const;
     operator ServerProtocolPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServerProtocolPolicy_ptr in (void) const;
     ServerProtocolPolicy_ptr &inout (void);
     ServerProtocolPolicy_ptr &out (void);
     ServerProtocolPolicy_ptr _retn (void);
     ServerProtocolPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerProtocolPolicy_ptr tao_duplicate (ServerProtocolPolicy_ptr);
@@ -1033,7 +1192,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ServerProtocolPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1041,13 +1200,14 @@ TAO_NAMESPACE  RTCORBA
     ServerProtocolPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___OUT_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export ServerProtocolPolicy_out
   {
   public:
@@ -1060,108 +1220,128 @@ TAO_NAMESPACE  RTCORBA
     operator ServerProtocolPolicy_ptr &();
     ServerProtocolPolicy_ptr &ptr (void);
     ServerProtocolPolicy_ptr operator-> (void);
-
+  
   private:
     ServerProtocolPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY_CH_
-
+  
   class TAO_RTCORBA_Export ServerProtocolPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServerProtocolPolicy_ptr _ptr_type;
     typedef ServerProtocolPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj);
-
+    
     static ServerProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerProtocolPolicy_ptr _nil (void)
       {
         return (ServerProtocolPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::ProtocolList * protocols (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ServerProtocolPolicy (void);
-
     virtual ~ServerProtocolPolicy (void);
-
+    
+    friend class _TAO_ServerProtocolPolicy_Remote_Proxy_Impl;
+    friend class _TAO_ServerProtocolPolicy_ThruPOA_Proxy_Impl;
+    friend class _TAO_ServerProtocolPolicy_Direct_Proxy_Impl;
+  
   private:
     ServerProtocolPolicy (const ServerProtocolPolicy &);
     void operator= (const ServerProtocolPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong CLIENT_PROTOCOL_POLICY_TYPE;
-
+  
+  // 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_ServerProtocolPolicy;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong CLIENT_PROTOCOL_POLICY_TYPE = 43U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___PTR_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY___PTR_CH_
-
+  
   class ClientProtocolPolicy;
   typedef ClientProtocolPolicy *ClientProtocolPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export ClientProtocolPolicy_var : public TAO_Base_var
   {
   public:
     ClientProtocolPolicy_var (void); // default constructor
-    ClientProtocolPolicy_var (ClientProtocolPolicy_ptr p) : ptr_ (p) {}
+    ClientProtocolPolicy_var (ClientProtocolPolicy_ptr p) : ptr_ (p) {} 
     ClientProtocolPolicy_var (const ClientProtocolPolicy_var &); // copy constructor
     ~ClientProtocolPolicy_var (void); // destructor
-
+    
     ClientProtocolPolicy_var &operator= (ClientProtocolPolicy_ptr);
     ClientProtocolPolicy_var &operator= (const ClientProtocolPolicy_var &);
     ClientProtocolPolicy_ptr operator-> (void) const;
-
+    
     operator const ClientProtocolPolicy_ptr &() const;
     operator ClientProtocolPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ClientProtocolPolicy_ptr in (void) const;
     ClientProtocolPolicy_ptr &inout (void);
     ClientProtocolPolicy_ptr &out (void);
     ClientProtocolPolicy_ptr _retn (void);
     ClientProtocolPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ClientProtocolPolicy_ptr tao_duplicate (ClientProtocolPolicy_ptr);
@@ -1172,7 +1352,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     ClientProtocolPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1180,13 +1360,14 @@ TAO_NAMESPACE  RTCORBA
     ClientProtocolPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export ClientProtocolPolicy_out
   {
   public:
@@ -1199,108 +1380,128 @@ TAO_NAMESPACE  RTCORBA
     operator ClientProtocolPolicy_ptr &();
     ClientProtocolPolicy_ptr &ptr (void);
     ClientProtocolPolicy_ptr operator-> (void);
-
+  
   private:
     ClientProtocolPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_
-
+  
   class TAO_RTCORBA_Export ClientProtocolPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ClientProtocolPolicy_ptr _ptr_type;
     typedef ClientProtocolPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj);
-
+    
     static ClientProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientProtocolPolicy_ptr _nil (void)
       {
         return (ClientProtocolPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::ProtocolList * protocols (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     ClientProtocolPolicy (void);
-
     virtual ~ClientProtocolPolicy (void);
-
+    
+    friend class _TAO_ClientProtocolPolicy_Remote_Proxy_Impl;
+    friend class _TAO_ClientProtocolPolicy_ThruPOA_Proxy_Impl;
+    friend class _TAO_ClientProtocolPolicy_Direct_Proxy_Impl;
+  
   private:
     ClientProtocolPolicy (const ClientProtocolPolicy &);
     void operator= (const ClientProtocolPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong PRIVATE_CONNECTION_POLICY_TYPE;
-
+  
+  // 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_ClientProtocolPolicy;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong PRIVATE_CONNECTION_POLICY_TYPE = 44U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___PTR_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY___PTR_CH_
-
+  
   class PrivateConnectionPolicy;
   typedef PrivateConnectionPolicy *PrivateConnectionPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export PrivateConnectionPolicy_var : public TAO_Base_var
   {
   public:
     PrivateConnectionPolicy_var (void); // default constructor
-    PrivateConnectionPolicy_var (PrivateConnectionPolicy_ptr p) : ptr_ (p) {}
+    PrivateConnectionPolicy_var (PrivateConnectionPolicy_ptr p) : ptr_ (p) {} 
     PrivateConnectionPolicy_var (const PrivateConnectionPolicy_var &); // copy constructor
     ~PrivateConnectionPolicy_var (void); // destructor
-
+    
     PrivateConnectionPolicy_var &operator= (PrivateConnectionPolicy_ptr);
     PrivateConnectionPolicy_var &operator= (const PrivateConnectionPolicy_var &);
     PrivateConnectionPolicy_ptr operator-> (void) const;
-
+    
     operator const PrivateConnectionPolicy_ptr &() const;
     operator PrivateConnectionPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     PrivateConnectionPolicy_ptr in (void) const;
     PrivateConnectionPolicy_ptr &inout (void);
     PrivateConnectionPolicy_ptr &out (void);
     PrivateConnectionPolicy_ptr _retn (void);
     PrivateConnectionPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static PrivateConnectionPolicy_ptr tao_duplicate (PrivateConnectionPolicy_ptr);
@@ -1311,7 +1512,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     PrivateConnectionPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1319,13 +1520,14 @@ TAO_NAMESPACE  RTCORBA
     PrivateConnectionPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export PrivateConnectionPolicy_out
   {
   public:
@@ -1338,98 +1540,113 @@ TAO_NAMESPACE  RTCORBA
     operator PrivateConnectionPolicy_ptr &();
     PrivateConnectionPolicy_ptr &ptr (void);
     PrivateConnectionPolicy_ptr operator-> (void);
-
+  
   private:
     PrivateConnectionPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_
-
+  
   class TAO_RTCORBA_Export PrivateConnectionPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PrivateConnectionPolicy_ptr _ptr_type;
     typedef PrivateConnectionPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj);
-
+    
     static PrivateConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PrivateConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PrivateConnectionPolicy_ptr _nil (void)
       {
         return (PrivateConnectionPolicy_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
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     PrivateConnectionPolicy (void);
-
     virtual ~PrivateConnectionPolicy (void);
-
+    
+    friend class _TAO_PrivateConnectionPolicy_Remote_Proxy_Impl;
+    friend class _TAO_PrivateConnectionPolicy_ThruPOA_Proxy_Impl;
+    friend class _TAO_PrivateConnectionPolicy_Direct_Proxy_Impl;
+  
   private:
     PrivateConnectionPolicy (const PrivateConnectionPolicy &);
     void operator= (const PrivateConnectionPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_PrivateConnectionPolicy;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___PTR_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES___PTR_CH_
-
+  
   class TCPProtocolProperties;
   typedef TCPProtocolProperties *TCPProtocolProperties_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___VAR_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export TCPProtocolProperties_var : public TAO_Base_var
   {
   public:
     TCPProtocolProperties_var (void); // default constructor
-    TCPProtocolProperties_var (TCPProtocolProperties_ptr p) : ptr_ (p) {}
+    TCPProtocolProperties_var (TCPProtocolProperties_ptr p) : ptr_ (p) {} 
     TCPProtocolProperties_var (const TCPProtocolProperties_var &); // copy constructor
     ~TCPProtocolProperties_var (void); // destructor
-
+    
     TCPProtocolProperties_var &operator= (TCPProtocolProperties_ptr);
     TCPProtocolProperties_var &operator= (const TCPProtocolProperties_var &);
     TCPProtocolProperties_ptr operator-> (void) const;
-
+    
     operator const TCPProtocolProperties_ptr &() const;
     operator TCPProtocolProperties_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     TCPProtocolProperties_ptr in (void) const;
     TCPProtocolProperties_ptr &inout (void);
     TCPProtocolProperties_ptr &out (void);
     TCPProtocolProperties_ptr _retn (void);
     TCPProtocolProperties_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static TCPProtocolProperties_ptr tao_duplicate (TCPProtocolProperties_ptr);
@@ -1440,7 +1657,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     TCPProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1448,13 +1665,14 @@ TAO_NAMESPACE  RTCORBA
     TCPProtocolProperties_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___OUT_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export TCPProtocolProperties_out
   {
   public:
@@ -1467,55 +1685,60 @@ TAO_NAMESPACE  RTCORBA
     operator TCPProtocolProperties_ptr &();
     TCPProtocolProperties_ptr &ptr (void);
     TCPProtocolProperties_ptr operator-> (void);
-
+  
   private:
     TCPProtocolProperties_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_
-
+  
   class TAO_RTCORBA_Export TCPProtocolProperties
     : public virtual RTCORBA::ProtocolProperties
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef TCPProtocolProperties_ptr _ptr_type;
     typedef TCPProtocolProperties_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static TCPProtocolProperties_ptr _duplicate (TCPProtocolProperties_ptr obj);
-
+    
     static TCPProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TCPProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TCPProtocolProperties_ptr _nil (void)
       {
         return (TCPProtocolProperties_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Long send_buffer_size (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_buffer_size (
         CORBA::Long send_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1523,15 +1746,20 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Long recv_buffer_size (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void recv_buffer_size (
         CORBA::Long recv_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1539,15 +1767,20 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean keep_alive (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void keep_alive (
         CORBA::Boolean keep_alive
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1555,15 +1788,20 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean dont_route (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void dont_route (
         CORBA::Boolean dont_route
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1571,15 +1809,20 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean no_delay (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void no_delay (
         CORBA::Boolean no_delay
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1587,74 +1830,94 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean enable_network_priority (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void enable_network_priority (
-        CORBA::Boolean no_delay
+        CORBA::Boolean enable_network_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     TCPProtocolProperties (void);
-
     virtual ~TCPProtocolProperties (void);
-
+    
+    friend class _TAO_TCPProtocolProperties_Remote_Proxy_Impl;
+    friend class _TAO_TCPProtocolProperties_ThruPOA_Proxy_Impl;
+    friend class _TAO_TCPProtocolProperties_Direct_Proxy_Impl;
+  
   private:
     TCPProtocolProperties (const TCPProtocolProperties &);
     void operator= (const TCPProtocolProperties &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_TCPProtocolProperties;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___PTR_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES___PTR_CH_
-
+  
   class GIOPProtocolProperties;
   typedef GIOPProtocolProperties *GIOPProtocolProperties_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___VAR_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export GIOPProtocolProperties_var : public TAO_Base_var
   {
   public:
     GIOPProtocolProperties_var (void); // default constructor
-    GIOPProtocolProperties_var (GIOPProtocolProperties_ptr p) : ptr_ (p) {}
+    GIOPProtocolProperties_var (GIOPProtocolProperties_ptr p) : ptr_ (p) {} 
     GIOPProtocolProperties_var (const GIOPProtocolProperties_var &); // copy constructor
     ~GIOPProtocolProperties_var (void); // destructor
-
+    
     GIOPProtocolProperties_var &operator= (GIOPProtocolProperties_ptr);
     GIOPProtocolProperties_var &operator= (const GIOPProtocolProperties_var &);
     GIOPProtocolProperties_ptr operator-> (void) const;
-
+    
     operator const GIOPProtocolProperties_ptr &() const;
     operator GIOPProtocolProperties_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     GIOPProtocolProperties_ptr in (void) const;
     GIOPProtocolProperties_ptr &inout (void);
     GIOPProtocolProperties_ptr &out (void);
     GIOPProtocolProperties_ptr _retn (void);
     GIOPProtocolProperties_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static GIOPProtocolProperties_ptr tao_duplicate (GIOPProtocolProperties_ptr);
@@ -1665,7 +1928,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     GIOPProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1673,13 +1936,14 @@ TAO_NAMESPACE  RTCORBA
     GIOPProtocolProperties_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___OUT_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export GIOPProtocolProperties_out
   {
   public:
@@ -1692,98 +1956,113 @@ TAO_NAMESPACE  RTCORBA
     operator GIOPProtocolProperties_ptr &();
     GIOPProtocolProperties_ptr &ptr (void);
     GIOPProtocolProperties_ptr operator-> (void);
-
+  
   private:
     GIOPProtocolProperties_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_
-
+  
   class TAO_RTCORBA_Export GIOPProtocolProperties
     : public virtual RTCORBA::ProtocolProperties
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef GIOPProtocolProperties_ptr _ptr_type;
     typedef GIOPProtocolProperties_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static GIOPProtocolProperties_ptr _duplicate (GIOPProtocolProperties_ptr obj);
-
+    
     static GIOPProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static GIOPProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static GIOPProtocolProperties_ptr _nil (void)
       {
         return (GIOPProtocolProperties_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
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     GIOPProtocolProperties (void);
-
     virtual ~GIOPProtocolProperties (void);
-
+    
+    friend class _TAO_GIOPProtocolProperties_Remote_Proxy_Impl;
+    friend class _TAO_GIOPProtocolProperties_ThruPOA_Proxy_Impl;
+    friend class _TAO_GIOPProtocolProperties_Direct_Proxy_Impl;
+  
   private:
     GIOPProtocolProperties (const GIOPProtocolProperties &);
     void operator= (const GIOPProtocolProperties &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_GIOPProtocolProperties;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___PTR_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___PTR_CH_
-
+  
   class UnixDomainProtocolProperties;
   typedef UnixDomainProtocolProperties *UnixDomainProtocolProperties_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___VAR_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export UnixDomainProtocolProperties_var : public TAO_Base_var
   {
   public:
     UnixDomainProtocolProperties_var (void); // default constructor
-    UnixDomainProtocolProperties_var (UnixDomainProtocolProperties_ptr p) : ptr_ (p) {}
+    UnixDomainProtocolProperties_var (UnixDomainProtocolProperties_ptr p) : ptr_ (p) {} 
     UnixDomainProtocolProperties_var (const UnixDomainProtocolProperties_var &); // copy constructor
     ~UnixDomainProtocolProperties_var (void); // destructor
-
+    
     UnixDomainProtocolProperties_var &operator= (UnixDomainProtocolProperties_ptr);
     UnixDomainProtocolProperties_var &operator= (const UnixDomainProtocolProperties_var &);
     UnixDomainProtocolProperties_ptr operator-> (void) const;
-
+    
     operator const UnixDomainProtocolProperties_ptr &() const;
     operator UnixDomainProtocolProperties_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     UnixDomainProtocolProperties_ptr in (void) const;
     UnixDomainProtocolProperties_ptr &inout (void);
     UnixDomainProtocolProperties_ptr &out (void);
     UnixDomainProtocolProperties_ptr _retn (void);
     UnixDomainProtocolProperties_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static UnixDomainProtocolProperties_ptr tao_duplicate (UnixDomainProtocolProperties_ptr);
@@ -1794,7 +2073,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     UnixDomainProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1802,13 +2081,14 @@ TAO_NAMESPACE  RTCORBA
     UnixDomainProtocolProperties_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___OUT_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export UnixDomainProtocolProperties_out
   {
   public:
@@ -1821,55 +2101,60 @@ TAO_NAMESPACE  RTCORBA
     operator UnixDomainProtocolProperties_ptr &();
     UnixDomainProtocolProperties_ptr &ptr (void);
     UnixDomainProtocolProperties_ptr operator-> (void);
-
+  
   private:
     UnixDomainProtocolProperties_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_
-
+  
   class TAO_RTCORBA_Export UnixDomainProtocolProperties
     : public virtual RTCORBA::ProtocolProperties
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef UnixDomainProtocolProperties_ptr _ptr_type;
     typedef UnixDomainProtocolProperties_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static UnixDomainProtocolProperties_ptr _duplicate (UnixDomainProtocolProperties_ptr obj);
-
+    
     static UnixDomainProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static UnixDomainProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static UnixDomainProtocolProperties_ptr _nil (void)
       {
         return (UnixDomainProtocolProperties_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Long send_buffer_size (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_buffer_size (
         CORBA::Long send_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1877,15 +2162,20 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Long recv_buffer_size (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void recv_buffer_size (
         CORBA::Long recv_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1893,58 +2183,73 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     UnixDomainProtocolProperties (void);
-
     virtual ~UnixDomainProtocolProperties (void);
-
+    
+    friend class _TAO_UnixDomainProtocolProperties_Remote_Proxy_Impl;
+    friend class _TAO_UnixDomainProtocolProperties_ThruPOA_Proxy_Impl;
+    friend class _TAO_UnixDomainProtocolProperties_Direct_Proxy_Impl;
+  
   private:
     UnixDomainProtocolProperties (const UnixDomainProtocolProperties &);
     void operator= (const UnixDomainProtocolProperties &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_UnixDomainProtocolProperties;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___PTR_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___PTR_CH_
-
+  
   class SharedMemoryProtocolProperties;
   typedef SharedMemoryProtocolProperties *SharedMemoryProtocolProperties_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___VAR_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export SharedMemoryProtocolProperties_var : public TAO_Base_var
   {
   public:
     SharedMemoryProtocolProperties_var (void); // default constructor
-    SharedMemoryProtocolProperties_var (SharedMemoryProtocolProperties_ptr p) : ptr_ (p) {}
+    SharedMemoryProtocolProperties_var (SharedMemoryProtocolProperties_ptr p) : ptr_ (p) {} 
     SharedMemoryProtocolProperties_var (const SharedMemoryProtocolProperties_var &); // copy constructor
     ~SharedMemoryProtocolProperties_var (void); // destructor
-
+    
     SharedMemoryProtocolProperties_var &operator= (SharedMemoryProtocolProperties_ptr);
     SharedMemoryProtocolProperties_var &operator= (const SharedMemoryProtocolProperties_var &);
     SharedMemoryProtocolProperties_ptr operator-> (void) const;
-
+    
     operator const SharedMemoryProtocolProperties_ptr &() const;
     operator SharedMemoryProtocolProperties_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     SharedMemoryProtocolProperties_ptr in (void) const;
     SharedMemoryProtocolProperties_ptr &inout (void);
     SharedMemoryProtocolProperties_ptr &out (void);
     SharedMemoryProtocolProperties_ptr _retn (void);
     SharedMemoryProtocolProperties_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static SharedMemoryProtocolProperties_ptr tao_duplicate (SharedMemoryProtocolProperties_ptr);
@@ -1955,7 +2260,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     SharedMemoryProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1963,13 +2268,14 @@ TAO_NAMESPACE  RTCORBA
     SharedMemoryProtocolProperties_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___OUT_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export SharedMemoryProtocolProperties_out
   {
   public:
@@ -1982,55 +2288,60 @@ TAO_NAMESPACE  RTCORBA
     operator SharedMemoryProtocolProperties_ptr &();
     SharedMemoryProtocolProperties_ptr &ptr (void);
     SharedMemoryProtocolProperties_ptr operator-> (void);
-
+  
   private:
     SharedMemoryProtocolProperties_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_
-
+  
   class TAO_RTCORBA_Export SharedMemoryProtocolProperties
     : public virtual RTCORBA::ProtocolProperties
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef SharedMemoryProtocolProperties_ptr _ptr_type;
     typedef SharedMemoryProtocolProperties_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static SharedMemoryProtocolProperties_ptr _duplicate (SharedMemoryProtocolProperties_ptr obj);
-
+    
     static SharedMemoryProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static SharedMemoryProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static SharedMemoryProtocolProperties_ptr _nil (void)
       {
         return (SharedMemoryProtocolProperties_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Long preallocate_buffer_size (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void preallocate_buffer_size (
         CORBA::Long preallocate_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2038,15 +2349,20 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * mmap_filename (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void mmap_filename (
         const char * mmap_filename
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2054,15 +2370,20 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * mmap_lockname (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void mmap_lockname (
         const char * mmap_lockname
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2070,41 +2391,52 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     SharedMemoryProtocolProperties (void);
-
     virtual ~SharedMemoryProtocolProperties (void);
-
+    
+    friend class _TAO_SharedMemoryProtocolProperties_Remote_Proxy_Impl;
+    friend class _TAO_SharedMemoryProtocolProperties_ThruPOA_Proxy_Impl;
+    friend class _TAO_SharedMemoryProtocolProperties_Direct_Proxy_Impl;
+  
   private:
     SharedMemoryProtocolProperties (const SharedMemoryProtocolProperties &);
     void operator= (const SharedMemoryProtocolProperties &);
   };
 
-
 #endif /* end #if !defined */
-
-  struct PriorityBand;
+  
+  // 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_SharedMemoryProtocolProperties;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class PriorityBand_var;
-
+  
   struct TAO_RTCORBA_Export PriorityBand
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PriorityBand_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
-
-    ACE_NESTED_CLASS (RTCORBA, Priority) low;
-    ACE_NESTED_CLASS (RTCORBA, Priority) high;
-
+    
+    static void _tao_any_destructor (void *);
+    RTCORBA::Priority low;
+    RTCORBA::Priority high;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_RTCORBA_Export PriorityBand_var
   {
   public:
@@ -2114,46 +2446,55 @@ TAO_NAMESPACE  RTCORBA
     // Fixed-size types only.
     PriorityBand_var (const PriorityBand &);
     ~PriorityBand_var (void);
-
+    
     PriorityBand_var &operator= (PriorityBand *);
     PriorityBand_var &operator= (const PriorityBand_var &);
+    
     // Fixed-size types only.
     PriorityBand_var &operator= (const PriorityBand &);
+    
     PriorityBand *operator-> (void);
     const PriorityBand *operator-> (void) const;
-
+    
     operator const PriorityBand &() const;
     operator PriorityBand &();
     operator PriorityBand &() const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const PriorityBand &in (void) const;
     PriorityBand &inout (void);
     PriorityBand &out (void);
     PriorityBand _retn (void);
     PriorityBand *ptr (void) const;
-
+  
   private:
     PriorityBand *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
+  
   typedef PriorityBand &PriorityBand_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_PriorityBand;
-
+  
+  // 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_RTCORBA_PRIORITYBANDS_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CH_
-
-  class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
+  
+  class TAO_RTCORBA_Export _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
     : public TAO_Unbounded_Base_Sequence
   {
   public:
-    // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void);
-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -2167,15 +2508,15 @@ TAO_NAMESPACE  RTCORBA
         const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void);
-
+    
     // = Accessors.
     PriorityBand &operator[] (CORBA::ULong i);
     const PriorityBand &operator[] (CORBA::ULong i) const;
-
+    
     // = Static operations.
     static PriorityBand *allocbuf (CORBA::ULong size);
     static void freebuf (PriorityBand *buffer);
-
+    
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -2191,98 +2532,108 @@ TAO_NAMESPACE  RTCORBA
 
 #endif /* end #if !defined */
 
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_RTCORBA_PRIORITYBANDS_CH_)
 #define _RTCORBA_PRIORITYBANDS_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  
   class PriorityBands;
   class PriorityBands_var;
-
+  
   // *************************************************************
-  // PriorityBands
+  // RTCORBA::PriorityBands
   // *************************************************************
+  
+  class TAO_RTCORBA_Export PriorityBands : public 
+  
+  // TAO_IDL - Generated from 
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-  class TAO_RTCORBA_Export PriorityBands : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<PriorityBand>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
-    PriorityBands (void); // default ctor
-    PriorityBands (CORBA::ULong max); // uses max size
+    PriorityBands (void);
+    PriorityBands (CORBA::ULong max);
     PriorityBands (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        PriorityBand *buffer,
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        PriorityBand *buffer, 
         CORBA::Boolean release = 0
       );
-    PriorityBands (const PriorityBands &); // copy ctor
+    PriorityBands (const PriorityBands &);
     ~PriorityBands (void);
+    
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef PriorityBands_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
   };
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_PRIORITYBANDS___VAR_CH_)
 #define _RTCORBA_PRIORITYBANDS___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class RTCORBA::PriorityBands_var
   // *************************************************************
-
+  
   class TAO_RTCORBA_Export PriorityBands_var
   {
   public:
     PriorityBands_var (void);
     PriorityBands_var (PriorityBands *);
     PriorityBands_var (const PriorityBands_var &);
+    
     // Fixed-size base types only.
     PriorityBands_var (const PriorityBands &);
+    
     ~PriorityBands_var (void);
-
+    
     PriorityBands_var &operator= (PriorityBands *);
     PriorityBands_var &operator= (const PriorityBands_var &);
+    
     // Fixed-size base types only.
     PriorityBands_var &operator= (const PriorityBands &);
+    
     PriorityBands *operator-> (void);
     const PriorityBands *operator-> (void) const;
-
+    
     operator const PriorityBands &() const;
     operator PriorityBands &();
     operator PriorityBands &() const;
-
     PriorityBand & operator[] (CORBA::ULong index);
     const PriorityBand & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const PriorityBands &in (void) const;
     PriorityBands &inout (void);
     PriorityBands *&out (void);
     PriorityBands *_retn (void);
     PriorityBands *ptr (void) const;
-
+  
   private:
     PriorityBands *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_PRIORITYBANDS___OUT_CH_)
 #define _RTCORBA_PRIORITYBANDS___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  
   class TAO_RTCORBA_Export PriorityBands_out
   {
   public:
@@ -2295,54 +2646,63 @@ TAO_NAMESPACE  RTCORBA
     PriorityBands *&ptr (void);
     PriorityBands *operator-> (void);
     PriorityBand & operator[] (CORBA::ULong index);
-
+  
   private:
     PriorityBands *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const PriorityBands_var &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_PriorityBands;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___PTR_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___PTR_CH_
-
+  
   class PriorityBandedConnectionPolicy;
   typedef PriorityBandedConnectionPolicy *PriorityBandedConnectionPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export PriorityBandedConnectionPolicy_var : public TAO_Base_var
   {
   public:
     PriorityBandedConnectionPolicy_var (void); // default constructor
-    PriorityBandedConnectionPolicy_var (PriorityBandedConnectionPolicy_ptr p) : ptr_ (p) {}
+    PriorityBandedConnectionPolicy_var (PriorityBandedConnectionPolicy_ptr p) : ptr_ (p) {} 
     PriorityBandedConnectionPolicy_var (const PriorityBandedConnectionPolicy_var &); // copy constructor
     ~PriorityBandedConnectionPolicy_var (void); // destructor
-
+    
     PriorityBandedConnectionPolicy_var &operator= (PriorityBandedConnectionPolicy_ptr);
     PriorityBandedConnectionPolicy_var &operator= (const PriorityBandedConnectionPolicy_var &);
     PriorityBandedConnectionPolicy_ptr operator-> (void) const;
-
+    
     operator const PriorityBandedConnectionPolicy_ptr &() const;
     operator PriorityBandedConnectionPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     PriorityBandedConnectionPolicy_ptr in (void) const;
     PriorityBandedConnectionPolicy_ptr &inout (void);
     PriorityBandedConnectionPolicy_ptr &out (void);
     PriorityBandedConnectionPolicy_ptr _retn (void);
     PriorityBandedConnectionPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static PriorityBandedConnectionPolicy_ptr tao_duplicate (PriorityBandedConnectionPolicy_ptr);
@@ -2353,7 +2713,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     PriorityBandedConnectionPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2361,13 +2721,14 @@ TAO_NAMESPACE  RTCORBA
     PriorityBandedConnectionPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export PriorityBandedConnectionPolicy_out
   {
   public:
@@ -2380,106 +2741,123 @@ TAO_NAMESPACE  RTCORBA
     operator PriorityBandedConnectionPolicy_ptr &();
     PriorityBandedConnectionPolicy_ptr &ptr (void);
     PriorityBandedConnectionPolicy_ptr operator-> (void);
-
+  
   private:
     PriorityBandedConnectionPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_
-
+  
   class TAO_RTCORBA_Export PriorityBandedConnectionPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PriorityBandedConnectionPolicy_ptr _ptr_type;
     typedef PriorityBandedConnectionPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static PriorityBandedConnectionPolicy_ptr _duplicate (PriorityBandedConnectionPolicy_ptr obj);
-
+    
     static PriorityBandedConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PriorityBandedConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PriorityBandedConnectionPolicy_ptr _nil (void)
       {
         return (PriorityBandedConnectionPolicy_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::PriorityBands * priority_bands (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     PriorityBandedConnectionPolicy (void);
-
     virtual ~PriorityBandedConnectionPolicy (void);
-
+    
+    friend class _TAO_PriorityBandedConnectionPolicy_Remote_Proxy_Impl;
+    friend class _TAO_PriorityBandedConnectionPolicy_ThruPOA_Proxy_Impl;
+    friend class _TAO_PriorityBandedConnectionPolicy_Direct_Proxy_Impl;
+  
   private:
     PriorityBandedConnectionPolicy (const PriorityBandedConnectionPolicy &);
     void operator= (const PriorityBandedConnectionPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_PriorityBandedConnectionPolicy;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_CURRENT___PTR_CH_)
 #define _RTCORBA_CURRENT___PTR_CH_
-
+  
   class Current;
   typedef Current *Current_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_CURRENT___VAR_CH_)
 #define _RTCORBA_CURRENT___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export Current_var : public TAO_Base_var
   {
   public:
     Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {}
+    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
+    // 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);
@@ -2490,7 +2868,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Current_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2498,13 +2876,14 @@ TAO_NAMESPACE  RTCORBA
     Current_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_CURRENT___OUT_CH_)
 #define _RTCORBA_CURRENT___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export Current_out
   {
   public:
@@ -2517,55 +2896,60 @@ TAO_NAMESPACE  RTCORBA
     operator Current_ptr &();
     Current_ptr &ptr (void);
     Current_ptr operator-> (void);
-
+  
   private:
     Current_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_CURRENT_CH_)
 #define _RTCORBA_CURRENT_CH_
-
+  
   class TAO_RTCORBA_Export Current
     : public virtual CORBA::Current
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     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_operation/operation_ch.cpp:46
+    
     virtual RTCORBA::Priority the_priority (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void the_priority (
         RTCORBA::Priority the_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2573,58 +2957,73 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     Current (void);
-
     virtual ~Current (void);
-
+    
+    friend class _TAO_Current_Remote_Proxy_Impl;
+    friend class _TAO_Current_ThruPOA_Proxy_Impl;
+    friend class _TAO_Current_Direct_Proxy_Impl;
+  
   private:
     Current (const Current &);
     void operator= (const Current &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_MUTEX___PTR_CH_)
 #define _RTCORBA_MUTEX___PTR_CH_
-
+  
   class Mutex;
   typedef Mutex *Mutex_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_MUTEX___VAR_CH_)
 #define _RTCORBA_MUTEX___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export Mutex_var : public TAO_Base_var
   {
   public:
     Mutex_var (void); // default constructor
-    Mutex_var (Mutex_ptr p) : ptr_ (p) {}
+    Mutex_var (Mutex_ptr p) : ptr_ (p) {} 
     Mutex_var (const Mutex_var &); // copy constructor
     ~Mutex_var (void); // destructor
-
+    
     Mutex_var &operator= (Mutex_ptr);
     Mutex_var &operator= (const Mutex_var &);
     Mutex_ptr operator-> (void) const;
-
+    
     operator const Mutex_ptr &() const;
     operator Mutex_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Mutex_ptr in (void) const;
     Mutex_ptr &inout (void);
     Mutex_ptr &out (void);
     Mutex_ptr _retn (void);
     Mutex_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Mutex_ptr tao_duplicate (Mutex_ptr);
@@ -2635,7 +3034,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     Mutex_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2643,13 +3042,14 @@ TAO_NAMESPACE  RTCORBA
     Mutex_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_MUTEX___OUT_CH_)
 #define _RTCORBA_MUTEX___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export Mutex_out
   {
   public:
@@ -2662,63 +3062,70 @@ TAO_NAMESPACE  RTCORBA
     operator Mutex_ptr &();
     Mutex_ptr &ptr (void);
     Mutex_ptr operator-> (void);
-
+  
   private:
     Mutex_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_MUTEX_CH_)
 #define _RTCORBA_MUTEX_CH_
-
+  
   class TAO_RTCORBA_Export Mutex
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef Mutex_ptr _ptr_type;
     typedef Mutex_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static Mutex_ptr _duplicate (Mutex_ptr obj);
-
+    
     static Mutex_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Mutex_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Mutex_ptr _nil (void)
       {
         return (Mutex_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void lock (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void unlock (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean try_lock (
         TimeBase::TimeT max_wait
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2726,58 +3133,73 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     Mutex (void);
-
     virtual ~Mutex (void);
-
+    
+    friend class _TAO_Mutex_Remote_Proxy_Impl;
+    friend class _TAO_Mutex_ThruPOA_Proxy_Impl;
+    friend class _TAO_Mutex_Direct_Proxy_Impl;
+  
   private:
     Mutex (const Mutex &);
     void operator= (const Mutex &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_Mutex;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTCORBA_RTORB___PTR_CH_)
 #define _RTCORBA_RTORB___PTR_CH_
-
+  
   class RTORB;
   typedef RTORB *RTORB_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_RTORB___VAR_CH_)
 #define _RTCORBA_RTORB___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTCORBA_Export RTORB_var : public TAO_Base_var
   {
   public:
     RTORB_var (void); // default constructor
-    RTORB_var (RTORB_ptr p) : ptr_ (p) {}
+    RTORB_var (RTORB_ptr p) : ptr_ (p) {} 
     RTORB_var (const RTORB_var &); // copy constructor
     ~RTORB_var (void); // destructor
-
+    
     RTORB_var &operator= (RTORB_ptr);
     RTORB_var &operator= (const RTORB_var &);
     RTORB_ptr operator-> (void) const;
-
+    
     operator const RTORB_ptr &() const;
     operator RTORB_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     RTORB_ptr in (void) const;
     RTORB_ptr &inout (void);
     RTORB_ptr &out (void);
     RTORB_ptr _retn (void);
     RTORB_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static RTORB_ptr tao_duplicate (RTORB_ptr);
@@ -2788,7 +3210,7 @@ TAO_NAMESPACE  RTCORBA
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     RTORB_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2796,13 +3218,14 @@ TAO_NAMESPACE  RTCORBA
     RTORB_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTCORBA_RTORB___OUT_CH_)
 #define _RTCORBA_RTORB___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTCORBA_Export RTORB_out
   {
   public:
@@ -2815,55 +3238,60 @@ TAO_NAMESPACE  RTCORBA
     operator RTORB_ptr &();
     RTORB_ptr &ptr (void);
     RTORB_ptr operator-> (void);
-
+  
   private:
     RTORB_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTCORBA_RTORB_CH_)
 #define _RTCORBA_RTORB_CH_
-
+  
   class TAO_RTCORBA_Export RTORB
     : public virtual CORBA::Object
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef RTORB_ptr _ptr_type;
     typedef RTORB_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static RTORB_ptr _duplicate (RTORB_ptr obj);
-
+    
     static RTORB_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RTORB_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RTORB_ptr _nil (void)
       {
         return (RTORB_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::Mutex_ptr create_mutex (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy_mutex (
         RTCORBA::Mutex_ptr the_mutex
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2871,21 +3299,25 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_RTCORBA_RTORB_MUTEXNOTFOUND_CH_)
 #define _RTCORBA_RTORB_MUTEXNOTFOUND_CH_
-
+    
     class TAO_RTCORBA_Export MutexNotFound : public CORBA::UserException
     {
     public:
-
+      
       MutexNotFound (void);
       MutexNotFound (const MutexNotFound &);
       ~MutexNotFound (void);
 
       MutexNotFound &operator= (const MutexNotFound &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static MutexNotFound *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2897,18 +3329,28 @@ TAO_NAMESPACE  RTCORBA
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_MutexNotFound;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::Mutex_ptr create_named_mutex (
         const char * name,
         CORBA::Boolean_out created_flag
@@ -2917,7 +3359,10 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::Mutex_ptr open_named_mutex (
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2926,7 +3371,10 @@ TAO_NAMESPACE  RTCORBA
         CORBA::SystemException
         , RTCORBA::RTORB::MutexNotFound
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties (
         CORBA::Long send_buffer_size,
         CORBA::Long recv_buffer_size,
@@ -2939,21 +3387,25 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_RTCORBA_RTORB_INVALIDTHREADPOOL_CH_)
 #define _RTCORBA_RTORB_INVALIDTHREADPOOL_CH_
-
+    
     class TAO_RTCORBA_Export InvalidThreadpool : public CORBA::UserException
     {
     public:
-
+      
       InvalidThreadpool (void);
       InvalidThreadpool (const InvalidThreadpool &);
       ~InvalidThreadpool (void);
 
       InvalidThreadpool &operator= (const InvalidThreadpool &);
-
+      
+      static void _tao_any_destructor (void *);
+      
       static InvalidThreadpool *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2965,18 +3417,28 @@ TAO_NAMESPACE  RTCORBA
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-
-
+      
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_InvalidThreadpool;
 
 #endif /* end #if !defined */
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual RTCORBA::ThreadpoolId create_threadpool (
         CORBA::ULong stacksize,
         CORBA::ULong static_threads,
@@ -2990,7 +3452,10 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual RTCORBA::ThreadpoolId create_threadpool_with_lanes (
         CORBA::ULong stacksize,
         const RTCORBA::ThreadpoolLanes & lanes,
@@ -3003,7 +3468,10 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy_threadpool (
         RTCORBA::ThreadpoolId threadpool
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3012,7 +3480,10 @@ TAO_NAMESPACE  RTCORBA
         CORBA::SystemException
         , RTCORBA::RTORB::InvalidThreadpool
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy (
         RTCORBA::PriorityModel priority_model,
         RTCORBA::Priority server_priority
@@ -3021,7 +3492,10 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy (
         RTCORBA::ThreadpoolId threadpool
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3029,7 +3503,10 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (
         const RTCORBA::PriorityBands & priority_bands
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3037,7 +3514,10 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (
         const RTCORBA::ProtocolList & protocols
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3045,7 +3525,10 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (
         const RTCORBA::ProtocolList & protocols
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3053,66 +3536,233 @@ TAO_NAMESPACE  RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     RTORB (void);
-
     virtual ~RTORB (void);
-
+    
+    friend class _TAO_RTORB_Remote_Proxy_Impl;
+    friend class _TAO_RTORB_ThruPOA_Proxy_Impl;
+    friend class _TAO_RTORB_Direct_Proxy_Impl;
+  
   private:
     RTORB (const RTORB &);
     void operator= (const RTORB &);
   };
 
-
 #endif /* end #if !defined */
+  
+  // 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_RTORB;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module RTCORBA
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLane &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLane*); // noncopying version
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ThreadpoolLane *&); // deprecated
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLane *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLanes &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLanes*); // noncopying version
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ThreadpoolLanes *&); // deprecated
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLanes *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
+
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModel);
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModel &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ProtocolProperties_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::Protocol &); // copying version
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Protocol*); // noncopying version
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Protocol *&); // deprecated
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::Protocol *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ProtocolList &); // copying version
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolList*); // noncopying version
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ProtocolList *&); // deprecated
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ProtocolList *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBand &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBand*); // noncopying version
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityBand *&); // deprecated
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBand *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBands &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBands*); // noncopying version
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityBands *&); // deprecated
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBands *&);
 
-// Any operators for interface RTCORBA::ProtocolProperties
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ProtocolList &); // copying version
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolList*); // noncopying version
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ProtocolList *&); // deprecated
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ProtocolList *&);
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Current_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Mutex_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTORB_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::MutexNotFound &); // copying version
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::MutexNotFound*); // noncopying version
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTORB::MutexNotFound *&); // deprecated
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::MutexNotFound *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool &); // copying version
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::InvalidThreadpool*); // noncopying version
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTORB::InvalidThreadpool *&); // deprecated
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::ThreadpoolLane &);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::ThreadpoolLane &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_
 #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_
 
@@ -3127,11 +3777,21 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_ */
 
-TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityModel &); //
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityModel &);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityModel &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityBand &);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityBand &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
 #if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_H_
 #define _TAO_CDR_OP_RTCORBA_PriorityBands_H_
 
@@ -3146,9 +3806,13 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "RTCORBAC.i"
@@ -3164,3 +3828,4 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/RTCORBA/RTCORBAC.i b/TAO/tao/RTCORBA/RTCORBAC.i
index a7e4e9b58f6..cd576321b43 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.i
+++ b/TAO/tao/RTCORBA/RTCORBAC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class RTCORBA::ThreadpoolLane_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::ThreadpoolLane_var::ThreadpoolLane_var (void) // default constructor
+RTCORBA::ThreadpoolLane_var::ThreadpoolLane_var (void)
   : ptr_ (0)
 {}
 
@@ -34,15 +38,19 @@ RTCORBA::ThreadpoolLane_var::ThreadpoolLane_var (ThreadpoolLane *p)
 {}
 
 ACE_INLINE
-RTCORBA::ThreadpoolLane_var::ThreadpoolLane_var (const ::RTCORBA::ThreadpoolLane_var &p) // copy constructor
+RTCORBA::ThreadpoolLane_var::ThreadpoolLane_var (const ::RTCORBA::ThreadpoolLane_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::RTCORBA::ThreadpoolLane (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::RTCORBA::ThreadpoolLane (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size types only
+// Fixed-size types only.
 ACE_INLINE
 RTCORBA::ThreadpoolLane_var::ThreadpoolLane_var (const ::RTCORBA::ThreadpoolLane &p)
 {
@@ -50,33 +58,39 @@ RTCORBA::ThreadpoolLane_var::ThreadpoolLane_var (const ::RTCORBA::ThreadpoolLane
 }
 
 ACE_INLINE
-RTCORBA::ThreadpoolLane_var::~ThreadpoolLane_var (void) // destructor
+RTCORBA::ThreadpoolLane_var::~ThreadpoolLane_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE RTCORBA::ThreadpoolLane_var &
-RTCORBA::ThreadpoolLane_var::operator= (ThreadpoolLane *p)
+ACE_INLINE
+RTCORBA::ThreadpoolLane_var &
+RTCORBA::ThreadpoolLane_var::operator= (ThreadpoolLane *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::ThreadpoolLane_var &
-RTCORBA::ThreadpoolLane_var::operator= (const ::RTCORBA::ThreadpoolLane_var &p)
+ACE_INLINE
+::RTCORBA::ThreadpoolLane_var &
+RTCORBA::ThreadpoolLane_var::operator= (const ::RTCORBA::ThreadpoolLane_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
         {
-          ThreadpoolLane *deep_copy =
-            new ThreadpoolLane (*p.ptr_);
+          ThreadpoolLane *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ThreadpoolLane (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -98,8 +112,13 @@ RTCORBA::ThreadpoolLane_var::operator= (const ::RTCORBA::ThreadpoolLane &p)
   if (this->ptr_ != &p)
   {
     delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::ThreadpoolLane (p), *this);
+    ACE_NEW_RETURN (
+        this->ptr_,
+        ::RTCORBA::ThreadpoolLane (p),
+        *this
+      );
   }
+  
   return *this;
 }
 
@@ -164,192 +183,231 @@ RTCORBA::ThreadpoolLane_var::ptr (void) const
   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_RTCORBA_THREADPOOLLANES_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CI_
 
-// = Static operations.
-ACE_INLINE RTCORBA::ThreadpoolLane *
+ACE_INLINE
+RTCORBA::ThreadpoolLane *
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   RTCORBA::ThreadpoolLane *retval = 0;
   ACE_NEW_RETURN (retval, RTCORBA::ThreadpoolLane[size], 0);
   return retval;
 }
 
-ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (RTCORBA::ThreadpoolLane *buffer)
-// Free the sequence.
+ACE_INLINE
+void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (RTCORBA::ThreadpoolLane *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void) // Default constructor.
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void)
 {
 }
 
 ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum) // Constructor using a maximum length value.
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum,
-  CORBA::ULong length,
-  RTCORBA::ThreadpoolLane *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    RTCORBA::ThreadpoolLane *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs)
-// Copy constructor.
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (
+    const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    RTCORBA::ThreadpoolLane *tmp1 = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (this->maximum_);
-    RTCORBA::ThreadpoolLane * const tmp2 = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      RTCORBA::ThreadpoolLane *tmp1 =
+        _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (this->maximum_);
+      RTCORBA::ThreadpoolLane * const tmp2 =
+        ACE_reinterpret_cast (RTCORBA::ThreadpoolLane * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator= (const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs)
-// Assignment operator.
+ACE_INLINE
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator= (
+    const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      RTCORBA::ThreadpoolLane *tmp = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_);
-      _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          RTCORBA::ThreadpoolLane *tmp =
+            ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  RTCORBA::ThreadpoolLane *tmp1 = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_);
-  RTCORBA::ThreadpoolLane * const tmp2 = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane * ACE_CAST_CONST, rhs.buffer_);
+  RTCORBA::ThreadpoolLane *tmp1 =
+    ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_);
+  RTCORBA::ThreadpoolLane * const tmp2 =
+    ACE_reinterpret_cast (RTCORBA::ThreadpoolLane * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE RTCORBA::ThreadpoolLane &
+ACE_INLINE
+RTCORBA::ThreadpoolLane &
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  RTCORBA::ThreadpoolLane* tmp = ACE_reinterpret_cast(RTCORBA::ThreadpoolLane*,this->buffer_);
+  RTCORBA::ThreadpoolLane* tmp =
+    ACE_reinterpret_cast (RTCORBA::ThreadpoolLane*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const RTCORBA::ThreadpoolLane &
+ACE_INLINE
+const RTCORBA::ThreadpoolLane &
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  RTCORBA::ThreadpoolLane * const tmp = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane* ACE_CAST_CONST, this->buffer_);
+  RTCORBA::ThreadpoolLane * const tmp =
+    ACE_reinterpret_cast (RTCORBA::ThreadpoolLane* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE RTCORBA::ThreadpoolLane *
+ACE_INLINE
+RTCORBA::ThreadpoolLane *
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::get_buffer (CORBA::Boolean orphan)
 {
   RTCORBA::ThreadpoolLane *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (RTCORBA::ThreadpoolLane*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(RTCORBA::ThreadpoolLane*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(RTCORBA::ThreadpoolLane*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const RTCORBA::ThreadpoolLane *
+ACE_INLINE
+const RTCORBA::ThreadpoolLane *
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const RTCORBA::ThreadpoolLane * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const RTCORBA::ThreadpoolLane * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::replace (CORBA::ULong max,
-CORBA::ULong length,
-RTCORBA::ThreadpoolLane *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    RTCORBA::ThreadpoolLane *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    RTCORBA::ThreadpoolLane *tmp = ACE_reinterpret_cast(RTCORBA::ThreadpoolLane*,this->buffer_);
-    _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp);
-  }
+    {
+      RTCORBA::ThreadpoolLane *tmp =
+        ACE_reinterpret_cast (RTCORBA::ThreadpoolLane*, this->buffer_);
+      _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CI_)
 #define _RTCORBA_THREADPOOLLANES_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class RTCORBA::ThreadpoolLanes_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::ThreadpoolLanes_var (void) // default constructor
+RTCORBA::ThreadpoolLanes_var::ThreadpoolLanes_var (void)
   : ptr_ (0)
 {}
 
@@ -359,15 +417,19 @@ RTCORBA::ThreadpoolLanes_var::ThreadpoolLanes_var (ThreadpoolLanes *p)
 {}
 
 ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::ThreadpoolLanes_var (const ::RTCORBA::ThreadpoolLanes_var &p) // copy constructor
+RTCORBA::ThreadpoolLanes_var::ThreadpoolLanes_var (const ::RTCORBA::ThreadpoolLanes_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::RTCORBA::ThreadpoolLanes (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::RTCORBA::ThreadpoolLanes (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size base types only
+// Fixed-size base types only.
 ACE_INLINE
 RTCORBA::ThreadpoolLanes_var::ThreadpoolLanes_var (const ::RTCORBA::ThreadpoolLanes &p)
 {
@@ -375,12 +437,13 @@ RTCORBA::ThreadpoolLanes_var::ThreadpoolLanes_var (const ::RTCORBA::ThreadpoolLa
 }
 
 ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::~ThreadpoolLanes_var (void) // destructor
+RTCORBA::ThreadpoolLanes_var::~ThreadpoolLanes_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE RTCORBA::ThreadpoolLanes_var &
+ACE_INLINE
+RTCORBA::ThreadpoolLanes_var &
 RTCORBA::ThreadpoolLanes_var::operator= (ThreadpoolLanes *p)
 {
   delete this->ptr_;
@@ -388,7 +451,8 @@ RTCORBA::ThreadpoolLanes_var::operator= (ThreadpoolLanes *p)
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::ThreadpoolLanes_var &
+ACE_INLINE
+::RTCORBA::ThreadpoolLanes_var &
 RTCORBA::ThreadpoolLanes_var::operator= (const ::RTCORBA::ThreadpoolLanes_var &p)
 {
   if (this != &p)
@@ -400,8 +464,12 @@ RTCORBA::ThreadpoolLanes_var::operator= (const ::RTCORBA::ThreadpoolLanes_var &p
         }
       else
         {
-          ThreadpoolLanes *deep_copy =
-            new ThreadpoolLanes (*p.ptr_);
+          ThreadpoolLanes *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ThreadpoolLanes (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -416,74 +484,82 @@ RTCORBA::ThreadpoolLanes_var::operator= (const ::RTCORBA::ThreadpoolLanes_var &p
   return *this;
 }
 
-// fixed-size types only
-ACE_INLINE ::RTCORBA::ThreadpoolLanes_var &
+// Fixed-size types only.
+ACE_INLINE
+::RTCORBA::ThreadpoolLanes_var &
 RTCORBA::ThreadpoolLanes_var::operator= (const ::RTCORBA::ThreadpoolLanes &p)
 {
   if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::ThreadpoolLanes (p), *this);
-  }
+    {
+      delete this->ptr_;
+      ACE_NEW_RETURN (this->ptr_, ::RTCORBA::ThreadpoolLanes (p), *this);
+    }
+  
   return *this;
 }
 
-ACE_INLINE const ::RTCORBA::ThreadpoolLanes *
+ACE_INLINE
+const ::RTCORBA::ThreadpoolLanes *
 RTCORBA::ThreadpoolLanes_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ThreadpoolLanes *
+ACE_INLINE
+::RTCORBA::ThreadpoolLanes *
 RTCORBA::ThreadpoolLanes_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 RTCORBA::ThreadpoolLanes_var::operator const ::RTCORBA::ThreadpoolLanes &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 RTCORBA::ThreadpoolLanes_var::operator ::RTCORBA::ThreadpoolLanes &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 RTCORBA::ThreadpoolLanes_var::operator ::RTCORBA::ThreadpoolLanes &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE RTCORBA::ThreadpoolLane &
+ACE_INLINE
+RTCORBA::ThreadpoolLane &
 RTCORBA::ThreadpoolLanes_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const RTCORBA::ThreadpoolLane &
+ACE_INLINE
+const RTCORBA::ThreadpoolLane &
 RTCORBA::ThreadpoolLanes_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const RTCORBA::ThreadpoolLane &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::RTCORBA::ThreadpoolLanes &
+ACE_INLINE
+const ::RTCORBA::ThreadpoolLanes &
 RTCORBA::ThreadpoolLanes_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ThreadpoolLanes &
+ACE_INLINE
+::RTCORBA::ThreadpoolLanes &
 RTCORBA::ThreadpoolLanes_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::RTCORBA::ThreadpoolLanes *&
+ACE_INLINE
+::RTCORBA::ThreadpoolLanes *&
 RTCORBA::ThreadpoolLanes_var::out (void)
 {
   delete this->ptr_;
@@ -491,7 +567,8 @@ RTCORBA::ThreadpoolLanes_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ThreadpoolLanes *
+ACE_INLINE
+::RTCORBA::ThreadpoolLanes *
 RTCORBA::ThreadpoolLanes_var::_retn (void)
 {
   ::RTCORBA::ThreadpoolLanes *tmp = this->ptr_;
@@ -499,12 +576,16 @@ RTCORBA::ThreadpoolLanes_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::RTCORBA::ThreadpoolLanes *
+ACE_INLINE
+::RTCORBA::ThreadpoolLanes *
 RTCORBA::ThreadpoolLanes_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 RTCORBA::ThreadpoolLanes_out
 // *************************************************************
@@ -517,7 +598,7 @@ RTCORBA::ThreadpoolLanes_out::ThreadpoolLanes_out (ThreadpoolLanes *&p)
 }
 
 ACE_INLINE
-RTCORBA::ThreadpoolLanes_out::ThreadpoolLanes_out (ThreadpoolLanes_var &p) // constructor from _var
+RTCORBA::ThreadpoolLanes_out::ThreadpoolLanes_out (ThreadpoolLanes_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -525,78 +606,109 @@ RTCORBA::ThreadpoolLanes_out::ThreadpoolLanes_out (ThreadpoolLanes_var &p) // co
 }
 
 ACE_INLINE
-RTCORBA::ThreadpoolLanes_out::ThreadpoolLanes_out (const ::RTCORBA::ThreadpoolLanes_out &p) // copy constructor
+RTCORBA::ThreadpoolLanes_out::ThreadpoolLanes_out (const ::RTCORBA::ThreadpoolLanes_out &p)
   : ptr_ (ACE_const_cast (ThreadpoolLanes_out&, p).ptr_)
 {}
 
-ACE_INLINE ::RTCORBA::ThreadpoolLanes_out &
+ACE_INLINE
+::RTCORBA::ThreadpoolLanes_out &
 RTCORBA::ThreadpoolLanes_out::operator= (const ::RTCORBA::ThreadpoolLanes_out &p)
 {
   this->ptr_ = ACE_const_cast (ThreadpoolLanes_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::ThreadpoolLanes_out &
+ACE_INLINE
+::RTCORBA::ThreadpoolLanes_out &
 RTCORBA::ThreadpoolLanes_out::operator= (ThreadpoolLanes *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 RTCORBA::ThreadpoolLanes_out::operator ::RTCORBA::ThreadpoolLanes *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ThreadpoolLanes *&
+ACE_INLINE
+::RTCORBA::ThreadpoolLanes *&
 RTCORBA::ThreadpoolLanes_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ThreadpoolLanes *
+ACE_INLINE
+::RTCORBA::ThreadpoolLanes *
 RTCORBA::ThreadpoolLanes_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE RTCORBA::ThreadpoolLane &
+ACE_INLINE
+RTCORBA::ThreadpoolLane &
 RTCORBA::ThreadpoolLanes_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY___CI_)
 #define _RTCORBA_PRIORITYMODELPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::PriorityModelPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY___CI_)
 #define _RTCORBA_THREADPOOLPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::ThreadpoolPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_PROTOCOLPROPERTIES___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class RTCORBA::Protocol_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::Protocol_var::Protocol_var (void) // default constructor
+RTCORBA::Protocol_var::Protocol_var (void)
   : ptr_ (0)
 {}
 
@@ -606,42 +718,52 @@ RTCORBA::Protocol_var::Protocol_var (Protocol *p)
 {}
 
 ACE_INLINE
-RTCORBA::Protocol_var::Protocol_var (const ::RTCORBA::Protocol_var &p) // copy constructor
+RTCORBA::Protocol_var::Protocol_var (const ::RTCORBA::Protocol_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::RTCORBA::Protocol (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::RTCORBA::Protocol (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-RTCORBA::Protocol_var::~Protocol_var (void) // destructor
+RTCORBA::Protocol_var::~Protocol_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE RTCORBA::Protocol_var &
-RTCORBA::Protocol_var::operator= (Protocol *p)
+ACE_INLINE
+RTCORBA::Protocol_var &
+RTCORBA::Protocol_var::operator= (Protocol *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::Protocol_var &
-RTCORBA::Protocol_var::operator= (const ::RTCORBA::Protocol_var &p)
+ACE_INLINE
+::RTCORBA::Protocol_var &
+RTCORBA::Protocol_var::operator= (const ::RTCORBA::Protocol_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
         {
-          Protocol *deep_copy =
-            new Protocol (*p.ptr_);
+          Protocol *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              Protocol (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -686,7 +808,7 @@ RTCORBA::Protocol_var::operator ::RTCORBA::Protocol &() const // cast
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 RTCORBA::Protocol_var::operator ::RTCORBA::Protocol *&() // cast 
 {
@@ -705,7 +827,7 @@ RTCORBA::Protocol_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// Mapping for variable size.
 ACE_INLINE ::RTCORBA::Protocol *&
 RTCORBA::Protocol_var::out (void)
 {
@@ -728,6 +850,9 @@ RTCORBA::Protocol_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 RTCORBA::Protocol_out
 // *************************************************************
@@ -740,7 +865,7 @@ RTCORBA::Protocol_out::Protocol_out (::RTCORBA::Protocol *&p)
 }
 
 ACE_INLINE
-RTCORBA::Protocol_out::Protocol_out (Protocol_var &p) // constructor from _var
+RTCORBA::Protocol_out::Protocol_out (Protocol_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -748,21 +873,23 @@ RTCORBA::Protocol_out::Protocol_out (Protocol_var &p) // constructor from _var
 }
 
 ACE_INLINE
-RTCORBA::Protocol_out::Protocol_out (const ::RTCORBA::Protocol_out &p) // copy constructor
+RTCORBA::Protocol_out::Protocol_out (const ::RTCORBA::Protocol_out &p)
   : ptr_ (ACE_const_cast (Protocol_out&, p).ptr_)
 {}
 
-ACE_INLINE RTCORBA::Protocol_out &
+ACE_INLINE
+RTCORBA::Protocol_out &
 RTCORBA::Protocol_out::operator= (const ::RTCORBA::Protocol_out &p)
 {
   this->ptr_ = ACE_const_cast (Protocol_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE RTCORBA::Protocol_out &
-RTCORBA::Protocol_out::operator= (Protocol *p)
+ACE_INLINE
+RTCORBA::Protocol_out &
+RTCORBA::Protocol_out::operator= (Protocol *_tao_struct_out)
 {
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_out;
   return *this;
 }
 
@@ -784,192 +911,231 @@ RTCORBA::Protocol_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_RTCORBA_PROTOCOLLIST_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CI_
 
-// = Static operations.
-ACE_INLINE RTCORBA::Protocol *
+ACE_INLINE
+RTCORBA::Protocol *
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   RTCORBA::Protocol *retval = 0;
   ACE_NEW_RETURN (retval, RTCORBA::Protocol[size], 0);
   return retval;
 }
 
-ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (RTCORBA::Protocol *buffer)
-// Free the sequence.
+ACE_INLINE
+void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (RTCORBA::Protocol *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void) // Default constructor.
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void)
 {
 }
 
 ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum) // Constructor using a maximum length value.
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum,
-  CORBA::ULong length,
-  RTCORBA::Protocol *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    RTCORBA::Protocol *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs)
-// Copy constructor.
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (
+    const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    RTCORBA::Protocol *tmp1 = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->maximum_);
-    RTCORBA::Protocol * const tmp2 = ACE_reinterpret_cast (RTCORBA::Protocol * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      RTCORBA::Protocol *tmp1 =
+        _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->maximum_);
+      RTCORBA::Protocol * const tmp2 =
+        ACE_reinterpret_cast (RTCORBA::Protocol * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList &
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator= (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs)
-// Assignment operator.
+ACE_INLINE
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList &
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator= (
+    const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      RTCORBA::Protocol *tmp = ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
-      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          RTCORBA::Protocol *tmp =
+            ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  RTCORBA::Protocol *tmp1 = ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
-  RTCORBA::Protocol * const tmp2 = ACE_reinterpret_cast (RTCORBA::Protocol * ACE_CAST_CONST, rhs.buffer_);
+  RTCORBA::Protocol *tmp1 =
+    ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
+  RTCORBA::Protocol * const tmp2 =
+    ACE_reinterpret_cast (RTCORBA::Protocol * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE RTCORBA::Protocol &
+ACE_INLINE
+RTCORBA::Protocol &
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  RTCORBA::Protocol* tmp = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_);
+  RTCORBA::Protocol* tmp =
+    ACE_reinterpret_cast (RTCORBA::Protocol*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const RTCORBA::Protocol &
+ACE_INLINE
+const RTCORBA::Protocol &
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  RTCORBA::Protocol * const tmp = ACE_reinterpret_cast (RTCORBA::Protocol* ACE_CAST_CONST, this->buffer_);
+  RTCORBA::Protocol * const tmp =
+    ACE_reinterpret_cast (RTCORBA::Protocol* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE RTCORBA::Protocol *
+ACE_INLINE
+RTCORBA::Protocol *
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (CORBA::Boolean orphan)
 {
   RTCORBA::Protocol *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
     {
-      result = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
-    {
-      result = ACE_reinterpret_cast (RTCORBA::Protocol*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (RTCORBA::Protocol*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const RTCORBA::Protocol *
+ACE_INLINE
+const RTCORBA::Protocol *
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const RTCORBA::Protocol * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const RTCORBA::Protocol * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::replace (CORBA::ULong max,
-CORBA::ULong length,
-RTCORBA::Protocol *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    RTCORBA::Protocol *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    RTCORBA::Protocol *tmp = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_);
-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
-  }
+    {
+      RTCORBA::Protocol *tmp =
+        ACE_reinterpret_cast (RTCORBA::Protocol*, this->buffer_);
+      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CI_)
 #define _RTCORBA_PROTOCOLLIST_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class RTCORBA::ProtocolList_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::ProtocolList_var::ProtocolList_var (void) // default constructor
+RTCORBA::ProtocolList_var::ProtocolList_var (void)
   : ptr_ (0)
 {}
 
@@ -979,21 +1145,26 @@ RTCORBA::ProtocolList_var::ProtocolList_var (ProtocolList *p)
 {}
 
 ACE_INLINE
-RTCORBA::ProtocolList_var::ProtocolList_var (const ::RTCORBA::ProtocolList_var &p) // copy constructor
+RTCORBA::ProtocolList_var::ProtocolList_var (const ::RTCORBA::ProtocolList_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::RTCORBA::ProtocolList (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::RTCORBA::ProtocolList (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-RTCORBA::ProtocolList_var::~ProtocolList_var (void) // destructor
+RTCORBA::ProtocolList_var::~ProtocolList_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE RTCORBA::ProtocolList_var &
+ACE_INLINE
+RTCORBA::ProtocolList_var &
 RTCORBA::ProtocolList_var::operator= (ProtocolList *p)
 {
   delete this->ptr_;
@@ -1001,7 +1172,8 @@ RTCORBA::ProtocolList_var::operator= (ProtocolList *p)
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList_var &
+ACE_INLINE
+::RTCORBA::ProtocolList_var &
 RTCORBA::ProtocolList_var::operator= (const ::RTCORBA::ProtocolList_var &p)
 {
   if (this != &p)
@@ -1013,8 +1185,12 @@ RTCORBA::ProtocolList_var::operator= (const ::RTCORBA::ProtocolList_var &p)
         }
       else
         {
-          ProtocolList *deep_copy =
-            new ProtocolList (*p.ptr_);
+          ProtocolList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ProtocolList (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1029,69 +1205,75 @@ RTCORBA::ProtocolList_var::operator= (const ::RTCORBA::ProtocolList_var &p)
   return *this;
 }
 
-ACE_INLINE const ::RTCORBA::ProtocolList *
+ACE_INLINE
+const ::RTCORBA::ProtocolList *
 RTCORBA::ProtocolList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList *
+ACE_INLINE
+::RTCORBA::ProtocolList *
 RTCORBA::ProtocolList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 RTCORBA::ProtocolList_var::operator const ::RTCORBA::ProtocolList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE RTCORBA::Protocol &
+ACE_INLINE
+RTCORBA::Protocol &
 RTCORBA::ProtocolList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const RTCORBA::Protocol &
+ACE_INLINE
+const RTCORBA::Protocol &
 RTCORBA::ProtocolList_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const RTCORBA::Protocol &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::RTCORBA::ProtocolList &
+ACE_INLINE
+const ::RTCORBA::ProtocolList &
 RTCORBA::ProtocolList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList &
+ACE_INLINE
+::RTCORBA::ProtocolList &
 RTCORBA::ProtocolList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::RTCORBA::ProtocolList *&
+ACE_INLINE
+::RTCORBA::ProtocolList *&
 RTCORBA::ProtocolList_var::out (void)
 {
   delete this->ptr_;
@@ -1099,7 +1281,8 @@ RTCORBA::ProtocolList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList *
+ACE_INLINE
+::RTCORBA::ProtocolList *
 RTCORBA::ProtocolList_var::_retn (void)
 {
   ::RTCORBA::ProtocolList *tmp = this->ptr_;
@@ -1107,12 +1290,16 @@ RTCORBA::ProtocolList_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList *
+ACE_INLINE
+::RTCORBA::ProtocolList *
 RTCORBA::ProtocolList_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 RTCORBA::ProtocolList_out
 // *************************************************************
@@ -1125,7 +1312,7 @@ RTCORBA::ProtocolList_out::ProtocolList_out (ProtocolList *&p)
 }
 
 ACE_INLINE
-RTCORBA::ProtocolList_out::ProtocolList_out (ProtocolList_var &p) // constructor from _var
+RTCORBA::ProtocolList_out::ProtocolList_out (ProtocolList_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1133,106 +1320,169 @@ RTCORBA::ProtocolList_out::ProtocolList_out (ProtocolList_var &p) // constructor
 }
 
 ACE_INLINE
-RTCORBA::ProtocolList_out::ProtocolList_out (const ::RTCORBA::ProtocolList_out &p) // copy constructor
+RTCORBA::ProtocolList_out::ProtocolList_out (const ::RTCORBA::ProtocolList_out &p)
   : ptr_ (ACE_const_cast (ProtocolList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::RTCORBA::ProtocolList_out &
+ACE_INLINE
+::RTCORBA::ProtocolList_out &
 RTCORBA::ProtocolList_out::operator= (const ::RTCORBA::ProtocolList_out &p)
 {
   this->ptr_ = ACE_const_cast (ProtocolList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList_out &
+ACE_INLINE
+::RTCORBA::ProtocolList_out &
 RTCORBA::ProtocolList_out::operator= (ProtocolList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 RTCORBA::ProtocolList_out::operator ::RTCORBA::ProtocolList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList *&
+ACE_INLINE
+::RTCORBA::ProtocolList *&
 RTCORBA::ProtocolList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList *
+ACE_INLINE
+::RTCORBA::ProtocolList *
 RTCORBA::ProtocolList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE RTCORBA::Protocol &
+ACE_INLINE
+RTCORBA::Protocol &
 RTCORBA::ProtocolList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___CI_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::ServerProtocolPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___CI_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::ClientProtocolPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___CI_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::PrivateConnectionPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::TCPProtocolProperties::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::GIOPProtocolProperties::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::UnixDomainProtocolProperties::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::SharedMemoryProtocolProperties::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class RTCORBA::PriorityBand_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::PriorityBand_var::PriorityBand_var (void) // default constructor
+RTCORBA::PriorityBand_var::PriorityBand_var (void)
   : ptr_ (0)
 {}
 
@@ -1242,15 +1492,19 @@ RTCORBA::PriorityBand_var::PriorityBand_var (PriorityBand *p)
 {}
 
 ACE_INLINE
-RTCORBA::PriorityBand_var::PriorityBand_var (const ::RTCORBA::PriorityBand_var &p) // copy constructor
+RTCORBA::PriorityBand_var::PriorityBand_var (const ::RTCORBA::PriorityBand_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::RTCORBA::PriorityBand (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::RTCORBA::PriorityBand (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size types only
+// Fixed-size types only.
 ACE_INLINE
 RTCORBA::PriorityBand_var::PriorityBand_var (const ::RTCORBA::PriorityBand &p)
 {
@@ -1258,33 +1512,39 @@ RTCORBA::PriorityBand_var::PriorityBand_var (const ::RTCORBA::PriorityBand &p)
 }
 
 ACE_INLINE
-RTCORBA::PriorityBand_var::~PriorityBand_var (void) // destructor
+RTCORBA::PriorityBand_var::~PriorityBand_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE RTCORBA::PriorityBand_var &
-RTCORBA::PriorityBand_var::operator= (PriorityBand *p)
+ACE_INLINE
+RTCORBA::PriorityBand_var &
+RTCORBA::PriorityBand_var::operator= (PriorityBand *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBand_var &
-RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand_var &p)
+ACE_INLINE
+::RTCORBA::PriorityBand_var &
+RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand_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
         {
-          PriorityBand *deep_copy =
-            new PriorityBand (*p.ptr_);
+          PriorityBand *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              PriorityBand (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1306,8 +1566,13 @@ RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand &p)
   if (this->ptr_ != &p)
   {
     delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::PriorityBand (p), *this);
+    ACE_NEW_RETURN (
+        this->ptr_,
+        ::RTCORBA::PriorityBand (p),
+        *this
+      );
   }
+  
   return *this;
 }
 
@@ -1372,192 +1637,231 @@ RTCORBA::PriorityBand_var::ptr (void) const
   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_RTCORBA_PRIORITYBANDS_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CI_
 
-// = Static operations.
-ACE_INLINE RTCORBA::PriorityBand *
+ACE_INLINE
+RTCORBA::PriorityBand *
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (CORBA::ULong size)
-// Allocate storage for the sequence.
 {
   RTCORBA::PriorityBand *retval = 0;
   ACE_NEW_RETURN (retval, RTCORBA::PriorityBand[size], 0);
   return retval;
 }
 
-ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (RTCORBA::PriorityBand *buffer)
-// Free the sequence.
+ACE_INLINE
+void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (RTCORBA::PriorityBand *buffer)
 {
   delete [] buffer;
 }
 
 ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void) // Default constructor.
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void)
 {
 }
 
 ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum) // Constructor using a maximum length value.
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum) 
   : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (maximum))
 {
 }
 
 ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum,
-  CORBA::ULong length,
-  RTCORBA::PriorityBand *data,
-  CORBA::Boolean release)
-: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    RTCORBA::PriorityBand *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
 ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs)
-// Copy constructor.
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (
+    const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs
+  )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
-  {
-    RTCORBA::PriorityBand *tmp1 = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->maximum_);
-    RTCORBA::PriorityBand * const tmp2 = ACE_reinterpret_cast (RTCORBA::PriorityBand * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
+    {
+      RTCORBA::PriorityBand *tmp1 =
+        _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->maximum_);
+      RTCORBA::PriorityBand * const tmp2 =
+        ACE_reinterpret_cast (RTCORBA::PriorityBand * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
   else
-  {
-    this->buffer_ = 0;
-  }
+    {
+      this->buffer_ = 0;
+    }
 }
 
-ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands &
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator= (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs)
-// Assignment operator.
+ACE_INLINE
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands &
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator= (
+    const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs
+  )
 {
   if (this == &rhs)
-    return *this;
+    {
+      return *this;
+    }
   
   if (this->release_)
-  {
-    if (this->maximum_ < rhs.maximum_)
     {
-      // free the old buffer
-      RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
-      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
-      this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_);
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          RTCORBA::PriorityBand *tmp =
+            ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_);
+        }
     }
-  }
   else
-    this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_);
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_);
+    }
   
   TAO_Unbounded_Base_Sequence::operator= (rhs);
   
-  RTCORBA::PriorityBand *tmp1 = ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
-  RTCORBA::PriorityBand * const tmp2 = ACE_reinterpret_cast (RTCORBA::PriorityBand * ACE_CAST_CONST, rhs.buffer_);
+  RTCORBA::PriorityBand *tmp1 =
+    ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
+  RTCORBA::PriorityBand * const tmp2 =
+    ACE_reinterpret_cast (RTCORBA::PriorityBand * ACE_CAST_CONST, rhs.buffer_);
   
   for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
+    {
+      tmp1[i] = tmp2[i];
+    }
   
   return *this;
 }
 
 // = Accessors.
-ACE_INLINE RTCORBA::PriorityBand &
+ACE_INLINE
+RTCORBA::PriorityBand &
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i)
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  RTCORBA::PriorityBand* tmp = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_);
+  RTCORBA::PriorityBand* tmp =
+    ACE_reinterpret_cast (RTCORBA::PriorityBand*, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const RTCORBA::PriorityBand &
+ACE_INLINE
+const RTCORBA::PriorityBand &
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i) const
-// operator []
 {
   ACE_ASSERT (i < this->maximum_);
-  RTCORBA::PriorityBand * const tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand* ACE_CAST_CONST, this->buffer_);
+  RTCORBA::PriorityBand * const tmp =
+    ACE_reinterpret_cast (RTCORBA::PriorityBand* ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-ACE_INLINE RTCORBA::PriorityBand *
+ACE_INLINE
+RTCORBA::PriorityBand *
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (CORBA::Boolean orphan)
 {
   RTCORBA::PriorityBand *result = 0;
+  
   if (orphan == 0)
-  {
-    // We retain ownership.
-    if (this->buffer_ == 0)
-    {
-      result = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->length_);
-      this->buffer_ = result;
-      this->release_ = 1;
-    }
-    else
     {
-      result = ACE_reinterpret_cast (RTCORBA::PriorityBand*, this->buffer_);
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (RTCORBA::PriorityBand*, this->buffer_);
+        }
     }
-  }
   else // if (orphan == 1)
-  {
-    if (this->release_ != 0)
     {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
     }
-  }
+  
   return result;
 }
 
-ACE_INLINE const RTCORBA::PriorityBand *
+ACE_INLINE
+const RTCORBA::PriorityBand *
 RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const RTCORBA::PriorityBand * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const RTCORBA::PriorityBand * ACE_CAST_CONST, this->buffer_);
 }
 
-ACE_INLINE void
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::replace (CORBA::ULong max,
-CORBA::ULong length,
-RTCORBA::PriorityBand *data,
-CORBA::Boolean release)
+ACE_INLINE
+void
+RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    RTCORBA::PriorityBand *data,
+    CORBA::Boolean release
+  )
 {
   this->maximum_ = max;
   this->length_ = length;
+  
   if (this->buffer_ && this->release_ == 1)
-  {
-    RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_);
-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
-  }
+    {
+      RTCORBA::PriorityBand *tmp =
+        ACE_reinterpret_cast (RTCORBA::PriorityBand*, this->buffer_);
+      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
+    }
+  
   this->buffer_ = data;
   this->release_ = release;
 }
 
 #endif /* end #if !defined */
 
-
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_RTCORBA_PRIORITYBANDS_CI_)
 #define _RTCORBA_PRIORITYBANDS_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class RTCORBA::PriorityBands_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::PriorityBands_var::PriorityBands_var (void) // default constructor
+RTCORBA::PriorityBands_var::PriorityBands_var (void)
   : ptr_ (0)
 {}
 
@@ -1567,15 +1871,19 @@ RTCORBA::PriorityBands_var::PriorityBands_var (PriorityBands *p)
 {}
 
 ACE_INLINE
-RTCORBA::PriorityBands_var::PriorityBands_var (const ::RTCORBA::PriorityBands_var &p) // copy constructor
+RTCORBA::PriorityBands_var::PriorityBands_var (const ::RTCORBA::PriorityBands_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::RTCORBA::PriorityBands (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::RTCORBA::PriorityBands (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size base types only
+// Fixed-size base types only.
 ACE_INLINE
 RTCORBA::PriorityBands_var::PriorityBands_var (const ::RTCORBA::PriorityBands &p)
 {
@@ -1583,12 +1891,13 @@ RTCORBA::PriorityBands_var::PriorityBands_var (const ::RTCORBA::PriorityBands &p
 }
 
 ACE_INLINE
-RTCORBA::PriorityBands_var::~PriorityBands_var (void) // destructor
+RTCORBA::PriorityBands_var::~PriorityBands_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE RTCORBA::PriorityBands_var &
+ACE_INLINE
+RTCORBA::PriorityBands_var &
 RTCORBA::PriorityBands_var::operator= (PriorityBands *p)
 {
   delete this->ptr_;
@@ -1596,7 +1905,8 @@ RTCORBA::PriorityBands_var::operator= (PriorityBands *p)
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands_var &
+ACE_INLINE
+::RTCORBA::PriorityBands_var &
 RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands_var &p)
 {
   if (this != &p)
@@ -1608,8 +1918,12 @@ RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands_var &p)
         }
       else
         {
-          PriorityBands *deep_copy =
-            new PriorityBands (*p.ptr_);
+          PriorityBands *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              PriorityBands (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -1624,74 +1938,82 @@ RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands_var &p)
   return *this;
 }
 
-// fixed-size types only
-ACE_INLINE ::RTCORBA::PriorityBands_var &
+// Fixed-size types only.
+ACE_INLINE
+::RTCORBA::PriorityBands_var &
 RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands &p)
 {
   if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::PriorityBands (p), *this);
-  }
+    {
+      delete this->ptr_;
+      ACE_NEW_RETURN (this->ptr_, ::RTCORBA::PriorityBands (p), *this);
+    }
+  
   return *this;
 }
 
-ACE_INLINE const ::RTCORBA::PriorityBands *
+ACE_INLINE
+const ::RTCORBA::PriorityBands *
 RTCORBA::PriorityBands_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands *
+ACE_INLINE
+::RTCORBA::PriorityBands *
 RTCORBA::PriorityBands_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 RTCORBA::PriorityBands_var::operator const ::RTCORBA::PriorityBands &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 RTCORBA::PriorityBands_var::operator ::RTCORBA::PriorityBands &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 RTCORBA::PriorityBands_var::operator ::RTCORBA::PriorityBands &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE RTCORBA::PriorityBand &
+ACE_INLINE
+RTCORBA::PriorityBand &
 RTCORBA::PriorityBands_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const RTCORBA::PriorityBand &
+ACE_INLINE
+const RTCORBA::PriorityBand &
 RTCORBA::PriorityBands_var::operator[] (CORBA::ULong index) const
 {
   return ACE_const_cast (const RTCORBA::PriorityBand &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::RTCORBA::PriorityBands &
+ACE_INLINE
+const ::RTCORBA::PriorityBands &
 RTCORBA::PriorityBands_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands &
+ACE_INLINE
+::RTCORBA::PriorityBands &
 RTCORBA::PriorityBands_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::RTCORBA::PriorityBands *&
+ACE_INLINE
+::RTCORBA::PriorityBands *&
 RTCORBA::PriorityBands_var::out (void)
 {
   delete this->ptr_;
@@ -1699,7 +2021,8 @@ RTCORBA::PriorityBands_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands *
+ACE_INLINE
+::RTCORBA::PriorityBands *
 RTCORBA::PriorityBands_var::_retn (void)
 {
   ::RTCORBA::PriorityBands *tmp = this->ptr_;
@@ -1707,12 +2030,16 @@ RTCORBA::PriorityBands_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands *
+ACE_INLINE
+::RTCORBA::PriorityBands *
 RTCORBA::PriorityBands_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 RTCORBA::PriorityBands_out
 // *************************************************************
@@ -1725,7 +2052,7 @@ RTCORBA::PriorityBands_out::PriorityBands_out (PriorityBands *&p)
 }
 
 ACE_INLINE
-RTCORBA::PriorityBands_out::PriorityBands_out (PriorityBands_var &p) // constructor from _var
+RTCORBA::PriorityBands_out::PriorityBands_out (PriorityBands_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1733,113 +2060,160 @@ RTCORBA::PriorityBands_out::PriorityBands_out (PriorityBands_var &p) // construc
 }
 
 ACE_INLINE
-RTCORBA::PriorityBands_out::PriorityBands_out (const ::RTCORBA::PriorityBands_out &p) // copy constructor
+RTCORBA::PriorityBands_out::PriorityBands_out (const ::RTCORBA::PriorityBands_out &p)
   : ptr_ (ACE_const_cast (PriorityBands_out&, p).ptr_)
 {}
 
-ACE_INLINE ::RTCORBA::PriorityBands_out &
+ACE_INLINE
+::RTCORBA::PriorityBands_out &
 RTCORBA::PriorityBands_out::operator= (const ::RTCORBA::PriorityBands_out &p)
 {
   this->ptr_ = ACE_const_cast (PriorityBands_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands_out &
+ACE_INLINE
+::RTCORBA::PriorityBands_out &
 RTCORBA::PriorityBands_out::operator= (PriorityBands *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 RTCORBA::PriorityBands_out::operator ::RTCORBA::PriorityBands *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands *&
+ACE_INLINE
+::RTCORBA::PriorityBands *&
 RTCORBA::PriorityBands_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands *
+ACE_INLINE
+::RTCORBA::PriorityBands *
 RTCORBA::PriorityBands_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE RTCORBA::PriorityBand &
+ACE_INLINE
+RTCORBA::PriorityBand &
 RTCORBA::PriorityBands_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___CI_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::PriorityBandedConnectionPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_CURRENT___CI_)
 #define _RTCORBA_CURRENT___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_MUTEX___CI_)
 #define _RTCORBA_MUTEX___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::Mutex::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception RTCORBA::RTORB::MutexNotFound
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception RTCORBA::RTORB::InvalidThreadpool
-// *************************************************************
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_RTORB___CI_)
 #define _RTCORBA_RTORB___CI_
 
+ACE_INLINE
+CORBA::Boolean
+RTCORBA::RTORB::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::ThreadpoolLane &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const RTCORBA::ThreadpoolLane &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.lane_priority) &&
     (strm << _tao_aggregate.static_threads) &&
     (strm << _tao_aggregate.dynamic_threads)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::ThreadpoolLane &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    RTCORBA::ThreadpoolLane &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.lane_priority) &&
     (strm >> _tao_aggregate.static_threads) &&
     (strm >> _tao_aggregate.dynamic_threads)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_I_
 #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_I_
@@ -1848,6 +2222,7 @@ CORBA::Boolean TAO_RTCORBA_Export operator<< (
     TAO_OutputCDR &,
     const RTCORBA::ThreadpoolLanes &
   );
+
 CORBA::Boolean TAO_RTCORBA_Export operator>> (
     TAO_InputCDR &,
     RTCORBA::ThreadpoolLanes &
@@ -1855,13 +2230,18 @@ CORBA::Boolean TAO_RTCORBA_Export operator>> (
 
 #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::PriorityModel &_tao_enumval)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+
+ACE_INLINE
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::PriorityModel &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
   return strm << _tao_temp;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel &_tao_enumval)
+ACE_INLINE
+CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel &_tao_enumval)
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
@@ -1874,30 +2254,66 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel
   return _tao_result;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::PriorityBand &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:64
+
+ACE_INLINE
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_INLINE
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const RTCORBA::PriorityBand &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.low) &&
     (strm << _tao_aggregate.high)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityBand &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    RTCORBA::PriorityBand &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.low) &&
     (strm >> _tao_aggregate.high)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_I_
 #define _TAO_CDR_OP_RTCORBA_PriorityBands_I_
@@ -1906,6 +2322,7 @@ CORBA::Boolean TAO_RTCORBA_Export operator<< (
     TAO_OutputCDR &,
     const RTCORBA::PriorityBands &
   );
+
 CORBA::Boolean TAO_RTCORBA_Export operator>> (
     TAO_InputCDR &,
     RTCORBA::PriorityBands &
diff --git a/TAO/tao/RTCORBA/TAO_RTCORBA.dsp b/TAO/tao/RTCORBA/TAO_RTCORBA.dsp
index e9bebd12d67..74a0217c5b7 100644
--- a/TAO/tao/RTCORBA/TAO_RTCORBA.dsp
+++ b/TAO/tao/RTCORBA/TAO_RTCORBA.dsp
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTCORBA_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_RTCORBA_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_RTCORBA_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -160,23 +160,23 @@ SOURCE=.\Continuous_Priority_Mapping.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Network_Priority_Mapping.cpp

+SOURCE=.\Direct_Priority_Mapping.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Network_Priority_Mapping_Manager.cpp

+SOURCE=.\Linear_Network_Priority_Mapping.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Network_Priority_Mapping.cpp

+SOURCE=.\Linear_Priority_Mapping.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.cpp

+SOURCE=.\Network_Priority_Mapping.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.cpp

+SOURCE=.\Network_Priority_Mapping_Manager.cpp

 # End Source File

 # Begin Source File

 

@@ -253,6 +253,7 @@ SOURCE=.\RTCORBA.cpp
 # Begin Source File

 

 SOURCE=.\RTCORBAC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -268,23 +269,23 @@ SOURCE=.\Continuous_Priority_Mapping.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Network_Priority_Mapping.h

+SOURCE=.\Direct_Priority_Mapping.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Network_Priority_Mapping_Manager.h

+SOURCE=.\Linear_Network_Priority_Mapping.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Network_Priority_Mapping.h

+SOURCE=.\Linear_Priority_Mapping.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.h

+SOURCE=.\Network_Priority_Mapping.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.h

+SOURCE=.\Network_Priority_Mapping_Manager.h

 # End Source File

 # Begin Source File

 

@@ -380,23 +381,23 @@ SOURCE=.\Continuous_Priority_Mapping.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Network_Priority_Mapping.i

+SOURCE=.\Direct_Priority_Mapping.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Network_Priority_Mapping_Manager.i

+SOURCE=.\Linear_Network_Priority_Mapping.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Network_Priority_Mapping.i

+SOURCE=.\Linear_Priority_Mapping.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.i

+SOURCE=.\Network_Priority_Mapping.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.i

+SOURCE=.\Network_Priority_Mapping_Manager.i

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/RTPortableServer/Makefile b/TAO/tao/RTPortableServer/Makefile
index 6047724a82a..72e090ad243 100644
--- a/TAO/tao/RTPortableServer/Makefile
+++ b/TAO/tao/RTPortableServer/Makefile
@@ -148,7 +148,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -177,7 +178,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -200,6 +202,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -208,11 +239,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -239,6 +278,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i RTPortableServerC.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   RTPortableServerC.i RT_Object_Adapter_Factory.h \
   $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
@@ -250,33 +291,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -373,12 +387,9 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -391,13 +402,13 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -407,6 +418,24 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -425,36 +454,62 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -481,12 +536,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i rtportableserver_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h rtportableserver_export.h \
   $(TAO_ROOT)/tao/Acceptor_Filter.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -499,22 +556,35 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Base.inl \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Acceptor_Filter.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
-  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -527,18 +597,13 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -548,6 +613,24 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -566,32 +649,38 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Acceptor_Filter.i \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -599,10 +688,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -651,12 +746,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   rtportableserver_export.h \
   $(TAO_ROOT)/tao/Collocation_Resolver.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -669,7 +766,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -689,7 +785,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Collocation_Resolver.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -720,7 +817,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -770,7 +868,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -783,22 +882,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -814,6 +928,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -831,16 +947,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -864,14 +983,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -942,8 +1053,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/POAManager.i \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/PortableServer/POA.i \
   $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
@@ -1036,12 +1145,9 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -1054,13 +1160,13 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1070,6 +1176,24 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1088,28 +1212,48 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
@@ -1118,33 +1262,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -1185,16 +1302,20 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -1210,16 +1331,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1329,7 +1453,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1358,7 +1483,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1393,6 +1519,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -1401,15 +1558,17 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
@@ -1418,33 +1577,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -1486,16 +1618,20 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1507,8 +1643,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/POAManager.i \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
@@ -1533,16 +1667,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i RTPortableServerC.i \
   RT_POA.i $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -1626,12 +1763,14 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i rtportableserver_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h rtportableserver_export.h \
   $(TAO_ROOT)/tao/Policy_Validator.h \
   $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -1644,7 +1783,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
@@ -1671,12 +1809,9 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -1689,13 +1824,13 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1705,6 +1840,24 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1723,15 +1876,33 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
@@ -1740,22 +1911,26 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
@@ -1769,13 +1944,11 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -1792,16 +1965,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1813,21 +1989,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -1840,14 +2001,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1969,7 +2122,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1998,7 +2152,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2033,6 +2188,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -2041,15 +2227,17 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
@@ -2058,33 +2246,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Active_Map_Manager.h \
   $(ACE_ROOT)/ace/Active_Map_Manager.i \
   $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -2126,10 +2287,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
@@ -2151,12 +2318,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -2166,8 +2331,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/POAManager.i \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
@@ -2197,7 +2360,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
@@ -2216,16 +2380,19 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -2269,6 +2436,9 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/IIOP_Transport.h \
   $(TAO_ROOT)/tao/IIOPC.h \
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.pidl b/TAO/tao/RTPortableServer/RTPortableServer.pidl
index ea952725c80..f2533b58860 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.pidl
+++ b/TAO/tao/RTPortableServer/RTPortableServer.pidl
@@ -17,7 +17,7 @@
 //   1. Run the tao_idl compiler on the pidl file.  The command used for
 //   this is:
 //
-//     tao_idl.exe
+//     tao_idl
 //          -o orig -Ge 1
 //          -Wb,export_macro=TAO_RTPortableServer_Export
 //          -Wb,export_include="rtportableserver_export.h"
@@ -77,6 +77,4 @@ module RTPortableServer
   };
 };
 
-#pragma prefix ""
-
 #endif /* _RT_PORTABLE_SERVER_IDL_ */
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index 12730fb9dfb..02ec90c6652 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -19,6 +19,10 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
 #include "RTPortableServerC.h"
 
 #if defined (__BORLANDC__)
@@ -29,13 +33,71 @@
 #include "RTPortableServerC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
 int RTPortableServer::POA::_tao_class_id = 0;
 
+RTPortableServer::POA_ptr
+tao_RTPortableServer_POA_duplicate (
+    RTPortableServer::POA_ptr p
+  )
+{
+  return RTPortableServer::POA::_duplicate (p);
+}
+
+void
+tao_RTPortableServer_POA_release (
+    RTPortableServer::POA_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+RTPortableServer::POA_ptr
+tao_RTPortableServer_POA_nil (
+    void
+  )
+{
+  return RTPortableServer::POA::_nil ();
+}
+
+RTPortableServer::POA_ptr
+tao_RTPortableServer_POA_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return RTPortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+tao_RTPortableServer_POA_upcast (
+    void *src
+  )
+{
+  RTPortableServer::POA **tmp =
+    ACE_static_cast (RTPortableServer::POA **, src);
+  return *tmp;
+}
+
+CORBA::Boolean
+tao_RTPortableServer_POA_marshal (
+    RTPortableServer::POA_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
-// Operations for class RTPortableServer::POA_var
+// RTPortableServer::POA_var
 // *************************************************************
 
-RTPortableServer::POA_var::POA_var (void) // default constructor
+RTPortableServer::POA_var::POA_var (void)
   : ptr_ (POA::_nil ())
 {}
 
@@ -45,12 +107,12 @@ RTPortableServer::POA_var::ptr (void) const
   return this->ptr_;
 }
 
-RTPortableServer::POA_var::POA_var (const ::RTPortableServer::POA_var &p) // copy constructor
+RTPortableServer::POA_var::POA_var (const ::RTPortableServer::POA_var &p)
   : TAO_Base_var (),
     ptr_ (POA::_duplicate (p.ptr ()))
 {}
 
-RTPortableServer::POA_var::~POA_var (void) // destructor
+RTPortableServer::POA_var::~POA_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -79,7 +141,7 @@ RTPortableServer::POA_var::operator const ::RTPortableServer::POA_ptr &() const
   return this->ptr_;
 }
 
-RTPortableServer::POA_var::operator ::RTPortableServer::POA_ptr &() // cast
+RTPortableServer::POA_var::operator ::RTPortableServer::POA_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -154,8 +216,11 @@ RTPortableServer::POA_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
-// Inline operations for class RTPortableServer::POA_out
+// RTPortableServer::POA_out
 // *************************************************************
 
 RTPortableServer::POA_out::POA_out (POA_ptr &p)
@@ -164,14 +229,14 @@ RTPortableServer::POA_out::POA_out (POA_ptr &p)
   this->ptr_ = ::RTPortableServer::POA::_nil ();
 }
 
-RTPortableServer::POA_out::POA_out (POA_var &p) // constructor from _var
+RTPortableServer::POA_out::POA_out (POA_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::RTPortableServer::POA::_nil ();
 }
 
-RTPortableServer::POA_out::POA_out (const ::RTPortableServer::POA_out &p) // copy constructor
+RTPortableServer::POA_out::POA_out (const ::RTPortableServer::POA_out &p)
   : ptr_ (ACE_const_cast (POA_out &, p).ptr_)
 {}
 
@@ -202,7 +267,7 @@ RTPortableServer::POA_out::operator ::RTPortableServer::POA_ptr &() // cast
 }
 
 ::RTPortableServer::POA_ptr &
-RTPortableServer::POA_out::ptr (void) // ptr
+RTPortableServer::POA_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -213,17 +278,24 @@ RTPortableServer::POA_out::operator-> (void)
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
-// default constructor
-RTPortableServer::POA::POA ()
-{
-  }
+RTPortableServer::POA::POA (void)
+{}
 
-// destructor
 RTPortableServer::POA::~POA (void)
 {}
 
-RTPortableServer::POA_ptr RTPortableServer::POA::_narrow (
+void 
+RTPortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
+{
+  POA *tmp = ACE_static_cast (POA *, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+RTPortableServer::POA_ptr
+RTPortableServer::POA::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -231,61 +303,82 @@ RTPortableServer::POA_ptr RTPortableServer::POA::_narrow (
   return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTPortableServer::POA_ptr RTPortableServer::POA::_unchecked_narrow (
+RTPortableServer::POA_ptr 
+RTPortableServer::POA::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return POA::_nil ();
+    {
+      return POA::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           POA_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &POA::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &POA::_tao_class_id
+                )
+            )
         );
 }
 
 RTPortableServer::POA_ptr
 RTPortableServer::POA::_duplicate (POA_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *RTPortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTPortableServer, POA)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::PortableServer::POA::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            PortableServer::POA_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::RTPortableServer, POA)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::PortableServer::POA::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableServer::POA_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -294,10 +387,119 @@ const char* RTPortableServer::POA::_interface_repository_id (void) const
   return "IDL:omg.org/RTPortableServer/POA:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_RTPortableServer_POA[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254506f), 
+  ACE_NTOHL (0x72746162), 
+  ACE_NTOHL (0x6c655365), 
+  ACE_NTOHL (0x72766572), 
+  ACE_NTOHL (0x2f504f41), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTPortableServer/POA:1.0
+    4,
+  ACE_NTOHL (0x504f4100),  // name = POA
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTPortableServer_POA (
+    CORBA::tk_objref,
+    sizeof (_oc_RTPortableServer_POA),
+    (char *) &_oc_RTPortableServer_POA,
+    0,
+    sizeof (RTPortableServer::POA)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTPortableServer)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_POA,
+    &_tc_TAO_tc_RTPortableServer_POA
+  )
+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,
+    RTPortableServer::POA_ptr _tao_elem
+  )
+{
+  RTPortableServer::POA_ptr _tao_objptr =
+    RTPortableServer::POA::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTPortableServer::POA_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTPortableServer::POA>::insert (
+      _tao_any,
+      RTPortableServer::POA::_tao_any_destructor,
+      RTPortableServer::_tc_POA,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTPortableServer::POA_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTPortableServer::POA>::extract (
+        _tao_any,
+        RTPortableServer::POA::_tao_any_destructor,
+        RTPortableServer::_tc_POA,
+        _tao_elem
+      );
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTPortableServer::POA>::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<RTPortableServer::POA,RTPortableServer::POA_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTPortableServer::POA,RTPortableServer::POA_var>
+  template class TAO_Object_Manager<RTPortableServer::POA,RTPortableServer::POA_var>;
+  template class TAO::Any_Impl_T<RTPortableServer::POA>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<RTPortableServer::POA, RTPortableServer::POA_var>
+# pragma instantiate TAO::Any_Impl_T<RTPortableServer::POA>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTPortableServer::POA>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<RTPortableServer::POA>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index 8d932f76938..29702181cfb 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
 #define _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
 
@@ -57,50 +60,61 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  RTPortableServer
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_RTPORTABLESERVER_POA___PTR_CH_)
 #define _RTPORTABLESERVER_POA___PTR_CH_
-
+  
   class POA;
   typedef POA *POA_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_RTPORTABLESERVER_POA___VAR_CH_)
 #define _RTPORTABLESERVER_POA___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_RTPortableServer_Export POA_var : public TAO_Base_var
   {
   public:
     POA_var (void); // default constructor
-    POA_var (POA_ptr p) : ptr_ (p) {}
+    POA_var (POA_ptr p) : ptr_ (p) {} 
     POA_var (const POA_var &); // copy constructor
     ~POA_var (void); // destructor
-
+    
     POA_var &operator= (POA_ptr);
     POA_var &operator= (const POA_var &);
     POA_ptr operator-> (void) const;
-
+    
     operator const POA_ptr &() const;
     operator POA_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     POA_ptr in (void) const;
     POA_ptr &inout (void);
     POA_ptr &out (void);
     POA_ptr _retn (void);
     POA_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static POA_ptr tao_duplicate (POA_ptr);
     static void tao_release (POA_ptr);
     static POA_ptr tao_nil (void);
-    static POA_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
+    static POA_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     POA_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -108,13 +122,14 @@ TAO_NAMESPACE  RTPortableServer
     POA_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_RTPORTABLESERVER_POA___OUT_CH_)
 #define _RTPORTABLESERVER_POA___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_RTPortableServer_Export POA_out
   {
   public:
@@ -127,114 +142,153 @@ TAO_NAMESPACE  RTPortableServer
     operator POA_ptr &();
     POA_ptr &ptr (void);
     POA_ptr operator-> (void);
-
+  
   private:
     POA_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_RTPORTABLESERVER_POA_CH_)
 #define _RTPORTABLESERVER_POA_CH_
-
-class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
+  
+  class TAO_RTPortableServer_Export POA
+    : public virtual PortableServer::POA
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef POA_ptr _ptr_type;
     typedef POA_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  static int _tao_class_id;
-
-    // the static operations
+    static int _tao_class_id;
+    
+    // The static operations.
     static POA_ptr _duplicate (POA_ptr obj);
+    
     static POA_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     static POA_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     static POA_ptr _nil (void)
       {
         return (POA_ptr)0;
       }
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr create_reference_with_priority (
         const char * intf,
         RTCORBA::Priority priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableServer::POA::WrongPolicy
+        CORBA::SystemException
+        , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Object_ptr create_reference_with_id_and_priority (
         const PortableServer::ObjectId & oid,
         const char * intf,
         RTCORBA::Priority priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableServer::POA::WrongPolicy
+        CORBA::SystemException
+        , PortableServer::POA::WrongPolicy
       )) = 0;
-
-    virtual PortableServer::ObjectId * activate_object_with_priority (
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableServer::ObjectId * activate_object_with_priority (
         PortableServer::Servant p_servant,
         RTCORBA::Priority priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableServer::POA::ServantAlreadyActive,
-        PortableServer::POA::WrongPolicy
+        CORBA::SystemException
+        , PortableServer::POA::ServantAlreadyActive
+        , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void activate_object_with_id_and_priority (
         const PortableServer::ObjectId & oid,
         PortableServer::Servant p_servant,
         RTCORBA::Priority priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableServer::POA::ServantAlreadyActive,
-        PortableServer::POA::ObjectAlreadyActive,
-        PortableServer::POA::WrongPolicy
+        CORBA::SystemException
+        , PortableServer::POA::ServantAlreadyActive
+        , PortableServer::POA::ObjectAlreadyActive
+        , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
-    POA ();
-
+    POA (void);
     virtual ~POA (void);
+    
   private:
     POA (const POA &);
     void operator= (const POA &);
   };
 
-
 #endif /* end #if !defined */
+  
+  // 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_POA;
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module RTPortableServer
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::POA_ptr); // copying
+TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::POA_ptr *); // non-copying
+TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPortableServer::POA_ptr &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "RTPortableServerC.i"
@@ -250,3 +304,4 @@ TAO_NAMESPACE_CLOSE // module RTPortableServer
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.i b/TAO/tao/RTPortableServer/RTPortableServerC.i
index f36831389a4..47528e8c024 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.i
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.i
@@ -20,52 +20,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+
 #if !defined (_RTPORTABLESERVER_POA___CI_)
 #define _RTPORTABLESERVER_POA___CI_
 
-ACE_INLINE RTPortableServer::POA_ptr
-tao_RTPortableServer_POA_duplicate (
-    RTPortableServer::POA_ptr p
-  )
-{
-  return RTPortableServer::POA::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_RTPortableServer_POA_release (
-    RTPortableServer::POA_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE RTPortableServer::POA_ptr
-tao_RTPortableServer_POA_nil (
-    void
-  )
+ACE_INLINE
+CORBA::Boolean
+RTPortableServer::POA::marshal (TAO_OutputCDR &)
 {
-  return RTPortableServer::POA::_nil ();
+  return 0;
 }
 
-ACE_INLINE RTPortableServer::POA_ptr
-tao_RTPortableServer_POA_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return RTPortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Object *
-tao_RTPortableServer_POA_upcast (
-    void *src
-  )
-{
-  RTPortableServer::POA **tmp =
-    ACE_static_cast (RTPortableServer::POA **, src);
-  return *tmp;
-}
-
-
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
index 8efbd23665c..7a4e179e5e5 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
@@ -20,7 +20,7 @@ TAO_Server_Protocol_Acceptor_Filter (RTCORBA::ProtocolList &protocols)
 }
 
 int
-TAO_Server_Protocol_Acceptor_Filter::fill_profile (const TAO_ObjectKey &object_key,
+TAO_Server_Protocol_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key,
                                                    TAO_MProfile &mprofile,
                                                    TAO_Acceptor **acceptors_begin,
                                                    TAO_Acceptor **acceptors_end,
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
index f4b93d409ea..8324da9e0f5 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
@@ -59,7 +59,7 @@ public:
   TAO_Server_Protocol_Acceptor_Filter (RTCORBA::ProtocolList &protocols);
 
   /// Populate <mprofile> based on what's in <protocols_>.
-  int fill_profile (const TAO_ObjectKey &object_key,
+  int fill_profile (const TAO::ObjectKey &object_key,
                     TAO_MProfile &mprofile,
                     TAO_Acceptor **acceptors_begin,
                     TAO_Acceptor **acceptors_end,
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 7b014b72105..7bcbfed2c6b 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -223,7 +223,7 @@ TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 TAO_Stub *
-TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
+TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
                            const char *type_id,
                            CORBA::Short priority
                            ACE_ENV_ARG_DECL)
@@ -318,7 +318,7 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
 }
 
 TAO_Stub *
-TAO_RT_POA::create_stub_object (const TAO_ObjectKey &object_key,
+TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index 7638c55aec9..bf066bfbed0 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -285,7 +285,7 @@ protected:
                             TAO_Object_Adapter *object_adapter
                             ACE_ENV_ARG_DECL);
 
-  virtual TAO_Stub *key_to_stub_i (const TAO_ObjectKey &key,
+  virtual TAO_Stub *key_to_stub_i (const TAO::ObjectKey &key,
                                    const char *type_id,
                                    CORBA::Short priority
                                    ACE_ENV_ARG_DECL);
@@ -302,7 +302,7 @@ protected:
 
   size_t endpoint_count (void);
 
-  TAO_Stub *create_stub_object (const TAO_ObjectKey &object_key,
+  TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
diff --git a/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp b/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp
index 9f5f56e14a5..39021186d99 100644
--- a/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp
+++ b/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp
@@ -73,7 +73,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTPortableServer_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_RTPORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_RTPORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -186,6 +186,7 @@ SOURCE=.\RTPortableServer.cpp
 # Begin Source File

 

 SOURCE=.\RTPortableServerC.cpp

+# ADD CPP /GR

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/tao/Remote_Object_Proxy_Impl.cpp b/TAO/tao/Remote_Object_Proxy_Impl.cpp
index 8ddcb955fc9..1495fc905dc 100644
--- a/TAO/tao/Remote_Object_Proxy_Impl.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Impl.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/Remote_Object_Proxy_Impl.h"
 #include "tao/Exception.h"
 #include "tao/Stub.h"
@@ -6,7 +8,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-
 ACE_RCSID (tao,
            TAO_Remote_Object_Proxy_Impl,
            "$Id$")
diff --git a/TAO/tao/RequestInfo_Util.cpp b/TAO/tao/RequestInfo_Util.cpp
index 28c042faedb..945e02ee32f 100644
--- a/TAO/tao/RequestInfo_Util.cpp
+++ b/TAO/tao/RequestInfo_Util.cpp
@@ -84,20 +84,9 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
 
   if (tk_void_any)
     {
-      CORBA::TypeCode *tc = 0;
-      ACE_NEW_THROW_EX (tc,
-                        CORBA::TypeCode (CORBA::tk_void),
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TypeCode_var safe_tc = tc;
-
       ACE_NEW_THROW_EX (any,
-                        CORBA::Any (tc),
+                        CORBA::Any (CORBA::_tc_void,
+                                    0),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
                             TAO_DEFAULT_MINOR_CODE,
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index 241c7ecf5fb..b84b578ad72 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -4,6 +4,7 @@
 #define TAO_SEQUENCE_T_C
 
 #include "tao/Sequence_T.h"
+#include "tao/Typecode.h"
 #include "tao/Environment.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/Services.pidl b/TAO/tao/Services.pidl
new file mode 100644
index 00000000000..27a09a565b4
--- /dev/null
+++ b/TAO/tao/Services.pidl
@@ -0,0 +1,51 @@
+// -*- IDL -*-
+//
+// $Id$
+
+// ================================================================
+//
+//   This file was used to generate the code in ServicesC.*
+//   The command used to generate code is:
+//
+//     tao_idl
+//        -o orig -Gp -Gd -Ge 1
+//          -Wb,export_macro=TAO_Export
+//          -Wb,export_include="tao/corbafwd.h"
+//          -Wb,pre_include="ace/pre.h"
+//          -Wb,post_include="ace/post.h"
+//          Services.pidl
+//
+//   Patches for changes to the generated code are available in the
+//   `diffs' directory.
+// ================================================================
+
+
+#ifndef TAO_CORBA_SERVICES_IDL
+#define TAO_CORBA_SERVICES_IDL
+
+#include "OctetSeq.pidl"
+
+#pragma prefix "omg.org"
+
+module CORBA
+{
+  typedef unsigned short ServiceType;
+  typedef unsigned long ServiceOption;
+  typedef unsigned long ServiceDetailType;
+
+  const ServiceType Security = 1;
+
+  struct ServiceDetail
+  {
+    ServiceDetailType service_detail_type;
+    OctetSeq service_detail;
+  };
+
+  struct ServiceInformation
+  {
+    sequence<ServiceOption> service_options;
+    sequence<ServiceDetail> service_details;
+  };
+};
+
+#endif  /* TAO_CORBA_SERVICES_IDL */
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
new file mode 100644
index 00000000000..412cd5fe5a5
--- /dev/null
+++ b/TAO/tao/ServicesC.cpp
@@ -0,0 +1,945 @@
+// -*- 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
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
+#include "ServicesC.h"
+#include "tao/Any_T.h"
+#include "tao/Environment.h"
+#include "tao/ORB_Core.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "ServicesC.i"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ServiceType[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  34,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65547970), 
+  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ServiceType:1.0
+    12,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636554), 
+  ACE_NTOHL (0x79706500),  // name = ServiceType
+    CORBA::tk_ushort,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceType (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ServiceType),
+    (char *) &_oc_CORBA_ServiceType,
+    0,
+    sizeof (CORBA::ServiceType)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceType,
+    &_tc_TAO_tc_CORBA_ServiceType
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ServiceOption[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x654f7074), 
+  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
+    14,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6963654f), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e000000),  // name = ServiceOption
+    CORBA::tk_ulong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOption (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ServiceOption),
+    (char *) &_oc_CORBA_ServiceOption,
+    0,
+    sizeof (CORBA::ServiceOption)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceOption,
+    &_tc_TAO_tc_CORBA_ServiceOption
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ServiceDetailType[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65446574), 
+  ACE_NTOHL (0x61696c54), 
+  ACE_NTOHL (0x7970653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
+    18,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636544), 
+  ACE_NTOHL (0x65746169), 
+  ACE_NTOHL (0x6c547970), 
+  ACE_NTOHL (0x65000000),  // name = ServiceDetailType
+    CORBA::tk_ulong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailType (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ServiceDetailType),
+    (char *) &_oc_CORBA_ServiceDetailType,
+    0,
+    sizeof (CORBA::ServiceDetailType)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceDetailType,
+    &_tc_TAO_tc_CORBA_ServiceDetailType
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ServiceDetail[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65446574), 
+  ACE_NTOHL (0x61696c3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
+    14,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636544), 
+  ACE_NTOHL (0x65746169), 
+  ACE_NTOHL (0x6c000000),  // name = ServiceDetail
+  2, // member count
+    20,
+  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6963655f), 
+  ACE_NTOHL (0x64657461), 
+  ACE_NTOHL (0x696c5f74), 
+  ACE_NTOHL (0x79706500),  // name = service_detail_type
+    CORBA::tk_alias, // typecode kind for typedefs
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    40,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5365), 
+    ACE_NTOHL (0x72766963), 
+    ACE_NTOHL (0x65446574), 
+    ACE_NTOHL (0x61696c54), 
+    ACE_NTOHL (0x7970653a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
+        18,
+    ACE_NTOHL (0x53657276), 
+    ACE_NTOHL (0x69636544), 
+    ACE_NTOHL (0x65746169), 
+    ACE_NTOHL (0x6c547970), 
+    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
+        CORBA::tk_ulong,
+
+
+  15,
+  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6963655f), 
+  ACE_NTOHL (0x64657461), 
+  ACE_NTOHL (0x696c0000),  // name = service_detail
+    CORBA::tk_alias, // typecode kind for typedefs
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    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,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetail (
+    CORBA::tk_struct,
+    sizeof (_oc_CORBA_ServiceDetail),
+    (char *) &_oc_CORBA_ServiceDetail,
+    0,
+    sizeof (CORBA::ServiceDetail)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceDetail,
+    &_tc_TAO_tc_CORBA_ServiceDetail
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void CORBA::ServiceDetail::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServiceDetail *tmp = ACE_static_cast (ServiceDetail*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ServiceInformation[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  41,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65496e66), 
+  ACE_NTOHL (0x6f726d61), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0
+    19,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636549), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e0000),  // name = ServiceInformation
+  2, // member count
+    16,
+  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6963655f), 
+  ACE_NTOHL (0x6f707469), 
+  ACE_NTOHL (0x6f6e7300),  // name = service_options
+    CORBA::tk_sequence, // typecode kind
+  84, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_alias, // typecode kind for typedefs
+    68, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      36,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5365), 
+      ACE_NTOHL (0x72766963), 
+      ACE_NTOHL (0x654f7074), 
+      ACE_NTOHL (0x696f6e3a), 
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
+            14,
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x6963654f), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e000000),  // name = ServiceOption
+            CORBA::tk_ulong,
+
+
+    0U,
+
+  16,
+  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6963655f), 
+  ACE_NTOHL (0x64657461), 
+  ACE_NTOHL (0x696c7300),  // name = service_details
+    CORBA::tk_sequence, // typecode kind
+  296, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    280, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      36,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5365), 
+      ACE_NTOHL (0x72766963), 
+      ACE_NTOHL (0x65446574), 
+      ACE_NTOHL (0x61696c3a), 
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
+            14,
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x69636544), 
+      ACE_NTOHL (0x65746169), 
+      ACE_NTOHL (0x6c000000),  // name = ServiceDetail
+      2, // member count
+            20,
+      ACE_NTOHL (0x73657276), 
+      ACE_NTOHL (0x6963655f), 
+      ACE_NTOHL (0x64657461), 
+      ACE_NTOHL (0x696c5f74), 
+      ACE_NTOHL (0x79706500),  // name = service_detail_type
+            CORBA::tk_alias, // typecode kind for typedefs
+      76, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        40,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5365), 
+        ACE_NTOHL (0x72766963), 
+        ACE_NTOHL (0x65446574), 
+        ACE_NTOHL (0x61696c54), 
+        ACE_NTOHL (0x7970653a), 
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
+                18,
+        ACE_NTOHL (0x53657276), 
+        ACE_NTOHL (0x69636544), 
+        ACE_NTOHL (0x65746169), 
+        ACE_NTOHL (0x6c547970), 
+        ACE_NTOHL (0x65000000),  // name = ServiceDetailType
+                CORBA::tk_ulong,
+
+
+      15,
+      ACE_NTOHL (0x73657276), 
+      ACE_NTOHL (0x6963655f), 
+      ACE_NTOHL (0x64657461), 
+      ACE_NTOHL (0x696c0000),  // name = service_detail
+            CORBA::tk_alias, // typecode kind for typedefs
+      76, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        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,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceInformation (
+    CORBA::tk_struct,
+    sizeof (_oc_CORBA_ServiceInformation),
+    (char *) &_oc_CORBA_ServiceInformation,
+    0,
+    sizeof (CORBA::ServiceInformation)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceInformation,
+    &_tc_TAO_tc_CORBA_ServiceInformation
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void CORBA::ServiceInformation::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServiceInformation *tmp = ACE_static_cast (ServiceInformation*, _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_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_
+
+void
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::ULong* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::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_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (old);
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
+
+void
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ULong *tmp =
+    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void)
+{
+  this->_deallocate_buffer ();
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_)
+#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
+// *************************************************************
+// CORBA::ServiceInformation::_tao_seq_ServiceOption
+// *************************************************************
+
+CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (void)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ULong *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (const _tao_seq_ServiceOption &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void) // dtor
+{}
+
+void CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_any_destructor (void *_tao_void_pointer)
+{
+  _tao_seq_ServiceOption *tmp = ACE_static_cast (_tao_seq_ServiceOption*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// 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_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_
+
+void
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::ServiceDetail* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::ServiceDetail *old =
+        ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (old);
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
+
+void
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ServiceDetail *tmp =
+    ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_);
+  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void)
+{
+  this->_deallocate_buffer ();
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_)
+#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
+// *************************************************************
+// CORBA::ServiceInformation::_tao_seq_ServiceDetail
+// *************************************************************
+
+CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (void)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ServiceDetail>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ServiceDetail *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ServiceDetail>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ServiceDetail>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceDetail::~_tao_seq_ServiceDetail (void) // dtor
+{}
+
+void CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_any_destructor (void *_tao_void_pointer)
+{
+  _tao_seq_ServiceDetail *tmp = ACE_static_cast (_tao_seq_ServiceDetail*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ServiceDetail &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert_copy (
+      _tao_any,
+      CORBA::ServiceDetail::_tao_any_destructor,
+      CORBA::_tc_ServiceDetail,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ServiceDetail *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert (
+      _tao_any,
+      CORBA::ServiceDetail::_tao_any_destructor,
+      CORBA::_tc_ServiceDetail,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ServiceDetail *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ServiceDetail *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ServiceDetail *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::extract (
+        _tao_any,
+        CORBA::ServiceDetail::_tao_any_destructor,
+        CORBA::_tc_ServiceDetail,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>
+#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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ServiceInformation &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::insert_copy (
+      _tao_any,
+      CORBA::ServiceInformation::_tao_any_destructor,
+      CORBA::_tc_ServiceInformation,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ServiceInformation *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::insert (
+      _tao_any,
+      CORBA::ServiceInformation::_tao_any_destructor,
+      CORBA::_tc_ServiceInformation,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ServiceInformation *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ServiceInformation *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ServiceInformation *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::extract (
+        _tao_any,
+        CORBA::ServiceInformation::_tao_any_destructor,
+        CORBA::_tc_ServiceInformation,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>
+#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
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_
+#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ServiceInformation::_tao_seq_ServiceOption &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ServiceInformation::_tao_seq_ServiceOption &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
+}
+
+#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_
+#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ServiceInformation::_tao_seq_ServiceDetail &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ServiceInformation::_tao_seq_ServiceDetail &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_ */
+
diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h
new file mode 100644
index 00000000000..d4dfeceb05a
--- /dev/null
+++ b/TAO/tao/ServicesC.h
@@ -0,0 +1,551 @@
+// -*- 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
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_SERVICESC_H_
+#define _TAO_IDL_ORIG_SERVICESC_H_
+
+#include "ace/pre.h"
+#include "tao/OctetSeqC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/CDR.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
+TAO_NAMESPACE  CORBA
+{
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
+  typedef CORBA::UShort ServiceType;
+  typedef CORBA::UShort_out ServiceType_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_ServiceType;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
+  typedef CORBA::ULong ServiceOption;
+  typedef CORBA::ULong_out ServiceOption_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_ServiceOption;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
+  typedef CORBA::ULong ServiceDetailType;
+  typedef CORBA::ULong_out ServiceDetailType_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_ServiceDetailType;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ServiceType Security = 1U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class ServiceDetail_var;
+  
+  struct TAO_Export ServiceDetail
+  {
+    typedef ServiceDetail_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    CORBA::ServiceDetailType service_detail_type;
+    CORBA::OctetSeq service_detail;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
+  class TAO_Export ServiceDetail_var
+  {
+  public:
+    ServiceDetail_var (void);
+    ServiceDetail_var (ServiceDetail *);
+    ServiceDetail_var (const ServiceDetail_var &);
+    ~ServiceDetail_var (void);
+    
+    ServiceDetail_var &operator= (ServiceDetail *);
+    ServiceDetail_var &operator= (const ServiceDetail_var &);
+    ServiceDetail *operator-> (void);
+    const ServiceDetail *operator-> (void) const;
+    
+    operator const ServiceDetail &() const;
+    operator ServiceDetail &();
+    operator ServiceDetail &() const;
+    
+    // Variable-size types only.
+    operator ServiceDetail *&();
+    
+    // in, inout, out, _retn 
+    const ServiceDetail &in (void) const;
+    ServiceDetail &inout (void);
+    ServiceDetail *&out (void);
+    ServiceDetail *_retn (void);
+    ServiceDetail *ptr (void) const;
+  
+  private:
+    ServiceDetail *ptr_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
+  class TAO_Export ServiceDetail_out
+  {
+  public:
+    ServiceDetail_out (ServiceDetail *&);
+    ServiceDetail_out (ServiceDetail_var &);
+    ServiceDetail_out (const ServiceDetail_out &);
+    ServiceDetail_out &operator= (const ServiceDetail_out &);
+    ServiceDetail_out &operator= (ServiceDetail *);
+    operator ServiceDetail *&();
+    ServiceDetail *&ptr (void);
+    ServiceDetail *operator-> (void);
+    
+  private:
+    ServiceDetail *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ServiceDetail_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_ServiceDetail;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class ServiceInformation_var;
+  
+  struct TAO_Export ServiceInformation
+  {
+    typedef ServiceInformation_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    
+    
+    // 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_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_
+    
+    class TAO_Export _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void);
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          CORBA::ULong *data,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (
+          const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs
+        );
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &operator= (
+          const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (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 (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_)
+#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
+    class _tao_seq_ServiceOption;
+    
+    // *************************************************************
+    // CORBA::ServiceInformation::_tao_seq_ServiceOption
+    // *************************************************************
+    
+    class TAO_Export _tao_seq_ServiceOption : 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_CORBA_ServiceInformation__tao_seq_ServiceOption
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+    TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    {
+    public:
+      _tao_seq_ServiceOption (void);
+      _tao_seq_ServiceOption (CORBA::ULong max);
+      _tao_seq_ServiceOption (
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          CORBA::ULong *buffer, 
+          CORBA::Boolean release = 0
+        );
+      _tao_seq_ServiceOption (const _tao_seq_ServiceOption &);
+      ~_tao_seq_ServiceOption (void);
+      
+      static void _tao_any_destructor (void*);
+      
+      
+    };
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
+    
+    typedef _tao_seq_ServiceOption _service_options_seq;
+    _tao_seq_ServiceOption service_options;
+    
+    
+    // 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_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_
+    
+    class TAO_Export _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void);
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          ACE_NESTED_CLASS (CORBA, ServiceDetail) *data,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (
+          const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs
+        );
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &operator= (
+          const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void);
+      
+      // = Accessors.
+      ACE_NESTED_CLASS (CORBA, ServiceDetail) &operator[] (CORBA::ULong i);
+      const ACE_NESTED_CLASS (CORBA, ServiceDetail) &operator[] (CORBA::ULong i) const;
+      
+      // = Static operations.
+      static ACE_NESTED_CLASS (CORBA, ServiceDetail) *allocbuf (CORBA::ULong size);
+      static void freebuf (ACE_NESTED_CLASS (CORBA, ServiceDetail) *buffer);
+      
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      ACE_NESTED_CLASS (CORBA, ServiceDetail) *get_buffer (CORBA::Boolean orphan = 0);
+      const ACE_NESTED_CLASS (CORBA, ServiceDetail) *get_buffer (void) const;
+      void replace (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          ACE_NESTED_CLASS (CORBA, ServiceDetail) *data,
+          CORBA::Boolean release
+        );
+    };
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_)
+#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
+    class _tao_seq_ServiceDetail;
+    
+    // *************************************************************
+    // CORBA::ServiceInformation::_tao_seq_ServiceDetail
+    // *************************************************************
+    
+    class TAO_Export _tao_seq_ServiceDetail : 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_CORBA_ServiceInformation__tao_seq_ServiceDetail
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+    TAO_Unbounded_Sequence<ACE_NESTED_CLASS (CORBA, ServiceDetail)>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    {
+    public:
+      _tao_seq_ServiceDetail (void);
+      _tao_seq_ServiceDetail (CORBA::ULong max);
+      _tao_seq_ServiceDetail (
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          ACE_NESTED_CLASS (CORBA, ServiceDetail) *buffer, 
+          CORBA::Boolean release = 0
+        );
+      _tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &);
+      ~_tao_seq_ServiceDetail (void);
+      
+      static void _tao_any_destructor (void*);
+      
+      
+    };
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
+    
+    typedef _tao_seq_ServiceDetail _service_details_seq;
+    _tao_seq_ServiceDetail service_details;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
+  class TAO_Export ServiceInformation_var
+  {
+  public:
+    ServiceInformation_var (void);
+    ServiceInformation_var (ServiceInformation *);
+    ServiceInformation_var (const ServiceInformation_var &);
+    ~ServiceInformation_var (void);
+    
+    ServiceInformation_var &operator= (ServiceInformation *);
+    ServiceInformation_var &operator= (const ServiceInformation_var &);
+    ServiceInformation *operator-> (void);
+    const ServiceInformation *operator-> (void) const;
+    
+    operator const ServiceInformation &() const;
+    operator ServiceInformation &();
+    operator ServiceInformation &() const;
+    
+    // Variable-size types only.
+    operator ServiceInformation *&();
+    
+    // in, inout, out, _retn 
+    const ServiceInformation &in (void) const;
+    ServiceInformation &inout (void);
+    ServiceInformation *&out (void);
+    ServiceInformation *_retn (void);
+    ServiceInformation *ptr (void) const;
+  
+  private:
+    ServiceInformation *ptr_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
+  class TAO_Export ServiceInformation_out
+  {
+  public:
+    ServiceInformation_out (ServiceInformation *&);
+    ServiceInformation_out (ServiceInformation_var &);
+    ServiceInformation_out (const ServiceInformation_out &);
+    ServiceInformation_out &operator= (const ServiceInformation_out &);
+    ServiceInformation_out &operator= (ServiceInformation *);
+    operator ServiceInformation *&();
+    ServiceInformation *&ptr (void);
+    ServiceInformation *operator-> (void);
+    
+  private:
+    ServiceInformation *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ServiceInformation_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_ServiceInformation;
+
+// 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_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetail &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetail*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetail *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetail *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceInformation &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceInformation*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceInformation *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceInformation *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
+#ifndef __ACE_INLINE__
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceDetail &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceDetail &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceInformation &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_H_
+#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ServiceInformation::_tao_seq_ServiceOption &
+  );
+TAO_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ServiceInformation::_tao_seq_ServiceOption &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_H_
+#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ServiceInformation::_tao_seq_ServiceDetail &
+  );
+TAO_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ServiceInformation::_tao_seq_ServiceDetail &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
+#endif /* __ACE_INLINE__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+
+#if defined (__ACE_INLINE__)
+#include "ServicesC.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/ServicesC.i b/TAO/tao/ServicesC.i
new file mode 100644
index 00000000000..c4fb452b840
--- /dev/null
+++ b/TAO/tao/ServicesC.i
@@ -0,0 +1,988 @@
+// -*- 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
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
+// *************************************************************
+// Inline operations for class CORBA::ServiceDetail_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ServiceDetail_var::ServiceDetail_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ServiceDetail_var::ServiceDetail_var (ServiceDetail *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ServiceDetail_var::ServiceDetail_var (const ::CORBA::ServiceDetail_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ServiceDetail (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_var::~ServiceDetail_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_var &
+CORBA::ServiceDetail_var::operator= (ServiceDetail *_tao_struct_var)
+{
+  delete this->ptr_;
+  this->ptr_ = _tao_struct_var;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ServiceDetail_var &
+CORBA::ServiceDetail_var::operator= (const ::CORBA::ServiceDetail_var &_tao_struct_var)
+{
+  if (this != &_tao_struct_var)
+    {
+      if (_tao_struct_var.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ServiceDetail *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ServiceDetail (*_tao_struct_var.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ServiceDetail *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE const ::CORBA::ServiceDetail *
+CORBA::ServiceDetail_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceDetail *
+CORBA::ServiceDetail_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_var::operator const ::CORBA::ServiceDetail &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_var::operator ::CORBA::ServiceDetail &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_var::operator ::CORBA::ServiceDetail &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ServiceDetail_var::operator ::CORBA::ServiceDetail *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const ::CORBA::ServiceDetail &
+CORBA::ServiceDetail_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceDetail &
+CORBA::ServiceDetail_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+// Mapping for variable size.
+ACE_INLINE ::CORBA::ServiceDetail *&
+CORBA::ServiceDetail_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceDetail *
+CORBA::ServiceDetail_var::_retn (void)
+{
+  ::CORBA::ServiceDetail *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE ::CORBA::ServiceDetail *
+CORBA::ServiceDetail_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 CORBA::ServiceDetail_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ServiceDetail_out::ServiceDetail_out (::CORBA::ServiceDetail *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_out::ServiceDetail_out (ServiceDetail_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_out::ServiceDetail_out (const ::CORBA::ServiceDetail_out &p)
+  : ptr_ (ACE_const_cast (ServiceDetail_out&, p).ptr_)
+{}
+
+ACE_INLINE
+CORBA::ServiceDetail_out &
+CORBA::ServiceDetail_out::operator= (const ::CORBA::ServiceDetail_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServiceDetail_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_out &
+CORBA::ServiceDetail_out::operator= (ServiceDetail *_tao_struct_out)
+{
+  this->ptr_ = _tao_struct_out;
+  return *this;
+}
+
+ACE_INLINE 
+CORBA::ServiceDetail_out::operator ::CORBA::ServiceDetail *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceDetail *&
+CORBA::ServiceDetail_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceDetail *
+CORBA::ServiceDetail_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 CORBA::ServiceInformation_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ServiceInformation_var::ServiceInformation_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ServiceInformation_var::ServiceInformation_var (ServiceInformation *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ServiceInformation_var::ServiceInformation_var (const ::CORBA::ServiceInformation_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ServiceInformation (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_var::~ServiceInformation_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_var &
+CORBA::ServiceInformation_var::operator= (ServiceInformation *_tao_struct_var)
+{
+  delete this->ptr_;
+  this->ptr_ = _tao_struct_var;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ServiceInformation_var &
+CORBA::ServiceInformation_var::operator= (const ::CORBA::ServiceInformation_var &_tao_struct_var)
+{
+  if (this != &_tao_struct_var)
+    {
+      if (_tao_struct_var.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ServiceInformation *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ServiceInformation (*_tao_struct_var.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ServiceInformation *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE const ::CORBA::ServiceInformation *
+CORBA::ServiceInformation_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceInformation *
+CORBA::ServiceInformation_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_var::operator const ::CORBA::ServiceInformation &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_var::operator ::CORBA::ServiceInformation &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_var::operator ::CORBA::ServiceInformation &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ServiceInformation_var::operator ::CORBA::ServiceInformation *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const ::CORBA::ServiceInformation &
+CORBA::ServiceInformation_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceInformation &
+CORBA::ServiceInformation_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+// Mapping for variable size.
+ACE_INLINE ::CORBA::ServiceInformation *&
+CORBA::ServiceInformation_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceInformation *
+CORBA::ServiceInformation_var::_retn (void)
+{
+  ::CORBA::ServiceInformation *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE ::CORBA::ServiceInformation *
+CORBA::ServiceInformation_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 CORBA::ServiceInformation_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ServiceInformation_out::ServiceInformation_out (::CORBA::ServiceInformation *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_out::ServiceInformation_out (ServiceInformation_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_out::ServiceInformation_out (const ::CORBA::ServiceInformation_out &p)
+  : ptr_ (ACE_const_cast (ServiceInformation_out&, p).ptr_)
+{}
+
+ACE_INLINE
+CORBA::ServiceInformation_out &
+CORBA::ServiceInformation_out::operator= (const ::CORBA::ServiceInformation_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServiceInformation_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_out &
+CORBA::ServiceInformation_out::operator= (ServiceInformation *_tao_struct_out)
+{
+  this->ptr_ = _tao_struct_out;
+  return *this;
+}
+
+ACE_INLINE 
+CORBA::ServiceInformation_out::operator ::CORBA::ServiceInformation *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceInformation *&
+CORBA::ServiceInformation_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceInformation *
+CORBA::ServiceInformation_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_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_
+
+ACE_INLINE
+CORBA::ULong *
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (CORBA::ULong size)
+{
+  CORBA::ULong *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA::ULong[size], 0);
+  return retval;
+}
+
+ACE_INLINE
+void CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (CORBA::ULong *buffer)
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void)
+{
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum) 
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ULong *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (
+    const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::ULong *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::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
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &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_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::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 &
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::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 &
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::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 *
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::ULong *result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::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 *
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE
+void
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::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_CORBA_ServiceInformation__tao_seq_ServiceOption::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_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_
+
+ACE_INLINE
+CORBA::ServiceDetail *
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (CORBA::ULong size)
+{
+  CORBA::ServiceDetail *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA::ServiceDetail[size], 0);
+  return retval;
+}
+
+ACE_INLINE
+void CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (CORBA::ServiceDetail *buffer)
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void)
+{
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum) 
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ServiceDetail *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (
+    const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::ServiceDetail *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->maximum_);
+      CORBA::ServiceDetail * const tmp2 =
+        ACE_reinterpret_cast (CORBA::ServiceDetail * 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
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+  
+  if (this->release_)
+    {
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          CORBA::ServiceDetail *tmp =
+            ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::ServiceDetail *tmp1 =
+    ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_);
+  CORBA::ServiceDetail * const tmp2 =
+    ACE_reinterpret_cast (CORBA::ServiceDetail * ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tmp1[i] = tmp2[i];
+    }
+  
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE
+CORBA::ServiceDetail &
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i)
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ServiceDetail* tmp =
+    ACE_reinterpret_cast (CORBA::ServiceDetail*, this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE
+const CORBA::ServiceDetail &
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i) const
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ServiceDetail * const tmp =
+    ACE_reinterpret_cast (CORBA::ServiceDetail* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE
+CORBA::ServiceDetail *
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::ServiceDetail *result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::ServiceDetail*, 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::ServiceDetail*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+  
+  return result;
+}
+
+ACE_INLINE
+const CORBA::ServiceDetail *
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const CORBA::ServiceDetail * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE
+void
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ServiceDetail *data,
+    CORBA::Boolean release
+  )
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  
+  if (this->buffer_ && this->release_ == 1)
+    {
+      CORBA::ServiceDetail *tmp =
+        ACE_reinterpret_cast (CORBA::ServiceDetail*, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::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_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ServiceDetail &_tao_aggregate
+  )
+{
+  if (
+    (strm << _tao_aggregate.service_detail_type) &&
+    (strm << _tao_aggregate.service_detail)
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ServiceDetail &_tao_aggregate
+  )
+{
+  if (
+    (strm >> _tao_aggregate.service_detail_type) &&
+    (strm >> _tao_aggregate.service_detail)
+   )
+    {
+      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_CORBA_ServiceInformation__tao_seq_ServiceOption_I_
+#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_I_
+
+CORBA::Boolean TAO_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ServiceInformation::_tao_seq_ServiceOption &
+  );
+
+CORBA::Boolean TAO_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ServiceInformation::_tao_seq_ServiceOption &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_I_
+#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_I_
+
+CORBA::Boolean TAO_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ServiceInformation::_tao_seq_ServiceDetail &
+  );
+
+CORBA::Boolean TAO_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ServiceInformation::_tao_seq_ServiceDetail &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ServiceInformation &_tao_aggregate
+  )
+{
+  if (
+    (strm << _tao_aggregate.service_options) &&
+    (strm << _tao_aggregate.service_details)
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ServiceInformation &_tao_aggregate
+  )
+{
+  if (
+    (strm >> _tao_aggregate.service_options) &&
+    (strm >> _tao_aggregate.service_details)
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
diff --git a/TAO/tao/SmartProxies/Makefile b/TAO/tao/SmartProxies/Makefile
index 78928b44fbe..6553dcf29c2 100644
--- a/TAO/tao/SmartProxies/Makefile
+++ b/TAO/tao/SmartProxies/Makefile
@@ -103,12 +103,9 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -121,13 +118,13 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -137,6 +134,24 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -155,19 +170,39 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
   $(TAO_ROOT)/tao/TAO_Singleton.inl \
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index feef167fcb2..f0dd26cd084 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -18,8 +18,9 @@
 #include "DIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(tao, DIOP_Acceptor, "$Id$")
-
+ACE_RCSID (tao,    
+           DIOP_Acceptor, 
+           "$Id$")
 
 TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (CORBA::Boolean flag)
   : TAO_Acceptor (TAO_TAG_UDP_PROFILE),
@@ -51,7 +52,7 @@ TAO_DIOP_Acceptor::~TAO_DIOP_Acceptor (void)
 //    2) For V1.[1,2] there are tagged components
 
 int
-TAO_DIOP_Acceptor::create_profile (const TAO_ObjectKey & object_key,
+TAO_DIOP_Acceptor::create_profile (const TAO::ObjectKey & object_key,
                                    TAO_MProfile &mprofile,
                                    CORBA::Short priority)
 {
@@ -72,7 +73,7 @@ TAO_DIOP_Acceptor::create_profile (const TAO_ObjectKey & object_key,
 }
 
 int
-TAO_DIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+TAO_DIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
                                        TAO_MProfile &mprofile,
                                        CORBA::Short priority)
 {
@@ -120,7 +121,7 @@ TAO_DIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_DIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
+TAO_DIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
                                           TAO_MProfile &mprofile,
                                           CORBA::Short priority)
 {
@@ -608,7 +609,7 @@ TAO_DIOP_Acceptor::endpoint_count (void)
 
 int
 TAO_DIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                               TAO_ObjectKey &object_key)
+                               TAO::ObjectKey &object_key)
 {
   // Create the decoding stream from the encapsulation in the buffer,
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h
index a700a16ef8d..e933af2019a 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.h
+++ b/TAO/tao/Strategies/DIOP_Acceptor.h
@@ -74,7 +74,7 @@ public:
                             int version_minor,
                             const char *options = 0);
   virtual int close (void);
-  virtual int create_profile (const TAO_ObjectKey &object_key,
+  virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
@@ -82,7 +82,7 @@ public:
   virtual CORBA::ULong endpoint_count (void);
 
   virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO_ObjectKey &key);
+                          TAO::ObjectKey &key);
   //@}
 
   /**
@@ -132,13 +132,13 @@ protected:
 
   /// Helper method to add a new profile to the mprofile for
   /// each endpoint.
-  int create_new_profile (const TAO_ObjectKey &object_key,
+  int create_new_profile (const TAO::ObjectKey &object_key,
                           TAO_MProfile &mprofile,
                           CORBA::Short priority);
 
   /// Helper method to create a profile that contains all of
   /// our endpoints.
-  int create_shared_profile (const TAO_ObjectKey &object_key,
+  int create_shared_profile (const TAO::ObjectKey &object_key,
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
 protected:
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index c015bbb1512..dd6bdac4911 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -33,7 +33,7 @@ TAO_DIOP_Profile::object_key_delimiter (void) const
 
 
 TAO_DIOP_Profile::TAO_DIOP_Profile (const ACE_INET_Addr &addr,
-                                    const TAO_ObjectKey &object_key,
+                                    const TAO::ObjectKey &object_key,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_TAG_UDP_PROFILE, orb_core, version),
@@ -47,7 +47,7 @@ TAO_DIOP_Profile::TAO_DIOP_Profile (const ACE_INET_Addr &addr,
 
 TAO_DIOP_Profile::TAO_DIOP_Profile (const char* host,
                                     CORBA::UShort port,
-                                    const TAO_ObjectKey &object_key,
+                                    const TAO::ObjectKey &object_key,
                                     const ACE_INET_Addr &addr,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
@@ -293,7 +293,7 @@ TAO_DIOP_Profile::parse_string (const char *ior
         this->endpoint_.host_ = CORBA::string_dup (tmp_host);
     }
 
-  TAO_ObjectKey::decode_string_to_sequence (this->object_key_, okd + 1);
+  TAO::ObjectKey::decode_string_to_sequence (this->object_key_, okd + 1);
 }
 
 CORBA::Boolean
@@ -377,7 +377,7 @@ char *
 TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
-  TAO_ObjectKey::encode_sequence_to_string (key.inout(),
+  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
                                             this->object_key_);
 
   u_int buflen = (8 /* "corbaloc" */ +
diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h
index 0a1263c8d51..1715deccb57 100644
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ b/TAO/tao/Strategies/DIOP_Profile.h
@@ -57,7 +57,7 @@ public:
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
   TAO_DIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO_ObjectKey &object_key,
+                    const TAO::ObjectKey &object_key,
                     const TAO_GIOP_Message_Version &version,
                     TAO_ORB_Core *orb_core);
 
@@ -65,7 +65,7 @@ public:
   /// doesn't require any address resolution processing.
   TAO_DIOP_Profile (const char *host,
                     CORBA::UShort port,
-                    const TAO_ObjectKey &object_key,
+                    const TAO::ObjectKey &object_key,
                     const ACE_INET_Addr &addr,
                     const TAO_GIOP_Message_Version &version,
                     TAO_ORB_Core *orb_core);
@@ -117,11 +117,11 @@ public:
   virtual int encode_endpoints (void);
 
   /// @deprecated Return a reference to the Object Key.
-  virtual const TAO_ObjectKey &object_key (void) const;
+  virtual const TAO::ObjectKey &object_key (void) const;
 
   /// Return a pointer to the Object Key.  The caller owns the memory
   /// allocated for the returned key.
-  virtual TAO_ObjectKey *_key (void) const;
+  virtual TAO::ObjectKey *_key (void) const;
 
   /// Return pointer to the head of this profile's endpoints list.
   virtual TAO_Endpoint *endpoint (void);
@@ -190,7 +190,7 @@ protected:
 private:
 
   /// Object_key associated with this profile.
-  TAO_ObjectKey object_key_;
+  TAO::ObjectKey object_key_;
 
   /// Our tagged profile
   IOP::TaggedProfile tagged_profile_;
diff --git a/TAO/tao/Strategies/DIOP_Profile.i b/TAO/tao/Strategies/DIOP_Profile.i
index 2c18a75ae92..a6488c3da80 100644
--- a/TAO/tao/Strategies/DIOP_Profile.i
+++ b/TAO/tao/Strategies/DIOP_Profile.i
@@ -1,19 +1,19 @@
 // -*- C++ -*-
 // $Id$
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_DIOP_Profile::object_key (void) const
 {
   return this->object_key_;
 }
 
-ACE_INLINE TAO_ObjectKey *
+ACE_INLINE TAO::ObjectKey *
 TAO_DIOP_Profile::_key (void) const
 {
-  TAO_ObjectKey *key = 0;
+  TAO::ObjectKey *key = 0;
 
   ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (this->object_key_),
+                  TAO::ObjectKey (this->object_key_),
                   0);
 
   return key;
diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile
index 9b4d6ac8139..fbfadcde772 100644
--- a/TAO/tao/Strategies/Makefile
+++ b/TAO/tao/Strategies/Makefile
@@ -162,7 +162,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -189,7 +190,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -235,6 +237,16 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -243,23 +255,23 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Transport_Acceptor.inl \
   DIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -331,8 +343,8 @@ endif
   $(TAO_ROOT)/tao/LF_Event.h \
   $(TAO_ROOT)/tao/LF_Event.inl \
   $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl DIOP_Transport.h \
-  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
+  DIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(TAO_ROOT)/tao/Cache_Entries.h \
   $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
@@ -346,6 +358,11 @@ endif
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
@@ -365,10 +382,14 @@ endif
   $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -383,7 +404,6 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -398,12 +418,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -506,7 +524,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -535,7 +554,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -558,6 +578,35 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -566,11 +615,19 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/CONV_FRAMEC.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.i \
@@ -584,16 +641,18 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Profile.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i DIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/Profile.i DIOP_Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
@@ -606,19 +665,14 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -635,12 +689,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -650,21 +702,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -677,14 +714,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -773,7 +802,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -802,7 +832,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -864,6 +895,8 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -872,11 +905,19 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
@@ -884,6 +925,16 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
@@ -900,11 +951,6 @@ endif
   $(ACE_ROOT)/ace/Synch_Options.h \
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -931,7 +977,8 @@ endif
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
@@ -981,10 +1028,14 @@ endif
   $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -999,7 +1050,6 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -1014,12 +1064,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1057,12 +1105,8 @@ endif
   DIOP_Acceptor.i DIOP_Profile.h \
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/Tagged_Components.i \
-  $(TAO_ROOT)/tao/Profile.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i DIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/Profile.i DIOP_Endpoint.h \
   DIOP_Endpoint.i DIOP_Profile.i \
   $(TAO_ROOT)/tao/Acceptor_Registry.h \
   $(TAO_ROOT)/tao/Acceptor_Registry.i \
@@ -1154,7 +1198,8 @@ endif
   $(ACE_ROOT)/ace/Handle_Set.h \
   $(ACE_ROOT)/ace/Handle_Set.i \
   $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1192,7 +1237,8 @@ endif
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -1203,7 +1249,8 @@ endif
   $(ACE_ROOT)/ace/Init_ACE.i \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
@@ -1211,7 +1258,8 @@ endif
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -1320,8 +1368,8 @@ endif
   $(TAO_ROOT)/tao/LF_Event.h \
   $(TAO_ROOT)/tao/LF_Event.inl \
   $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl DIOP_Transport.h \
-  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
+  DIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
   $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
@@ -1343,6 +1391,8 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -1351,16 +1401,29 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
@@ -1380,13 +1443,16 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
   $(ACE_ROOT)/ace/Connector.cpp \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1415,12 +1481,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1460,15 +1524,11 @@ endif
   $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/target_specification.i \
   $(TAO_ROOT)/tao/operation_details.i \
   $(TAO_ROOT)/tao/Invocation.i DIOP_Profile.h \
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/Profile.i DIOP_Endpoint.h \
   DIOP_Endpoint.i DIOP_Profile.i
@@ -1536,7 +1596,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1565,7 +1626,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -1588,6 +1650,35 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -1596,47 +1687,28 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Transport_Acceptor.inl \
-  DIOP_Connection_Handler.h $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Acceptor.h \
+  DIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -1708,8 +1780,8 @@ endif
   $(TAO_ROOT)/tao/LF_Event.h \
   $(TAO_ROOT)/tao/LF_Event.inl \
   $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl DIOP_Transport.h \
-  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
+  DIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(TAO_ROOT)/tao/Cache_Entries.h \
   $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
@@ -1723,6 +1795,11 @@ endif
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
@@ -1742,10 +1819,14 @@ endif
   $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -1760,7 +1841,6 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -1775,12 +1855,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -1818,16 +1896,13 @@ endif
   DIOP_Acceptor.i DIOP_Profile.h \
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/Tagged_Components.i \
-  $(TAO_ROOT)/tao/Profile.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i DIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/Profile.i DIOP_Endpoint.h \
   DIOP_Endpoint.i DIOP_Profile.i \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
-  $(TAO_ROOT)/tao/Protocols_Hooks.h
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/Codeset_Manager.h
 
 .obj/DIOP_Connection_Handler.o .obj/DIOP_Connection_Handler.so .shobj/DIOP_Connection_Handler.o .shobj/DIOP_Connection_Handler.so: DIOP_Connection_Handler.cpp \
   DIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \
@@ -1866,7 +1941,8 @@ endif
   $(ACE_ROOT)/ace/Handle_Set.h \
   $(ACE_ROOT)/ace/Handle_Set.i \
   $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -1904,7 +1980,8 @@ endif
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -1915,7 +1992,8 @@ endif
   $(ACE_ROOT)/ace/Init_ACE.i \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
@@ -1923,7 +2001,8 @@ endif
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -2032,8 +2111,8 @@ endif
   $(TAO_ROOT)/tao/LF_Event.h \
   $(TAO_ROOT)/tao/LF_Event.inl \
   $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl DIOP_Transport.h \
-  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
+  DIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
   $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
@@ -2057,6 +2136,8 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -2065,16 +2146,29 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
@@ -2091,13 +2185,16 @@ endif
   $(ACE_ROOT)/ace/SOCK_Dgram.i DIOP_Connection_Handler.i \
   $(TAO_ROOT)/tao/Timeprobe.h \
   $(ACE_ROOT)/ace/Timeprobe.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -2126,12 +2223,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -2201,7 +2296,8 @@ endif
   $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/Endpoint.h \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -2259,7 +2355,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -2268,7 +2365,8 @@ endif
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -2281,22 +2379,56 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -2308,40 +2440,13 @@ endif
   $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/INET_Addr.i strategies_export.h \
   DIOP_Endpoint.i DIOP_Connection_Handler.h \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -2413,8 +2518,8 @@ endif
   $(TAO_ROOT)/tao/LF_Event.h \
   $(TAO_ROOT)/tao/LF_Event.inl \
   $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl DIOP_Transport.h \
-  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Connection_Handler.inl \
+  DIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
   $(TAO_ROOT)/tao/Cache_Entries.h \
   $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
@@ -2425,15 +2530,26 @@ endif
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
@@ -2444,8 +2560,7 @@ endif
   $(ACE_ROOT)/ace/SOCK_IO.i \
   $(ACE_ROOT)/ace/SOCK_Stream.i DIOP_Transport.i \
   $(ACE_ROOT)/ace/SOCK_Dgram.h \
-  $(ACE_ROOT)/ace/SOCK_Dgram.i DIOP_Connection_Handler.i \
-  $(TAO_ROOT)/tao/debug.h
+  $(ACE_ROOT)/ace/SOCK_Dgram.i DIOP_Connection_Handler.i
 
 .obj/UIOP_Factory.o .obj/UIOP_Factory.so .shobj/UIOP_Factory.o .shobj/UIOP_Factory.so: UIOP_Factory.cpp UIOP_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -2479,335 +2594,7 @@ endif
   $(ACE_ROOT)/ace/CDR_Base.inl \
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Protocol_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i strategies_export.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h UIOP_Acceptor.h \
-  $(TAO_ROOT)/tao/Transport_Acceptor.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
-  $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i UIOP_Connection_Handler.h \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Acceptor_Impl.h \
-  $(TAO_ROOT)/tao/Acceptor_Impl.i \
-  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/ORB_Table.h \
-  $(TAO_ROOT)/tao/ORB_Table.inl \
-  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  $(TAO_ROOT)/tao/Connector_Registry.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i \
-  $(TAO_ROOT)/tao/Connector_Registry.i \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  UIOP_Connector.h $(ACE_ROOT)/ace/LSOCK_Connector.h \
-  $(ACE_ROOT)/ace/SOCK_Connector.h \
-  $(ACE_ROOT)/ace/SOCK_Connector.i \
-  $(ACE_ROOT)/ace/LSOCK_Connector.i \
-  $(ACE_ROOT)/ace/Connector.h \
-  $(ACE_ROOT)/ace/Connector.cpp \
-  $(TAO_ROOT)/tao/Transport_Connector.h \
-  $(TAO_ROOT)/tao/Transport_Connector.inl \
-  $(TAO_ROOT)/tao/Connector_Impl.h \
-  $(TAO_ROOT)/tao/Connector_Impl.inl \
-  $(TAO_ROOT)/tao/Connector_Impl.cpp
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/UIOP_Lite_Factory.o .obj/UIOP_Lite_Factory.so .shobj/UIOP_Lite_Factory.o .shobj/UIOP_Lite_Factory.so: UIOP_Lite_Factory.cpp UIOP_Lite_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -2841,339 +2628,7 @@ endif
   $(ACE_ROOT)/ace/CDR_Base.inl \
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h strategies_export.h \
-  $(TAO_ROOT)/tao/Protocol_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i UIOP_Acceptor.h \
-  $(TAO_ROOT)/tao/Transport_Acceptor.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
-  $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i UIOP_Connection_Handler.h \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Acceptor_Impl.h \
-  $(TAO_ROOT)/tao/Acceptor_Impl.i \
-  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/ORB_Table.h \
-  $(TAO_ROOT)/tao/ORB_Table.inl \
-  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  $(TAO_ROOT)/tao/Connector_Registry.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i \
-  $(TAO_ROOT)/tao/Connector_Registry.i \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  UIOP_Connector.h $(ACE_ROOT)/ace/LSOCK_Connector.h \
-  $(ACE_ROOT)/ace/SOCK_Connector.h \
-  $(ACE_ROOT)/ace/SOCK_Connector.i \
-  $(ACE_ROOT)/ace/LSOCK_Connector.i \
-  $(ACE_ROOT)/ace/Connector.h \
-  $(ACE_ROOT)/ace/Connector.cpp \
-  $(TAO_ROOT)/tao/Transport_Connector.h \
-  $(TAO_ROOT)/tao/Transport_Connector.inl \
-  $(TAO_ROOT)/tao/Connector_Impl.h \
-  $(TAO_ROOT)/tao/Connector_Impl.inl \
-  $(TAO_ROOT)/tao/Connector_Impl.cpp \
-  $(ACE_ROOT)/ace/Dynamic_Service.h \
-  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
-  $(ACE_ROOT)/ace/Dynamic_Service.i \
-  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/UIOP_Profile.o .obj/UIOP_Profile.so .shobj/UIOP_Profile.o .shobj/UIOP_Profile.so: UIOP_Profile.cpp UIOP_Profile.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -3207,320 +2662,7 @@ endif
   $(ACE_ROOT)/ace/CDR_Base.inl \
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i strategies_export.h \
-  $(TAO_ROOT)/tao/Profile.h \
-  $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/Tagged_Components.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Profile.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i UIOP_Connection_Handler.h \
-  $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl UIOP_Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i UIOP_Endpoint.i \
-  UIOP_Profile.i $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i uiop_endpoints.h \
-  uiop_endpoints.i
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/UIOP_Transport.o .obj/UIOP_Transport.so .shobj/UIOP_Transport.o .shobj/UIOP_Transport.so: UIOP_Transport.cpp UIOP_Transport.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -3554,355 +2696,7 @@ endif
   $(ACE_ROOT)/ace/CDR_Base.inl \
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i strategies_export.h \
-  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl \
-  UIOP_Connection_Handler.inl UIOP_Profile.h \
-  $(TAO_ROOT)/tao/Profile.h \
-  $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/Tagged_Components.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Profile.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i UIOP_Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i UIOP_Endpoint.i \
-  UIOP_Profile.i $(TAO_ROOT)/tao/Timeprobe.h \
-  $(ACE_ROOT)/ace/Timeprobe.h \
-  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
-  $(TAO_ROOT)/tao/Sync_Strategies.h \
-  $(TAO_ROOT)/tao/TAOC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
-  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/TAOC.i \
-  $(TAO_ROOT)/tao/Sync_Strategies.i \
-  $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/MProfile.i \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
-  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
-  $(TAO_ROOT)/tao/Stub.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Base.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.inl \
-  $(TAO_ROOT)/tao/GIOP_Utils.h \
-  $(TAO_ROOT)/tao/GIOP_Utils.i \
-  $(TAO_ROOT)/tao/GIOP_Message_State.h \
-  $(TAO_ROOT)/tao/GIOP_Message_State.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Base.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Lite.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Lite.i
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/UIOP_Connector.o .obj/UIOP_Connector.so .shobj/UIOP_Connector.o .shobj/UIOP_Connector.so: UIOP_Connector.cpp UIOP_Connector.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -3936,349 +2730,7 @@ endif
   $(ACE_ROOT)/ace/CDR_Base.inl \
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(ACE_ROOT)/ace/LSOCK_Connector.h \
-  $(ACE_ROOT)/ace/SOCK_Connector.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Connector.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK.h $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i \
-  $(ACE_ROOT)/ace/LSOCK_Connector.i \
-  $(ACE_ROOT)/ace/Connector.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Connector.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(TAO_ROOT)/tao/Transport_Connector.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Transport_Connector.inl \
-  UIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  strategies_export.h $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/Connector_Impl.h \
-  $(TAO_ROOT)/tao/Connector_Impl.inl \
-  $(TAO_ROOT)/tao/Connector_Impl.cpp UIOP_Profile.h \
-  $(TAO_ROOT)/tao/Profile.h \
-  $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/Tagged_Components.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Profile.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i UIOP_Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i UIOP_Endpoint.i \
-  UIOP_Profile.i $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/Protocols_Hooks.h \
-  $(TAO_ROOT)/tao/Base_Transport_Property.h \
-  $(TAO_ROOT)/tao/Base_Transport_Property.inl \
-  $(TAO_ROOT)/tao/Invocation.h \
-  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
-  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.h \
-  $(TAO_ROOT)/tao/operation_details.h \
-  $(TAO_ROOT)/tao/Service_Context.h \
-  $(TAO_ROOT)/tao/Service_Context.inl \
-  $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/target_specification.i \
-  $(TAO_ROOT)/tao/operation_details.i \
-  $(TAO_ROOT)/tao/Invocation.i \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
-  $(TAO_ROOT)/tao/Connect_Strategy.h
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/UIOP_Acceptor.o .obj/UIOP_Acceptor.so .shobj/UIOP_Acceptor.o .shobj/UIOP_Acceptor.so: UIOP_Acceptor.cpp UIOP_Acceptor.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -4343,7 +2795,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -4372,7 +2825,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -4395,29 +2849,7 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
-  $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -4444,203 +2876,31 @@ endif
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i UIOP_Connection_Handler.h \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  strategies_export.h $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Acceptor_Impl.h \
-  $(TAO_ROOT)/tao/Acceptor_Impl.i \
-  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/ORB_Table.h \
-  $(TAO_ROOT)/tao/ORB_Table.inl \
-  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  $(TAO_ROOT)/tao/Connector_Registry.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i \
-  $(TAO_ROOT)/tao/Connector_Registry.i \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl UIOP_Profile.h \
-  $(TAO_ROOT)/tao/Profile.h \
-  $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/Tagged_Components.i \
-  $(TAO_ROOT)/tao/Profile.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i UIOP_Endpoint.h \
-  UIOP_Endpoint.i UIOP_Profile.i \
-  $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/MProfile.i \
-  $(TAO_ROOT)/tao/Protocols_Hooks.h
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Transport_Acceptor.inl
 
 .obj/UIOP_Connection_Handler.o .obj/UIOP_Connection_Handler.so .shobj/UIOP_Connection_Handler.o .shobj/UIOP_Connection_Handler.so: UIOP_Connection_Handler.cpp \
   UIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \
@@ -4674,326 +2934,7 @@ endif
   $(ACE_ROOT)/ace/CDR_Base.inl \
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  strategies_export.h $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl UIOP_Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i UIOP_Endpoint.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/Timeprobe.h \
-  $(ACE_ROOT)/ace/Timeprobe.h \
-  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  $(TAO_ROOT)/tao/Base_Transport_Property.h \
-  $(TAO_ROOT)/tao/Base_Transport_Property.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Lite.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
-  $(TAO_ROOT)/tao/GIOP_Utils.h \
-  $(TAO_ROOT)/tao/GIOP_Utils.i \
-  $(TAO_ROOT)/tao/GIOP_Message_State.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_State.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Lite.i \
-  $(TAO_ROOT)/tao/Resume_Handle.h \
-  $(TAO_ROOT)/tao/Resume_Handle.inl \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.i
+  $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/UIOP_Endpoint.o .obj/UIOP_Endpoint.so .shobj/UIOP_Endpoint.o .shobj/UIOP_Endpoint.so: UIOP_Endpoint.cpp UIOP_Endpoint.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -5030,7 +2971,8 @@ endif
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -5043,229 +2985,7 @@ endif
   $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
-  $(TAO_ROOT)/tao/Endpoint.i strategies_export.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.i UIOP_Endpoint.i \
-  UIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl
+  $(TAO_ROOT)/tao/Endpoint.i UIOP_Connection_Handler.h
 
 .obj/SHMIOP_Factory.o .obj/SHMIOP_Factory.so .shobj/SHMIOP_Factory.o .shobj/SHMIOP_Factory.so: SHMIOP_Factory.cpp SHMIOP_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -5334,7 +3054,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5361,7 +3082,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -5407,6 +3129,16 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -5415,23 +3147,23 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Transport_Acceptor.inl \
   SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -5505,8 +3237,9 @@ endif
   $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
   $(TAO_ROOT)/tao/Connection_Handler.inl \
   SHMIOP_Transport.h $(ACE_ROOT)/ace/MEM_Stream.h \
-  $(ACE_ROOT)/ace/MEM_IO.h $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/MEM_IO.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i \
@@ -5540,6 +3273,11 @@ endif
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
   SHMIOP_Connection_Handler.inl \
   $(TAO_ROOT)/tao/Acceptor_Impl.h \
@@ -5547,10 +3285,14 @@ endif
   $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -5565,7 +3307,6 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -5580,12 +3321,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -5711,7 +3450,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5740,7 +3480,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -5763,6 +3504,35 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -5771,11 +3541,19 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/CONV_FRAMEC.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.i \
@@ -5789,16 +3567,18 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Profile.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i SHMIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/Profile.i SHMIOP_Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
@@ -5812,19 +3592,14 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(TAO_ROOT)/tao/params.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
@@ -5841,12 +3616,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -5856,21 +3629,6 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -5883,14 +3641,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -5974,14 +3724,16 @@ endif
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
   $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -6025,7 +3777,8 @@ endif
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
@@ -6094,8 +3847,9 @@ endif
   $(ACE_ROOT)/ace/Dynamic.h \
   $(ACE_ROOT)/ace/Dynamic.i \
   $(ACE_ROOT)/ace/MEM_Stream.h \
-  $(ACE_ROOT)/ace/MEM_IO.h $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/MEM_IO.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i \
@@ -6147,6 +3901,8 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -6155,11 +3911,19 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
@@ -6167,6 +3931,11 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
   SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Strategies_T.h \
@@ -6191,8 +3960,6 @@ endif
   SHMIOP_Connection_Handler.inl SHMIOP_Profile.h \
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -6203,16 +3970,18 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Profile.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i SHMIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/Profile.i SHMIOP_Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   $(ACE_ROOT)/ace/MEM_Addr.h \
@@ -6243,7 +4012,6 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -6253,12 +4021,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -6360,7 +4126,8 @@ endif
   $(ACE_ROOT)/ace/Init_ACE.i \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/SOCK_IO.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/SOCK_IO.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
   $(ACE_ROOT)/ace/INET_Addr.i \
   $(ACE_ROOT)/ace/SOCK_Stream.i \
@@ -6376,7 +4143,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -6406,7 +4174,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6577,6 +4346,8 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -6585,16 +4356,29 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
   SHMIOP_Connection_Handler.inl \
   $(TAO_ROOT)/tao/Resource_Factory.h \
@@ -6603,8 +4387,6 @@ endif
   $(TAO_ROOT)/tao/Connector_Impl.cpp SHMIOP_Profile.h \
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -6615,19 +4397,21 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Profile.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i SHMIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/Profile.i SHMIOP_Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.h \
   $(TAO_ROOT)/tao/Endpoint.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i SHMIOP_Endpoint.i \
-  SHMIOP_Profile.i $(TAO_ROOT)/tao/debug.h \
+  SHMIOP_Profile.i \
   $(TAO_ROOT)/tao/Base_Transport_Property.h \
   $(TAO_ROOT)/tao/Base_Transport_Property.inl \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -6649,12 +4433,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -6759,7 +4541,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -6788,7 +4571,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -6811,6 +4595,35 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -6819,47 +4632,28 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Transport_Acceptor.inl \
-  SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Acceptor.h \
+  SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -6934,8 +4728,9 @@ endif
   $(TAO_ROOT)/tao/Connection_Handler.inl \
   SHMIOP_Transport.h strategies_export.h \
   $(ACE_ROOT)/ace/MEM_Stream.h \
-  $(ACE_ROOT)/ace/MEM_IO.h $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/MEM_IO.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i \
@@ -6969,6 +4764,11 @@ endif
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
   SHMIOP_Connection_Handler.inl \
   $(TAO_ROOT)/tao/Acceptor_Impl.h \
@@ -6976,10 +4776,14 @@ endif
   $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -6994,7 +4798,6 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/params.h \
@@ -7009,12 +4812,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -7063,15 +4864,12 @@ endif
   SHMIOP_Acceptor.i SHMIOP_Profile.h \
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/Tagged_Components.i \
-  $(TAO_ROOT)/tao/Profile.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i SHMIOP_Endpoint.h \
+  $(TAO_ROOT)/tao/Profile.i SHMIOP_Endpoint.h \
   SHMIOP_Endpoint.i SHMIOP_Profile.i \
   $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/MProfile.i
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Codeset_Manager.h
 
 .obj/SHMIOP_Connection_Handler.o .obj/SHMIOP_Connection_Handler.so .shobj/SHMIOP_Connection_Handler.o .shobj/SHMIOP_Connection_Handler.so: SHMIOP_Connection_Handler.cpp \
   SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \
@@ -7110,7 +4908,8 @@ endif
   $(ACE_ROOT)/ace/Handle_Set.h \
   $(ACE_ROOT)/ace/Handle_Set.i \
   $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -7148,7 +4947,8 @@ endif
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -7159,7 +4959,8 @@ endif
   $(ACE_ROOT)/ace/Init_ACE.i \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
@@ -7167,7 +4968,8 @@ endif
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -7279,8 +5081,9 @@ endif
   $(TAO_ROOT)/tao/Connection_Handler.inl \
   SHMIOP_Transport.h strategies_export.h \
   $(ACE_ROOT)/ace/MEM_Stream.h \
-  $(ACE_ROOT)/ace/MEM_IO.h $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/MEM_IO.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i \
@@ -7324,6 +5127,8 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -7332,27 +5137,43 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
   SHMIOP_Connection_Handler.inl \
   $(TAO_ROOT)/tao/Timeprobe.h \
   $(ACE_ROOT)/ace/Timeprobe.h \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -7381,12 +5202,10 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -7457,7 +5276,8 @@ endif
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
@@ -7515,7 +5335,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -7524,7 +5345,8 @@ endif
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -7537,22 +5359,56 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -7565,40 +5421,13 @@ endif
   $(ACE_ROOT)/ace/INET_Addr.i \
   $(ACE_ROOT)/ace/MEM_Addr.h \
   $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \
-  SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Acceptor.h \
+  SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -7672,7 +5501,8 @@ endif
   $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
   $(TAO_ROOT)/tao/Connection_Handler.inl \
   SHMIOP_Transport.h $(ACE_ROOT)/ace/MEM_Stream.h \
-  $(ACE_ROOT)/ace/MEM_IO.h $(ACE_ROOT)/ace/SOCK.h \
+  $(ACE_ROOT)/ace/MEM_IO.h \
+  $(ACE_ROOT)/ace/SOCK.h \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i \
@@ -7701,17 +5531,28 @@ endif
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
   $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
-  SHMIOP_Connection_Handler.inl $(TAO_ROOT)/tao/debug.h
+  SHMIOP_Connection_Handler.inl
 
 .obj/uiop_endpoints.o .obj/uiop_endpoints.so .shobj/uiop_endpoints.o .shobj/uiop_endpoints.so: uiop_endpoints.cpp uiop_endpoints.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -7765,12 +5606,9 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -7783,13 +5621,13 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -7799,6 +5637,24 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -7817,15 +5673,33 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -7833,11 +5707,9 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i uiop_endpoints.i
 
 .obj/advanced_resource.o .obj/advanced_resource.so .shobj/advanced_resource.o .shobj/advanced_resource.so: advanced_resource.cpp advanced_resource.h \
@@ -7879,7 +5751,8 @@ endif
   $(ACE_ROOT)/ace/Service_Object.i \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -7887,6 +5760,16 @@ endif
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -7907,7 +5790,8 @@ endif
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -7938,6 +5822,29 @@ endif
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -7956,47 +5863,32 @@ endif
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(TAO_ROOT)/tao/default_resource.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/default_resource.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -8028,16 +5920,19 @@ endif
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
@@ -8061,14 +5956,6 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -8092,8 +5979,9 @@ endif
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i advanced_resource.i \
-  UIOP_Factory.h $(TAO_ROOT)/tao/Protocol_Factory.h \
-  SHMIOP_Factory.h DIOP_Factory.h LFU_Connection_Purging_Strategy.h \
+  UIOP_Factory.h SHMIOP_Factory.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h DIOP_Factory.h \
+  LFU_Connection_Purging_Strategy.h \
   $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
   $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
   FIFO_Connection_Purging_Strategy.h NULL_Connection_Purging_Strategy.h \
@@ -8121,7 +6009,7 @@ endif
   $(ACE_ROOT)/ace/Select_Reactor.h \
   $(ACE_ROOT)/ace/Select_Reactor_T.h \
   $(ACE_ROOT)/ace/Select_Reactor_Base.h \
-  $(ACE_ROOT)/ace/Token.h $(ACE_ROOT)/ace/Token.i \
+  $(ACE_ROOT)/ace/Token.h \
   $(ACE_ROOT)/ace/Pipe.h $(ACE_ROOT)/ace/Pipe.i \
   $(ACE_ROOT)/ace/Select_Reactor_Base.i \
   $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
@@ -8201,7 +6089,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -8230,7 +6119,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -8292,6 +6182,8 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -8300,11 +6192,19 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
@@ -8312,6 +6212,16 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl
 
 .obj/FIFO_Connection_Purging_Strategy.o .obj/FIFO_Connection_Purging_Strategy.so .shobj/FIFO_Connection_Purging_Strategy.o .shobj/FIFO_Connection_Purging_Strategy.so: FIFO_Connection_Purging_Strategy.cpp \
@@ -8378,7 +6288,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -8407,7 +6318,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -8469,6 +6381,8 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -8477,11 +6391,19 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
@@ -8489,6 +6411,16 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl
 
 .obj/NULL_Connection_Purging_Strategy.o .obj/NULL_Connection_Purging_Strategy.so .shobj/NULL_Connection_Purging_Strategy.o .shobj/NULL_Connection_Purging_Strategy.so: NULL_Connection_Purging_Strategy.cpp \
@@ -8555,7 +6487,8 @@ endif
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -8584,7 +6517,8 @@ endif
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -8646,6 +6580,8 @@ endif
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
@@ -8654,11 +6590,19 @@ endif
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_T.h \
   $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
@@ -8666,6 +6610,16 @@ endif
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
   $(TAO_ROOT)/tao/Transport.inl
 
 .obj/LF_Strategy_Null.o .obj/LF_Strategy_Null.so .shobj/LF_Strategy_Null.o .shobj/LF_Strategy_Null.so: LF_Strategy_Null.cpp LF_Strategy_Null.h \
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index b8995dcf2d0..5d62a5221b3 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -16,7 +16,9 @@
 #include "SHMIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Strategies, SHMIOP_Acceptor, "$Id$")
+ACE_RCSID (Strategies, 
+           SHMIOP_Acceptor, 
+           "$Id$")
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -75,7 +77,7 @@ TAO_SHMIOP_Acceptor::~TAO_SHMIOP_Acceptor (void)
 //       interfaces over which we can receive requests.  Thus a profile
 //       must be made for each one.
 int
-TAO_SHMIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
+TAO_SHMIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
                                      TAO_MProfile &mprofile,
                                      CORBA::Short priority)
 {
@@ -92,7 +94,7 @@ TAO_SHMIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_SHMIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+TAO_SHMIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
                                          TAO_MProfile &mprofile,
                                          CORBA::Short priority)
 {
@@ -136,7 +138,7 @@ TAO_SHMIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_SHMIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
+TAO_SHMIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
                                             TAO_MProfile &mprofile,
                                             CORBA::Short priority)
 {
@@ -359,7 +361,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
 
 int
 TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                                 TAO_ObjectKey &object_key)
+                                 TAO::ObjectKey &object_key)
 {
   // Create the decoding stream from the encapsulation in the buffer,
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h
index b5d2e99dff9..89dd2f38a55 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h
@@ -75,7 +75,7 @@ public:
                             int version_minor,
                             const char *options = 0);
   virtual int close (void);
-  virtual int create_profile (const TAO_ObjectKey &object_key,
+  virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
@@ -83,7 +83,7 @@ public:
   virtual CORBA::ULong endpoint_count (void);
 
   virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO_ObjectKey &key);
+                          TAO::ObjectKey &key);
   //@}
 
   /// Set the MMAP options the MEM_Stream this acceptor creates will
@@ -100,12 +100,12 @@ private:
   virtual int parse_options (const char *options);
 
   /// Create a SHMIOP profile representing this acceptor.
-  int create_new_profile (const TAO_ObjectKey &object_key,
+  int create_new_profile (const TAO::ObjectKey &object_key,
                           TAO_MProfile &mprofile,
                           CORBA::Short priority);
 
   /// Add the endpoints on this acceptor to a shared profile.
-  int create_shared_profile (const TAO_ObjectKey &object_key,
+  int create_shared_profile (const TAO::ObjectKey &object_key,
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
 
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 73953e5ec1b..7dd536e724d 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -31,7 +31,7 @@ TAO_SHMIOP_Profile::object_key_delimiter (void) const
 }
 
 TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (const ACE_MEM_Addr &addr,
-                                        const TAO_ObjectKey &object_key,
+                                        const TAO::ObjectKey &object_key,
                                         const TAO_GIOP_Message_Version &version,
                                         TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_TAG_SHMEM_PROFILE, orb_core, version),
@@ -45,7 +45,7 @@ TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (const ACE_MEM_Addr &addr,
 
 TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (const char* host,
                                         CORBA::UShort port,
-                                        const TAO_ObjectKey &object_key,
+                                        const TAO::ObjectKey &object_key,
                                         const ACE_INET_Addr &addr,
                                         const TAO_GIOP_Message_Version &version,
                                         TAO_ORB_Core *orb_core)
@@ -321,7 +321,7 @@ TAO_SHMIOP_Profile::parse_string (const char *string
 
   start = ++okd;  // increment past the object key separator
 
-  TAO_ObjectKey::decode_string_to_sequence (this->object_key_, start);
+  TAO::ObjectKey::decode_string_to_sequence (this->object_key_, start);
 }
 
 CORBA::Boolean
@@ -392,7 +392,7 @@ char *
 TAO_SHMIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
-  TAO_ObjectKey::encode_sequence_to_string (key.inout(),
+  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
                                              this->object_key_);
 
   u_int buflen = (8 /* corbaloc */ +
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index 3c132cb42a3..8511aae5a68 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -57,7 +57,7 @@ public:
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
   TAO_SHMIOP_Profile (const ACE_MEM_Addr &addr,
-                      const TAO_ObjectKey &object_key,
+                      const TAO::ObjectKey &object_key,
                       const TAO_GIOP_Message_Version &version,
                       TAO_ORB_Core *orb_core);
 
@@ -65,7 +65,7 @@ public:
   /// doesn't require any address resolution processing.
   TAO_SHMIOP_Profile (const char *host,
                       CORBA::UShort port,
-                      const TAO_ObjectKey &object_key,
+                      const TAO::ObjectKey &object_key,
                       const ACE_INET_Addr &addr,
                       const TAO_GIOP_Message_Version &version,
                       TAO_ORB_Core *orb_core);
@@ -111,11 +111,11 @@ public:
   virtual int encode_endpoints (void);
 
   /// @deprecated Return a reference to the Object Key.
-  virtual const TAO_ObjectKey &object_key (void) const;
+  virtual const TAO::ObjectKey &object_key (void) const;
 
   /// Return a pointer to the Object Key.  The caller owns the memory
   /// allocated for the returned key.
-  TAO_ObjectKey *_key (void) const;
+  TAO::ObjectKey *_key (void) const;
 
   /// Return pointer to the head of this profile's endpoints list.
   virtual TAO_Endpoint *endpoint (void);
@@ -179,7 +179,7 @@ private:
   size_t count_;
 
   /// Object_key associated with this profile.
-  TAO_ObjectKey object_key_;
+  TAO::ObjectKey object_key_;
 
   /// The tagged profile info
   IOP::TaggedProfile tagged_profile_;
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.i b/TAO/tao/Strategies/SHMIOP_Profile.i
index 077e9117286..df1b431c57f 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.i
+++ b/TAO/tao/Strategies/SHMIOP_Profile.i
@@ -1,19 +1,19 @@
 // -*- C++ -*-
 // $Id$
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_SHMIOP_Profile::object_key (void) const
 {
   return this->object_key_;
 }
 
-ACE_INLINE TAO_ObjectKey *
+ACE_INLINE TAO::ObjectKey *
 TAO_SHMIOP_Profile::_key (void) const
 {
-  TAO_ObjectKey *key = 0;
+  TAO::ObjectKey *key = 0;
 
   ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (this->object_key_),
+                  TAO::ObjectKey (this->object_key_),
                   0);
 
   return key;
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index b86a92d8e55..9ac84d9fae6 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -28,7 +28,9 @@
 #include "tao/Protocols_Hooks.h"
 #include "tao/Codeset_Manager.h"
 
-ACE_RCSID(Strategies, UIOP_Acceptor, "$Id$")
+ACE_RCSID (Strategies, 
+           UIOP_Acceptor, 
+           "$Id$")
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -82,7 +84,7 @@ TAO_UIOP_Acceptor::~TAO_UIOP_Acceptor (void)
 }
 
 int
-TAO_UIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
+TAO_UIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
                                    TAO_MProfile &mprofile,
                                    CORBA::Short priority)
 {
@@ -100,7 +102,7 @@ TAO_UIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_UIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+TAO_UIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
                                        TAO_MProfile &mprofile,
                                        CORBA::Short priority)
 {
@@ -145,7 +147,7 @@ TAO_UIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
 }
 
 int
-TAO_UIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
+TAO_UIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
                                           TAO_MProfile &mprofile,
                                           CORBA::Short priority)
 {
@@ -388,7 +390,7 @@ TAO_UIOP_Acceptor::endpoint_count (void)
 
 int
 TAO_UIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                               TAO_ObjectKey &object_key)
+                               TAO::ObjectKey &object_key)
 {
   // Create the decoding stream from the encapsulation in the buffer,
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h
index 1fc411100d4..ca101018629 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.h
+++ b/TAO/tao/Strategies/UIOP_Acceptor.h
@@ -77,7 +77,7 @@ public:
                             int version_minor,
                             const char *options = 0);
   virtual int close (void);
-  virtual int create_profile (const TAO_ObjectKey &object_key,
+  virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority);
 
@@ -85,7 +85,7 @@ public:
   virtual CORBA::ULong endpoint_count (void);
 
   virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO_ObjectKey &key);
+                          TAO::ObjectKey &key);
   //@}
 
 private:
@@ -105,12 +105,12 @@ private:
   int init_uiop_properties (void);
 
   /// Create a UIOP profile representing this acceptor.
-  int create_new_profile (const TAO_ObjectKey &object_key,
+  int create_new_profile (const TAO::ObjectKey &object_key,
                           TAO_MProfile &mprofile,
                           CORBA::Short priority);
 
   /// Add the endpoints on this acceptor to a shared profile.
-  int create_shared_profile (const TAO_ObjectKey &object_key,
+  int create_shared_profile (const TAO::ObjectKey &object_key,
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
 
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 1ed25209681..680ea7e0b43 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -33,7 +33,7 @@ TAO_UIOP_Profile::object_key_delimiter (void) const
 }
 
 TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                                    const TAO_ObjectKey &object_key,
+                                    const TAO::ObjectKey &object_key,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_TAG_UIOP_PROFILE, orb_core, version),
@@ -45,7 +45,7 @@ TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
 }
 
 TAO_UIOP_Profile::TAO_UIOP_Profile (const char *,
-                                    const TAO_ObjectKey &object_key,
+                                    const TAO::ObjectKey &object_key,
                                     const ACE_UNIX_Addr &addr,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
@@ -171,7 +171,7 @@ TAO_UIOP_Profile::parse_string (const char *string
 
   start = ++cp;  // increment past the object key separator
 
-  TAO_ObjectKey::decode_string_to_sequence (this->object_key_, start);
+  TAO::ObjectKey::decode_string_to_sequence (this->object_key_, start);
 }
 
 CORBA::Boolean
@@ -243,7 +243,7 @@ char *
 TAO_UIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
-  TAO_ObjectKey::encode_sequence_to_string (key.inout(),
+  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
                                             this->object_key_);
 
   u_int buflen = (8 /* "corbaloc" */ +
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index 9a7e62ca90f..f122fe3feba 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -58,13 +58,13 @@ public:
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.  (actually, no marshalling for this protocol)
   TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                    const TAO_ObjectKey &object_key,
+                    const TAO::ObjectKey &object_key,
                     const TAO_GIOP_Message_Version &version,
                     TAO_ORB_Core *orb_core);
 
   /// Profile constructor
   TAO_UIOP_Profile (const char *rendezvous_point,
-                    const TAO_ObjectKey &object_key,
+                    const TAO::ObjectKey &object_key,
                     const ACE_UNIX_Addr &addr,
                     const TAO_GIOP_Message_Version &version,
                     TAO_ORB_Core *orb_core);
@@ -110,11 +110,11 @@ public:
   virtual int encode_endpoints (void);
 
   /// @deprecated Return a reference to the Object Key.
-  virtual const TAO_ObjectKey &object_key (void) const;
+  virtual const TAO::ObjectKey &object_key (void) const;
 
   /// Return a pointer to the Object Key.  The caller owns the memory
   /// allocated for the returned key.
-  virtual TAO_ObjectKey *_key (void) const;
+  virtual TAO::ObjectKey *_key (void) const;
 
   /// Return pointer to the head of this profile's endpoints list.
   virtual TAO_Endpoint *endpoint (void);
@@ -178,7 +178,7 @@ private:
   size_t count_;
 
   /// Object_key associated with this profile.
-  TAO_ObjectKey object_key_;
+  TAO::ObjectKey object_key_;
 
   /// Our tagged profile info
   IOP::TaggedProfile tagged_profile_;
diff --git a/TAO/tao/Strategies/UIOP_Profile.i b/TAO/tao/Strategies/UIOP_Profile.i
index 3c14e09b1e3..e55f4927fc4 100644
--- a/TAO/tao/Strategies/UIOP_Profile.i
+++ b/TAO/tao/Strategies/UIOP_Profile.i
@@ -3,19 +3,19 @@
 
 # if TAO_HAS_UIOP == 1
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_UIOP_Profile::object_key (void) const
 {
   return this->object_key_;
 }
 
-ACE_INLINE TAO_ObjectKey *
+ACE_INLINE TAO::ObjectKey *
 TAO_UIOP_Profile::_key (void) const
 {
-  TAO_ObjectKey *key = 0;
+  TAO::ObjectKey *key = 0;
 
   ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (this->object_key_),
+                  TAO::ObjectKey (this->object_key_),
                   0);
 
   return key;
diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl
index 3d2c69a9102..bdcc17cda09 100644
--- a/TAO/tao/StringSeq.pidl
+++ b/TAO/tao/StringSeq.pidl
@@ -4,13 +4,13 @@
 
 // ================================================================
 //
-//   This file was used to generate the code in PortableInterceptorC.*
+//   This file was used to generate the code in StringSeqC.*
 //   The command used to generate code is:
 //
 //     tao_idl
-//       -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+//       -o orig -Gp -Gd -Ge 1
 //          -Wb,export_macro=TAO_Export
-//          -Wb,export_include="corbafwd.h"
+//          -Wb,export_include="tao/corbafwd.h"
 //          -Wb,pre_include="ace/pre.h"
 //          -Wb,post_include="ace/post.h"
 //          StringSeq.pidl
@@ -31,6 +31,4 @@ module CORBA
   typedef sequence<wstring> WStringSeq;
 };
 
-#pragma prefix ""
-
 #endif  /* TAO_CORBA_STRING_SEQ_IDL */
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 5b6394831e9..80cfaca1bed 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -19,6 +19,10 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
 #include "StringSeqC.h"
 
 #if defined (__BORLANDC__)
@@ -29,344 +33,369 @@
 #include "StringSeqC.i"
 #endif /* !defined INLINE */
 
-#include "Any.h"
-#include "CDR.h"
-#include "Typecode.h"
+#include "Any_T.h"
 
 #if !defined (_CORBA_STRINGSEQ_CS_)
 #define _CORBA_STRINGSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::StringSeq
 // *************************************************************
 
 CORBA::StringSeq::StringSeq (void)
 {}
-CORBA::StringSeq::StringSeq (CORBA::ULong max) // uses max size
-  :
+
+CORBA::StringSeq::StringSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA::StringSeq::StringSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-  :
+
+CORBA::StringSeq::StringSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    char * *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA::StringSeq::StringSeq (const CORBA::StringSeq &seq) // copy ctor
-  :
+
+CORBA::StringSeq::StringSeq (const StringSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
+TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 CORBA::StringSeq::~StringSeq (void) // dtor
 {}
-void CORBA::StringSeq::_tao_any_destructor (void *x)
+
+void CORBA::StringSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA::StringSeq *tmp = ACE_static_cast (CORBA::StringSeq*,x);
+  StringSeq *tmp = ACE_static_cast (StringSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_StringSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72696e67), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-  10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000),  // name = StringSeq
-  CORBA::tk_sequence, // typecode kind
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  32,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5374), 
+  ACE_NTOHL (0x72696e67), 
+  ACE_NTOHL (0x5365713a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
+    10,
+  ACE_NTOHL (0x53747269), 
+  ACE_NTOHL (0x6e675365), 
+  ACE_NTOHL (0x71000000),  // name = StringSeq
+    CORBA::tk_sequence, // typecode kind
   16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_string,
+    CORBA::tk_string, 
     0U, // string length
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_StringSeq), (char *) &_oc_CORBA_StringSeq, 0, sizeof (CORBA::StringSeq));
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_StringSeq),
+    (char *) &_oc_CORBA_StringSeq,
+    0,
+    sizeof (CORBA::StringSeq)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringSeq, &_tc_TAO_tc_CORBA_StringSeq)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_StringSeq,
+    &_tc_TAO_tc_CORBA_StringSeq
+  )
 TAO_NAMESPACE_END
 
 #if !defined (_CORBA_WSTRINGSEQ_CS_)
 #define _CORBA_WSTRINGSEQ_CS_
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
 // *************************************************************
 // CORBA::WStringSeq
 // *************************************************************
 
 CORBA::WStringSeq::WStringSeq (void)
 {}
-CORBA::WStringSeq::WStringSeq (CORBA::ULong max) // uses max size
-  :
+
+CORBA::WStringSeq::WStringSeq (CORBA::ULong max)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_WString_Sequence
+TAO_Unbounded_WString_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_WString_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA::WStringSeq::WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release)
-  :
+
+CORBA::WStringSeq::WStringSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::WChar * *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_WString_Sequence
+TAO_Unbounded_WString_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_WString_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA::WStringSeq::WStringSeq (const CORBA::WStringSeq &seq) // copy ctor
-  :
+
+CORBA::WStringSeq::WStringSeq (const WStringSeq &seq)
+  : 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_WString_Sequence
+TAO_Unbounded_WString_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_WString_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
+
 CORBA::WStringSeq::~WStringSeq (void) // dtor
 {}
-void CORBA::WStringSeq::_tao_any_destructor (void *x)
+
+void CORBA::WStringSeq::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CORBA::WStringSeq *tmp = ACE_static_cast (CORBA::WStringSeq*,x);
+  WStringSeq *tmp = ACE_static_cast (WStringSeq*, _tao_void_pointer);
   delete tmp;
 }
 
-
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_WStringSeq[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5753), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WStringSeq:1.0
-  11, ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65710000),  // name = WStringSeq
-  CORBA::tk_sequence, // typecode kind
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5753), 
+  ACE_NTOHL (0x7472696e), 
+  ACE_NTOHL (0x67536571), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WStringSeq:1.0
+    11,
+  ACE_NTOHL (0x57537472), 
+  ACE_NTOHL (0x696e6753), 
+  ACE_NTOHL (0x65710000),  // name = WStringSeq
+    CORBA::tk_sequence, // typecode kind
   16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_wstring,
+    CORBA::tk_wstring, 
     0U, // string length
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_WStringSeq), (char *) &_oc_CORBA_WStringSeq, 0, sizeof (CORBA::WStringSeq));
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_WStringSeq),
+    (char *) &_oc_CORBA_WStringSeq,
+    0,
+    sizeof (CORBA::WStringSeq)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WStringSeq, &_tc_TAO_tc_CORBA_WStringSeq)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_WStringSeq,
+    &_tc_TAO_tc_CORBA_WStringSeq
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const CORBA::StringSeq &_tao_elem
-  ) // copying
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_StringSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert_copy (
+      _tao_any,
+      CORBA::StringSeq::_tao_any_destructor,
+      CORBA::_tc_StringSeq,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::StringSeq *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StringSeq *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert (
+      _tao_any,
+      CORBA::StringSeq::_tao_any_destructor,
       CORBA::_tc_StringSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::StringSeq::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StringSeq *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::StringSeq *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::StringSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::StringSeq *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::StringSeq *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::StringSeq *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CORBA::_tc_StringSeq ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA::StringSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA::StringSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::StringSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_StringSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA::StringSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::StringSeq>::extract (
+        _tao_any,
+        CORBA::StringSeq::_tao_any_destructor,
+        CORBA::_tc_StringSeq,
+        _tao_elem
+      );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
     const CORBA::WStringSeq &_tao_elem
-  ) // copying
+  )
 {
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_WStringSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
+  TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert_copy (
+      _tao_any,
+      CORBA::WStringSeq::_tao_any_destructor,
+      CORBA::_tc_WStringSeq,
+      _tao_elem
+    );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::WStringSeq *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::WStringSeq *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert (
+      _tao_any,
+      CORBA::WStringSeq::_tao_any_destructor,
       CORBA::_tc_WStringSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::WStringSeq::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::WStringSeq *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::WStringSeq *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::WStringSeq*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::WStringSeq *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::WStringSeq *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::WStringSeq *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (CORBA::_tc_WStringSeq ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      {
-        return 0;
-      }
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA::WStringSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA::WStringSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::WStringSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_WStringSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA::WStringSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::extract (
+        _tao_any,
+        CORBA::WStringSeq::_tao_any_destructor,
+        CORBA::_tc_WStringSeq,
+        _tao_elem
+      );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::StringSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -375,40 +404,64 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const CORBA::WStringSeq &_tao_sequence
   )
 {
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
 
 CORBA::Boolean operator>> (
@@ -417,20 +470,37 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
+        }
+      
+      // Set the length of the sequence.
+      _tao_sequence.length (_tao_seq_len);
+      
+      // If length is 0 we return true.
+      if (0 >= _tao_seq_len) 
+        {
+          return 1;
+        }
+      
+      // Retrieve all the elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
     }
-    return _tao_marshal_flag;
-  }
-  return 0; // error
+  
+  return 0;
 }
+
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
index 8f5c09c7e3a..019234a71cb 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_CORBA_STRINGSEQC_H_
-#define _TAO_IDL_CORBA_STRINGSEQC_H_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_STRINGSEQC_H_
+#define _TAO_IDL_ORIG_STRINGSEQC_H_
 
 #include "ace/pre.h"
 
@@ -69,10 +72,12 @@ namespace CORBA
   // *************************************************************
   
   class TAO_Export StringSeq : public 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_String_Sequence
+  TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_String_Sequence
+  TAO_Unbounded_String_Sequence
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
@@ -87,19 +92,18 @@ namespace CORBA
     StringSeq (const StringSeq &); // copy ctor
     ~StringSeq (void);
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef StringSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
   };
-  
-#endif /* end #if !defined */
 
+#endif /* end #if !defined */
 
 #if !defined (_CORBA_STRINGSEQ___VAR_CH_)
 #define _CORBA_STRINGSEQ___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class CORBA::StringSeq_var
   // *************************************************************
@@ -135,10 +139,8 @@ namespace CORBA
     StringSeq *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_STRINGSEQ___OUT_CH_)
 #define _CORBA_STRINGSEQ___OUT_CH_
 
@@ -154,15 +156,19 @@ namespace CORBA
     StringSeq *&ptr (void);
     StringSeq *operator-> (void);
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
+  
   private:
     StringSeq *&ptr_;
     // assignment from T_var not allowed
     void operator= (const StringSeq_var &);
   };
 
-
 #endif /* end #if !defined */
+  
+  // 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_StringSeq;
 
 #if !defined (_CORBA_WSTRINGSEQ_CH_)
 #define _CORBA_WSTRINGSEQ_CH_
@@ -176,9 +182,10 @@ namespace CORBA
   
   class TAO_Export WStringSeq : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_WString_Sequence
+  TAO_Unbounded_WString_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_WString_Sequence
+  TAO_Unbounded_WString_Sequence
+
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
@@ -193,19 +200,18 @@ namespace CORBA
     WStringSeq (const WStringSeq &); // copy ctor
     ~WStringSeq (void);
     static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    
     typedef WStringSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
   };
-  
-#endif /* end #if !defined */
 
+#endif /* end #if !defined */
 
 #if !defined (_CORBA_WSTRINGSEQ___VAR_CH_)
 #define _CORBA_WSTRINGSEQ___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+  
   // *************************************************************
   // class WStringSeq_var
   // *************************************************************
@@ -241,10 +247,8 @@ namespace CORBA
     WStringSeq *ptr_;
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_WSTRINGSEQ___OUT_CH_)
 #define _CORBA_WSTRINGSEQ___OUT_CH_
 
@@ -260,19 +264,17 @@ namespace CORBA
     WStringSeq *&ptr (void);
     WStringSeq *operator-> (void);
     TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
-    
+  
   private:
     WStringSeq *&ptr_;
     // assignment from T_var not allowed
     void operator= (const WStringSeq_var &);
   };
 
-
 #endif /* end #if !defined */
-
+  
 }  // End namespace CORBA
 
-// Proxy Broker Factory function pointer declarations.
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
@@ -285,6 +287,8 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringS
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_StringSeq_H_
 #define _TAO_CDR_OP_CORBA_StringSeq_H_
@@ -300,6 +304,8 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_CORBA_WStringSeq_H_
 #define _TAO_CDR_OP_CORBA_WStringSeq_H_
@@ -315,9 +321,13 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "StringSeqC.i"
@@ -333,3 +343,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/StringSeqC.i b/TAO/tao/StringSeqC.i
index dfce9610ce9..66a4b0ae58d 100644
--- a/TAO/tao/StringSeqC.i
+++ b/TAO/tao/StringSeqC.i
@@ -23,44 +23,53 @@
 #if !defined (_CORBA_STRINGSEQ_CI_)
 #define _CORBA_STRINGSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class CORBA::StringSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::StringSeq_var::StringSeq_var (void) // default constructor
+CORBA::StringSeq_var::StringSeq_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA::StringSeq_var::StringSeq_var (CORBA::StringSeq *p)
+CORBA::StringSeq_var::StringSeq_var (StringSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA::StringSeq_var::StringSeq_var (const ::CORBA::StringSeq_var &p) // copy constructor
+CORBA::StringSeq_var::StringSeq_var (const ::CORBA::StringSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::StringSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CORBA::StringSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-CORBA::StringSeq_var::~StringSeq_var (void) // destructor
+CORBA::StringSeq_var::~StringSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::StringSeq_var &
-CORBA::StringSeq_var::operator= (CORBA::StringSeq *p)
+ACE_INLINE
+CORBA::StringSeq_var &
+CORBA::StringSeq_var::operator= (StringSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::CORBA::StringSeq_var &
+ACE_INLINE
+::CORBA::StringSeq_var &
 CORBA::StringSeq_var::operator= (const ::CORBA::StringSeq_var &p)
 {
   if (this != &p)
@@ -72,12 +81,16 @@ CORBA::StringSeq_var::operator= (const ::CORBA::StringSeq_var &p)
         }
       else
         {
-          CORBA::StringSeq *deep_copy =
-            new CORBA::StringSeq (*p.ptr_);
+          StringSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              StringSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              CORBA::StringSeq *tmp = deep_copy;
+              StringSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -88,63 +101,68 @@ CORBA::StringSeq_var::operator= (const ::CORBA::StringSeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::CORBA::StringSeq *
+ACE_INLINE
+const ::CORBA::StringSeq *
 CORBA::StringSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::StringSeq *
+ACE_INLINE
+::CORBA::StringSeq *
 CORBA::StringSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::StringSeq_var::operator const ::CORBA::StringSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::StringSeq_var::operator ::CORBA::StringSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::StringSeq_var::operator ::CORBA::StringSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 CORBA::StringSeq_var::operator ::CORBA::StringSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_String_Manager
+ACE_INLINE
+TAO_SeqElem_String_Manager
 CORBA::StringSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::CORBA::StringSeq &
+ACE_INLINE
+const ::CORBA::StringSeq &
 CORBA::StringSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::StringSeq &
+ACE_INLINE
+::CORBA::StringSeq &
 CORBA::StringSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA::StringSeq *&
+ACE_INLINE
+::CORBA::StringSeq *&
 CORBA::StringSeq_var::out (void)
 {
   delete this->ptr_;
@@ -152,7 +170,8 @@ CORBA::StringSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::StringSeq *
+ACE_INLINE
+::CORBA::StringSeq *
 CORBA::StringSeq_var::_retn (void)
 {
   ::CORBA::StringSeq *tmp = this->ptr_;
@@ -160,25 +179,29 @@ CORBA::StringSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::CORBA::StringSeq *
+ACE_INLINE
+::CORBA::StringSeq *
 CORBA::StringSeq_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::StringSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA::StringSeq_out::StringSeq_out (CORBA::StringSeq *&p)
+CORBA::StringSeq_out::StringSeq_out (StringSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::StringSeq_out::StringSeq_out (CORBA::StringSeq_var &p) // constructor from _var
+CORBA::StringSeq_out::StringSeq_out (StringSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -186,93 +209,105 @@ CORBA::StringSeq_out::StringSeq_out (CORBA::StringSeq_var &p) // constructor fro
 }
 
 ACE_INLINE
-CORBA::StringSeq_out::StringSeq_out (const ::CORBA::StringSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::StringSeq_out&, p).ptr_)
+CORBA::StringSeq_out::StringSeq_out (const ::CORBA::StringSeq_out &p)
+  : ptr_ (ACE_const_cast (StringSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA::StringSeq_out &
+ACE_INLINE
+::CORBA::StringSeq_out &
 CORBA::StringSeq_out::operator= (const ::CORBA::StringSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA::StringSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (StringSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA::StringSeq_out &
-CORBA::StringSeq_out::operator= (CORBA::StringSeq *p)
+ACE_INLINE
+::CORBA::StringSeq_out &
+CORBA::StringSeq_out::operator= (StringSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::StringSeq_out::operator ::CORBA::StringSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::StringSeq *&
+ACE_INLINE
+::CORBA::StringSeq *&
 CORBA::StringSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::StringSeq *
+ACE_INLINE
+::CORBA::StringSeq *
 CORBA::StringSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_String_Manager
+ACE_INLINE
+TAO_SeqElem_String_Manager
 CORBA::StringSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_WSTRINGSEQ_CI_)
 #define _CORBA_WSTRINGSEQ_CI_
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
 // *************************************************************
 // Inline operations for class CORBA::WStringSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::WStringSeq_var::WStringSeq_var (void) // default constructor
+CORBA::WStringSeq_var::WStringSeq_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA::WStringSeq_var::WStringSeq_var (CORBA::WStringSeq *p)
+CORBA::WStringSeq_var::WStringSeq_var (WStringSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA::WStringSeq_var::WStringSeq_var (const ::CORBA::WStringSeq_var &p) // copy constructor
+CORBA::WStringSeq_var::WStringSeq_var (const ::CORBA::WStringSeq_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::WStringSeq (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::CORBA::WStringSeq (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
 ACE_INLINE
-CORBA::WStringSeq_var::~WStringSeq_var (void) // destructor
+CORBA::WStringSeq_var::~WStringSeq_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::WStringSeq_var &
-CORBA::WStringSeq_var::operator= (CORBA::WStringSeq *p)
+ACE_INLINE
+CORBA::WStringSeq_var &
+CORBA::WStringSeq_var::operator= (WStringSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::CORBA::WStringSeq_var &
+ACE_INLINE
+::CORBA::WStringSeq_var &
 CORBA::WStringSeq_var::operator= (const ::CORBA::WStringSeq_var &p)
 {
   if (this != &p)
@@ -284,12 +319,16 @@ CORBA::WStringSeq_var::operator= (const ::CORBA::WStringSeq_var &p)
         }
       else
         {
-          CORBA::WStringSeq *deep_copy =
-            new CORBA::WStringSeq (*p.ptr_);
+          WStringSeq *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              WStringSeq (*p.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
-              CORBA::WStringSeq *tmp = deep_copy;
+              WStringSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -300,63 +339,68 @@ CORBA::WStringSeq_var::operator= (const ::CORBA::WStringSeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::CORBA::WStringSeq *
+ACE_INLINE
+const ::CORBA::WStringSeq *
 CORBA::WStringSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::WStringSeq *
+ACE_INLINE
+::CORBA::WStringSeq *
 CORBA::WStringSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::WStringSeq_var::operator const ::CORBA::WStringSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
+// Variable-size types only.
 ACE_INLINE
 CORBA::WStringSeq_var::operator ::CORBA::WStringSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_WString_Manager
+ACE_INLINE
+TAO_SeqElem_WString_Manager
 CORBA::WStringSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::CORBA::WStringSeq &
+ACE_INLINE
+const ::CORBA::WStringSeq &
 CORBA::WStringSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::WStringSeq &
+ACE_INLINE
+::CORBA::WStringSeq &
 CORBA::WStringSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size 
-ACE_INLINE ::CORBA::WStringSeq *&
+ACE_INLINE
+::CORBA::WStringSeq *&
 CORBA::WStringSeq_var::out (void)
 {
   delete this->ptr_;
@@ -364,7 +408,8 @@ CORBA::WStringSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::WStringSeq *
+ACE_INLINE
+::CORBA::WStringSeq *
 CORBA::WStringSeq_var::_retn (void)
 {
   ::CORBA::WStringSeq *tmp = this->ptr_;
@@ -372,25 +417,29 @@ CORBA::WStringSeq_var::_retn (void)
   return tmp;
 }
 
-ACE_INLINE ::CORBA::WStringSeq *
+ACE_INLINE
+::CORBA::WStringSeq *
 CORBA::WStringSeq_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::WStringSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA::WStringSeq_out::WStringSeq_out (CORBA::WStringSeq *&p)
+CORBA::WStringSeq_out::WStringSeq_out (WStringSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::WStringSeq_out::WStringSeq_out (CORBA::WStringSeq_var &p) // constructor from _var
+CORBA::WStringSeq_out::WStringSeq_out (WStringSeq_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -398,51 +447,57 @@ CORBA::WStringSeq_out::WStringSeq_out (CORBA::WStringSeq_var &p) // constructor
 }
 
 ACE_INLINE
-CORBA::WStringSeq_out::WStringSeq_out (const ::CORBA::WStringSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::WStringSeq_out&, p).ptr_)
+CORBA::WStringSeq_out::WStringSeq_out (const ::CORBA::WStringSeq_out &p)
+  : ptr_ (ACE_const_cast (WStringSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA::WStringSeq_out &
+ACE_INLINE
+::CORBA::WStringSeq_out &
 CORBA::WStringSeq_out::operator= (const ::CORBA::WStringSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA::WStringSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (WStringSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA::WStringSeq_out &
-CORBA::WStringSeq_out::operator= (CORBA::WStringSeq *p)
+ACE_INLINE
+::CORBA::WStringSeq_out &
+CORBA::WStringSeq_out::operator= (WStringSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::WStringSeq_out::operator ::CORBA::WStringSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::WStringSeq *&
+ACE_INLINE
+::CORBA::WStringSeq *&
 CORBA::WStringSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::WStringSeq *
+ACE_INLINE
+::CORBA::WStringSeq *
 CORBA::WStringSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_WString_Manager
+ACE_INLINE
+TAO_SeqElem_WString_Manager
 CORBA::WStringSeq_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/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_StringSeq_I_
 #define _TAO_CDR_OP_CORBA_StringSeq_I_
@@ -451,6 +506,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA::StringSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA::StringSeq &
@@ -458,6 +514,8 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_CORBA_StringSeq_I_ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CORBA_WStringSeq_I_
 #define _TAO_CDR_OP_CORBA_WStringSeq_I_
@@ -466,6 +524,7 @@ CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA::WStringSeq &
   );
+
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA::WStringSeq &
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index a39fcb52df8..6dbf8eb54de 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -1,3 +1,5 @@
+// "$Id$"
+
 #include "Synch_Queued_Message.h"
 #include "debug.h"
 #include "ace/Malloc_T.h"
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 105f1cc2a24..8c53c22f9a4 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -180,6 +180,7 @@ SOURCE=.\Adapter.cpp
 # Begin Source File

 

 SOURCE=.\Any.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -220,6 +221,7 @@ SOURCE=.\Blocked_Connect_Strategy.cpp
 # Begin Source File

 

 SOURCE=.\BoundsC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -296,6 +298,7 @@ SOURCE=.\Connector_Registry.cpp
 # Begin Source File

 

 SOURCE=.\CONV_FRAMEC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -316,6 +319,7 @@ SOURCE=.\CORBANAME_Parser.cpp
 # Begin Source File

 

 SOURCE=.\CurrentC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -364,6 +368,7 @@ SOURCE=.\DLL_Parser.cpp
 # Begin Source File

 

 SOURCE=.\DomainC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -372,6 +377,7 @@ SOURCE=.\Dynamic_Adapter.cpp
 # Begin Source File

 

 SOURCE=.\DynamicC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -392,6 +398,7 @@ SOURCE=.\Environment.cpp
 # Begin Source File

 

 SOURCE=.\Exception.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -456,6 +463,7 @@ SOURCE=.\GIOP_Utils.cpp
 # Begin Source File

 

 SOURCE=.\GIOPC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -463,10 +471,6 @@ SOURCE=.\IFR_Client_Adapter.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\IFR_TypeCodes.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\IIOP_Acceptor.cpp

 # End Source File

 # Begin Source File

@@ -504,6 +508,7 @@ SOURCE=.\IIOP_Transport.cpp
 # Begin Source File

 

 SOURCE=.\IIOPC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -524,6 +529,7 @@ SOURCE=.\Invocation_Endpoint_Selectors.cpp
 # Begin Source File

 

 SOURCE=.\IOPC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -604,6 +610,7 @@ SOURCE=.\MCAST_Parser.cpp
 # Begin Source File

 

 SOURCE=.\Messaging_PolicyValueC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -632,6 +639,7 @@ SOURCE=.\Object.cpp
 # Begin Source File

 

 SOURCE=.\Object_KeyC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -651,15 +659,18 @@ SOURCE=.\Object_Ref_Table.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.cpp

+SOURCE=.\ObjectIdListC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

 SOURCE=.\ObjectReferenceTemplateC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

 SOURCE=.\OctetSeqC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -716,6 +727,7 @@ SOURCE=.\Pluggable_Messaging_Utils.cpp
 # Begin Source File

 

 SOURCE=.\Policy_ForwardC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -732,6 +744,7 @@ SOURCE=.\Policy_Validator.cpp
 # Begin Source File

 

 SOURCE=.\PolicyC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -740,10 +753,12 @@ SOURCE=.\PolicyFactory_Registry.cpp
 # Begin Source File

 

 SOURCE=.\PollableC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

 SOURCE=.\PortableInterceptorC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -819,11 +834,12 @@ SOURCE=.\Service_Context.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.cpp

+SOURCE=.\Services_Activate.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Services_Activate.cpp

+SOURCE=.\ServicesC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -832,6 +848,7 @@ SOURCE=.\skip.cpp
 # Begin Source File

 

 SOURCE=.\StringSeqC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -880,6 +897,7 @@ SOURCE=.\TAO_Singleton_Manager.cpp
 # Begin Source File

 

 SOURCE=.\TAOC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -896,6 +914,7 @@ SOURCE=.\Thread_Lane_Resources_Manager.cpp
 # Begin Source File

 

 SOURCE=.\TimeBaseC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -968,6 +987,7 @@ SOURCE=.\Wait_Strategy.cpp
 # Begin Source File

 

 SOURCE=.\WrongTransactionC.cpp

+# ADD CPP /GR

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -999,6 +1019,10 @@ SOURCE=.\any.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Any_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\arg_shifter.h

 # End Source File

 # Begin Source File

@@ -1495,7 +1519,7 @@ SOURCE=.\objectid.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.h

+SOURCE=.\ObjectIdListC.h

 # End Source File

 # Begin Source File

 

@@ -1659,6 +1683,10 @@ SOURCE=.\sequence.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Sequence_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Server_Strategy_Factory.h

 # End Source File

 # Begin Source File

@@ -1671,11 +1699,11 @@ SOURCE=.\Service_Context.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.h

+SOURCE=.\Services_Activate.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Services_Activate.h

+SOURCE=.\ServicesC.h

 # End Source File

 # Begin Source File

 

@@ -1859,6 +1887,10 @@ SOURCE=.\any.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Any_T.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Asynch_Invocation.i

 # End Source File

 # Begin Source File

@@ -2187,7 +2219,7 @@ SOURCE=.\Object_Loader.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.i

+SOURCE=.\ObjectIdListC.i

 # End Source File

 # Begin Source File

 

@@ -2291,6 +2323,10 @@ SOURCE=.\sequence.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Sequence_T.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Service_Callbacks.i

 # End Source File

 # Begin Source File

@@ -2299,7 +2335,7 @@ SOURCE=.\Service_Context.inl
 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.i

+SOURCE=.\ServicesC.i

 # End Source File

 # Begin Source File

 

@@ -2402,5 +2438,67 @@ SOURCE=.\ValueFactory_Map.i
 SOURCE=.\tao.rc

 # End Source File

 # End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\Any_T.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+# PROP Exclude_From_Build 1

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+# ADD CPP /GR

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Codeset_Translator_Factory_T.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Sequence_T.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

+# End Source File

+# End Group

 # End Target

 # End Project

diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl
index e163e7a26bd..e3022f7bfdb 100644
--- a/TAO/tao/TAO.pidl
+++ b/TAO/tao/TAO.pidl
@@ -15,7 +15,7 @@
  *   this is:
  *
  *   tao_idl
- *       -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *       -o orig -Gp -Gd -Ge 1
  *       -Wb,export_macro=TAO_Export
  *       -Wb,pre_include="ace/pre.h"
  *       -Wb,post_include="ace/post.h"
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index d0e3f7c56d7..c42021c7033 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -19,41 +19,49 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "TAOC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
+#include "TAOC.h"
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
+#include "tao/Any_T.h"
+
 #if !defined (__ACE_INLINE__)
 #include "TAOC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_BufferingConstraintMode[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x74616f2f),
-  ACE_NTOHL (0x54414f2f),
-  ACE_NTOHL (0x42756666),
-  ACE_NTOHL (0x6572696e),
-  ACE_NTOHL (0x67436f6e),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x696e744d),
-  ACE_NTOHL (0x6f64653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x74616f2f), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e744d), 
+  ACE_NTOHL (0x6f64653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
-  24,
-  ACE_NTOHL (0x42756666),
-  ACE_NTOHL (0x6572696e),
-  ACE_NTOHL (0x67436f6e),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x696e744d),
+    24,
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e744d), 
   ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
-  CORBA::tk_ushort,
+    CORBA::tk_ushort,
 
 };
 
@@ -67,106 +75,97 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintMode (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_BufferingConstraintMode, &_tc_TAO_tc_TAO_BufferingConstraintMode)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_BufferingConstraintMode,
+    &_tc_TAO_tc_TAO_BufferingConstraintMode
+  )
 TAO_NAMESPACE_END
 
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, BUFFER_FLUSH, 0U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, BUFFER_TIMEOUT, 1U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, BUFFER_MESSAGE_COUNT, 2U)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, BUFFER_MESSAGE_BYTES, 4U)
-TAO_NAMESPACE_END
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_BufferingConstraint[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x74616f2f),
-  ACE_NTOHL (0x54414f2f),
-  ACE_NTOHL (0x42756666),
-  ACE_NTOHL (0x6572696e),
-  ACE_NTOHL (0x67436f6e),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x696e743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x74616f2f), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraint:1.0
-  20,
-  ACE_NTOHL (0x42756666),
-  ACE_NTOHL (0x6572696e),
-  ACE_NTOHL (0x67436f6e),
-  ACE_NTOHL (0x73747261),
+    20,
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
   ACE_NTOHL (0x696e7400),  // name = BufferingConstraint
   4, // member count
-  5,
-  ACE_NTOHL (0x6d6f6465),
+    5,
+  ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x74616f2f),
-    ACE_NTOHL (0x54414f2f),
-    ACE_NTOHL (0x42756666),
-    ACE_NTOHL (0x6572696e),
-    ACE_NTOHL (0x67436f6e),
-    ACE_NTOHL (0x73747261),
-    ACE_NTOHL (0x696e744d),
-    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x74616f2f), 
+    ACE_NTOHL (0x54414f2f), 
+    ACE_NTOHL (0x42756666), 
+    ACE_NTOHL (0x6572696e), 
+    ACE_NTOHL (0x67436f6e), 
+    ACE_NTOHL (0x73747261), 
+    ACE_NTOHL (0x696e744d), 
+    ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
-    24,
-    ACE_NTOHL (0x42756666),
-    ACE_NTOHL (0x6572696e),
-    ACE_NTOHL (0x67436f6e),
-    ACE_NTOHL (0x73747261),
-    ACE_NTOHL (0x696e744d),
+        24,
+    ACE_NTOHL (0x42756666), 
+    ACE_NTOHL (0x6572696e), 
+    ACE_NTOHL (0x67436f6e), 
+    ACE_NTOHL (0x73747261), 
+    ACE_NTOHL (0x696e744d), 
     ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
-    CORBA::tk_ushort,
+        CORBA::tk_ushort,
 
 
   8,
-  ACE_NTOHL (0x74696d65),
+  ACE_NTOHL (0x74696d65), 
   ACE_NTOHL (0x6f757400),  // name = timeout
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
-    ACE_NTOHL (0x54696d65),
+        6,
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
+        CORBA::tk_ulonglong,
 
 
   14,
-  ACE_NTOHL (0x6d657373),
-  ACE_NTOHL (0x6167655f),
-  ACE_NTOHL (0x636f756e),
+  ACE_NTOHL (0x6d657373), 
+  ACE_NTOHL (0x6167655f), 
+  ACE_NTOHL (0x636f756e), 
   ACE_NTOHL (0x74000000),  // name = message_count
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
   14,
-  ACE_NTOHL (0x6d657373),
-  ACE_NTOHL (0x6167655f),
-  ACE_NTOHL (0x62797465),
+  ACE_NTOHL (0x6d657373), 
+  ACE_NTOHL (0x6167655f), 
+  ACE_NTOHL (0x62797465), 
   ACE_NTOHL (0x73000000),  // name = message_bytes
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
 };
 
@@ -180,22 +179,24 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraint (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_BufferingConstraint, &_tc_TAO_tc_TAO_BufferingConstraint)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_BufferingConstraint,
+    &_tc_TAO_tc_TAO_BufferingConstraint
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
 void TAO::BufferingConstraint::_tao_any_destructor (void *_tao_void_pointer)
 {
   BufferingConstraint *tmp = ACE_static_cast (BufferingConstraint*, _tao_void_pointer);
   delete tmp;
 }
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, BUFFERING_CONSTRAINT_POLICY_TYPE, 1413545985U)
-TAO_NAMESPACE_END
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int TAO::BufferingConstraintPolicy::_tao_class_id = 0;
 
@@ -242,13 +243,23 @@ tao_TAO_BufferingConstraintPolicy_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_TAO_BufferingConstraintPolicy_marshal (
+    TAO::BufferingConstraintPolicy_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+
 // *************************************************************
 // TAO::BufferingConstraintPolicy_var
-// TAO_IDL - Generated from
-// be/be_interface.cpp:654
 // *************************************************************
 
-TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (void) // default constructor
+TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (void)
   : ptr_ (BufferingConstraintPolicy::_nil ())
 {}
 
@@ -258,12 +269,12 @@ TAO::BufferingConstraintPolicy_var::ptr (void) const
   return this->ptr_;
 }
 
-TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (const ::TAO::BufferingConstraintPolicy_var &p) // copy constructor
+TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (const ::TAO::BufferingConstraintPolicy_var &p)
   : TAO_Base_var (),
     ptr_ (BufferingConstraintPolicy::_duplicate (p.ptr ()))
 {}
 
-TAO::BufferingConstraintPolicy_var::~BufferingConstraintPolicy_var (void) // destructor
+TAO::BufferingConstraintPolicy_var::~BufferingConstraintPolicy_var (void)
 {
   CORBA::release (this->ptr_);
 }
@@ -292,7 +303,7 @@ TAO::BufferingConstraintPolicy_var::operator const ::TAO::BufferingConstraintPol
   return this->ptr_;
 }
 
-TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast
+TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -367,10 +378,11 @@ TAO::BufferingConstraintPolicy_var::tao_upcast (void *src)
   return *tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+
 // *************************************************************
 // TAO::BufferingConstraintPolicy_out
-// TAO_IDL - Generated from
-// be/be_interface.cpp:932
 // *************************************************************
 
 TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_ptr &p)
@@ -379,14 +391,14 @@ TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingCons
   this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
 }
 
-TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_var &p) // constructor from _var
+TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_var &p)
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
 }
 
-TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (const ::TAO::BufferingConstraintPolicy_out &p) // copy constructor
+TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (const ::TAO::BufferingConstraintPolicy_out &p)
   : ptr_ (ACE_const_cast (BufferingConstraintPolicy_out &, p).ptr_)
 {}
 
@@ -417,7 +429,7 @@ TAO::BufferingConstraintPolicy_out::operator ::TAO::BufferingConstraintPolicy_pt
 }
 
 ::TAO::BufferingConstraintPolicy_ptr &
-TAO::BufferingConstraintPolicy_out::ptr (void) // ptr
+TAO::BufferingConstraintPolicy_out::ptr (void)
 {
   return this->ptr_;
 }
@@ -428,9 +440,8 @@ TAO::BufferingConstraintPolicy_out::operator-> (void)
   return this->ptr_;
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:198
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void)
 {}
@@ -438,13 +449,15 @@ TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void)
 TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void)
 {}
 
-void TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer)
+void 
+TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  BufferingConstraintPolicy *tmp = ACE_static_cast (BufferingConstraintPolicy*, _tao_void_pointer);
+  BufferingConstraintPolicy *tmp = ACE_static_cast (BufferingConstraintPolicy *, _tao_void_pointer);
   CORBA::release (tmp);
 }
 
-TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_narrow (
+TAO::BufferingConstraintPolicy_ptr
+TAO::BufferingConstraintPolicy::_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -452,62 +465,82 @@ TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_narrow (
   return BufferingConstraintPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-TAO::BufferingConstraintPolicy_ptr
+TAO::BufferingConstraintPolicy_ptr 
 TAO::BufferingConstraintPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
-    return BufferingConstraintPolicy::_nil ();
+    {
+      return BufferingConstraintPolicy::_nil ();
+    }
+  
   return
-      ACE_reinterpret_cast
-        (
+      ACE_reinterpret_cast (
           BufferingConstraintPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &BufferingConstraintPolicy::_tao_class_id
-                  )
-              )
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptr_arith_t,
+                  &BufferingConstraintPolicy::_tao_class_id
+                )
+            )
         );
 }
 
 TAO::BufferingConstraintPolicy_ptr
 TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj)
 {
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
   return obj;
 }
 
 void *TAO::BufferingConstraintPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::TAO, BufferingConstraintPolicy)::_tao_class_id))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_tao_class_id))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
+  
+  if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &ACE_NESTED_CLASS (::TAO, BufferingConstraintPolicy)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptr_arith_t,
+              &::CORBA::Policy::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                CORBA::Policy_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptr_arith_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
   return retv;
 }
 
@@ -516,30 +549,33 @@ const char* TAO::BufferingConstraintPolicy::_interface_repository_id (void) cons
   return "IDL:tao/TAO/BufferingConstraintPolicy:1.0";
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TAO_BufferingConstraintPolicy[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x74616f2f),
-  ACE_NTOHL (0x54414f2f),
-  ACE_NTOHL (0x42756666),
-  ACE_NTOHL (0x6572696e),
-  ACE_NTOHL (0x67436f6e),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x696e7450),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x793a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x74616f2f), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e7450), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x793a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:tao/TAO/BufferingConstraintPolicy:1.0
-  26,
-  ACE_NTOHL (0x42756666),
-  ACE_NTOHL (0x6572696e),
-  ACE_NTOHL (0x67436f6e),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x696e7450),
-  ACE_NTOHL (0x6f6c6963),
+    26,
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e7450), 
+  ACE_NTOHL (0x6f6c6963), 
   ACE_NTOHL (0x79000000),  // name = BufferingConstraintPolicy
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintPolicy (
     CORBA::tk_objref,
@@ -551,24 +587,15 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintPolicy (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_BufferingConstraintPolicy, &_tc_TAO_tc_TAO_BufferingConstraintPolicy)
-TAO_NAMESPACE_END
-
-#endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_EAGER_BUFFERING, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (TAO)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_DELAYED_BUFFERING, -2)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_BufferingConstraintPolicy,
+    &_tc_TAO_tc_TAO_BufferingConstraintPolicy
+  )
 TAO_NAMESPACE_END
 
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:58
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -576,16 +603,12 @@ void operator<<= (
     const TAO::BufferingConstraint &_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          TAO::_tc_BufferingConstraint,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
+  TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>::insert_copy (
+      _tao_any,
+      TAO::BufferingConstraint::_tao_any_destructor,
+      TAO::_tc_BufferingConstraint,
+      _tao_elem
+    );
 }
 
 // Non-copying insertion.
@@ -594,19 +617,12 @@ void operator<<= (
     TAO::BufferingConstraint *_tao_elem
   )
 {
-  TAO_OutputCDR stream;
-
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          TAO::_tc_BufferingConstraint,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          TAO::BufferingConstraint::_tao_any_destructor
-        );
-    }
+  TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>::insert (
+      _tao_any,
+      TAO::BufferingConstraint::_tao_any_destructor,
+      TAO::_tc_BufferingConstraint,
+      _tao_elem
+    );
 }
 
 // Extraction to non-const pointer (deprecated).
@@ -627,144 +643,100 @@ CORBA::Boolean operator>>= (
     const TAO::BufferingConstraint *&_tao_elem
   )
 {
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result =
-      type->equivalent (
-          TAO::_tc_BufferingConstraint
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const TAO::BufferingConstraint*,
-            _tao_any.value ()
-          );
-
-        return 1;
-      }
-    else
-      {
-        TAO::BufferingConstraint *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            TAO::BufferingConstraint,
-            0
-          );
-
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                TAO::_tc_BufferingConstraint,
-                1,
-                ACE_static_cast (void *, tmp),
-                TAO::BufferingConstraint::_tao_any_destructor
-              );
-
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>::extract (
+        _tao_any,
+        TAO::BufferingConstraint::_tao_any_destructor,
+        TAO::_tc_BufferingConstraint,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:60
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-void operator<<= (
+// Copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     TAO::BufferingConstraintPolicy_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      TAO::_tc_BufferingConstraintPolicy,
-      1,
-      TAO::BufferingConstraintPolicy::_duplicate (_tao_elem),
-      TAO::BufferingConstraintPolicy::_tao_any_destructor
-    );
-
-  _tao_any.contains_local (1);
+  TAO::BufferingConstraintPolicy_ptr _tao_objptr =
+    TAO::BufferingConstraintPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-void operator<<= (
+// Non-copying insertion.
+void
+operator<<= (
     CORBA::Any &_tao_any,
     TAO::BufferingConstraintPolicy_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::insert (
+      _tao_any,
+      TAO::BufferingConstraintPolicy::_tao_any_destructor,
       TAO::_tc_BufferingConstraintPolicy,
-      1,
-      *_tao_elem,
-      TAO::BufferingConstraintPolicy::_tao_any_destructor
+      *_tao_elem
     );
-
-  _tao_any.contains_local (1);
 }
 
-CORBA::Boolean operator>>= (
+CORBA::Boolean
+operator>>= (
     const CORBA::Any &_tao_any,
     TAO::BufferingConstraintPolicy_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = TAO::BufferingConstraintPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
+  return
+    TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::extract (
+        _tao_any,
+        TAO::BufferingConstraintPolicy::_tao_any_destructor,
+        TAO::_tc_BufferingConstraintPolicy,
+        _tao_elem
+      );
+}
 
-    CORBA::Boolean result =
-      type->equivalent (
-          TAO::_tc_BufferingConstraintPolicy
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
+CORBA::Boolean
+TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
 
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var>;
+  template class TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var>
+# pragma instantiate TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-    _tao_elem =
-      ACE_reinterpret_cast (
-          TAO::BufferingConstraintPolicy_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
 
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
+CORBA::Boolean
+TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
 
-  _tao_elem = TAO::BufferingConstraintPolicy::_nil ();
+CORBA::Boolean
+TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::demarshal_value (TAO_InputCDR &)
+{
   return 0;
 }
 
 #endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
+
+
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index 69342793564..e65c81b3a69 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_TAOC_H_
 #define _TAO_IDL_ORIG_TAOC_H_
 
@@ -56,41 +59,63 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  TAO
 {
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::UShort BufferingConstraintMode;
   typedef CORBA::UShort_out BufferingConstraintMode_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_BufferingConstraintMode;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_FLUSH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_TIMEOUT;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_MESSAGE_COUNT;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_MESSAGE_BYTES;
-
-  struct BufferingConstraint;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::UShort BUFFER_FLUSH = 0U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::UShort BUFFER_TIMEOUT = 1U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::UShort BUFFER_MESSAGE_COUNT = 2U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::UShort BUFFER_MESSAGE_BYTES = 4U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class BufferingConstraint_var;
-
+  
   struct TAO_Export BufferingConstraint
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef BufferingConstraint_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
-
-    ACE_NESTED_CLASS (TAO, BufferingConstraintMode) mode;
+    
+    static void _tao_any_destructor (void *);
+    TAO::BufferingConstraintMode mode;
     TimeBase::TimeT timeout;
     CORBA::ULong message_count;
     CORBA::ULong message_bytes;
-
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export BufferingConstraint_var
   {
   public:
@@ -100,69 +125,84 @@ TAO_NAMESPACE  TAO
     // Fixed-size types only.
     BufferingConstraint_var (const BufferingConstraint &);
     ~BufferingConstraint_var (void);
-
+    
     BufferingConstraint_var &operator= (BufferingConstraint *);
     BufferingConstraint_var &operator= (const BufferingConstraint_var &);
+    
     // Fixed-size types only.
     BufferingConstraint_var &operator= (const BufferingConstraint &);
+    
     BufferingConstraint *operator-> (void);
     const BufferingConstraint *operator-> (void) const;
-
+    
     operator const BufferingConstraint &() const;
     operator BufferingConstraint &();
     operator BufferingConstraint &() const;
-
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const BufferingConstraint &in (void) const;
     BufferingConstraint &inout (void);
     BufferingConstraint &out (void);
     BufferingConstraint _retn (void);
     BufferingConstraint *ptr (void) const;
-
+  
   private:
     BufferingConstraint *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
+  
   typedef BufferingConstraint &BufferingConstraint_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_BufferingConstraint;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong BUFFERING_CONSTRAINT_POLICY_TYPE;
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ULong BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___PTR_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY___PTR_CH_
-
+  
   class BufferingConstraintPolicy;
   typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr;
 
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___VAR_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY___VAR_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
   class TAO_Export BufferingConstraintPolicy_var : public TAO_Base_var
   {
   public:
     BufferingConstraintPolicy_var (void); // default constructor
-    BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr p) : ptr_ (p) {}
+    BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr p) : ptr_ (p) {} 
     BufferingConstraintPolicy_var (const BufferingConstraintPolicy_var &); // copy constructor
     ~BufferingConstraintPolicy_var (void); // destructor
-
+    
     BufferingConstraintPolicy_var &operator= (BufferingConstraintPolicy_ptr);
     BufferingConstraintPolicy_var &operator= (const BufferingConstraintPolicy_var &);
     BufferingConstraintPolicy_ptr operator-> (void) const;
-
+    
     operator const BufferingConstraintPolicy_ptr &() const;
     operator BufferingConstraintPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     BufferingConstraintPolicy_ptr in (void) const;
     BufferingConstraintPolicy_ptr &inout (void);
     BufferingConstraintPolicy_ptr &out (void);
     BufferingConstraintPolicy_ptr _retn (void);
     BufferingConstraintPolicy_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static BufferingConstraintPolicy_ptr tao_duplicate (BufferingConstraintPolicy_ptr);
@@ -173,7 +213,7 @@ TAO_NAMESPACE  TAO
         ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     BufferingConstraintPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -181,13 +221,14 @@ TAO_NAMESPACE  TAO
     BufferingConstraintPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-
 #endif /* end #if !defined */
 
-
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___OUT_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY___OUT_CH_
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_Export BufferingConstraintPolicy_out
   {
   public:
@@ -200,109 +241,138 @@ TAO_NAMESPACE  TAO
     operator BufferingConstraintPolicy_ptr &();
     BufferingConstraintPolicy_ptr &ptr (void);
     BufferingConstraintPolicy_ptr operator-> (void);
-
+  
   private:
     BufferingConstraintPolicy_ptr &ptr_;
   };
 
-
 #endif /* end #if !defined */
-
-  // *************************************************************
-  // TAO::BufferingConstraintPolicy
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:106
-  // *************************************************************
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_
-
+  
   class TAO_Export BufferingConstraintPolicy
     : public virtual CORBA::Policy
   {
   public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef BufferingConstraintPolicy_ptr _ptr_type;
     typedef BufferingConstraintPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
     static int _tao_class_id;
-
+    
     // The static operations.
     static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj);
-
+    
     static BufferingConstraintPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static BufferingConstraintPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static BufferingConstraintPolicy_ptr _nil (void)
       {
         return (BufferingConstraintPolicy_ptr)0;
       }
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::TAO::BufferingConstraint buffering_constraint (
-
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     BufferingConstraintPolicy (void);
-
     virtual ~BufferingConstraintPolicy (void);
-
+    
+    friend class _TAO_BufferingConstraintPolicy_Remote_Proxy_Impl;
+    friend class _TAO_BufferingConstraintPolicy_ThruPOA_Proxy_Impl;
+    friend class _TAO_BufferingConstraintPolicy_Direct_Proxy_Impl;
+  
   private:
     BufferingConstraintPolicy (const BufferingConstraintPolicy &);
     void operator= (const BufferingConstraintPolicy &);
   };
 
-
 #endif /* end #if !defined */
-
+  
+  // 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_BufferingConstraintPolicy;
-
+  
 #endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_EAGER_BUFFERING;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SYNC_EAGER_BUFFERING = 0;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Short SYNC_DELAYED_BUFFERING = -2;
 
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_DELAYED_BUFFERING;
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module TAO
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&);
-// Any operators for interface TAO::BufferingConstraintPolicy
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy_ptr &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "TAOC.i"
@@ -320,3 +390,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i
index 7e14a90ba54..a3c1ff1311c 100644
--- a/TAO/tao/TAOC.i
+++ b/TAO/tao/TAOC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class TAO::BufferingConstraint_var
 // *************************************************************
 
 ACE_INLINE
-TAO::BufferingConstraint_var::BufferingConstraint_var (void) // default constructor
+TAO::BufferingConstraint_var::BufferingConstraint_var (void)
   : ptr_ (0)
 {}
 
@@ -34,15 +38,19 @@ TAO::BufferingConstraint_var::BufferingConstraint_var (BufferingConstraint *p)
 {}
 
 ACE_INLINE
-TAO::BufferingConstraint_var::BufferingConstraint_var (const ::TAO::BufferingConstraint_var &p) // copy constructor
+TAO::BufferingConstraint_var::BufferingConstraint_var (const ::TAO::BufferingConstraint_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::TAO::BufferingConstraint (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::TAO::BufferingConstraint (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size types only
+// Fixed-size types only.
 ACE_INLINE
 TAO::BufferingConstraint_var::BufferingConstraint_var (const ::TAO::BufferingConstraint &p)
 {
@@ -50,33 +58,39 @@ TAO::BufferingConstraint_var::BufferingConstraint_var (const ::TAO::BufferingCon
 }
 
 ACE_INLINE
-TAO::BufferingConstraint_var::~BufferingConstraint_var (void) // destructor
+TAO::BufferingConstraint_var::~BufferingConstraint_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE TAO::BufferingConstraint_var &
-TAO::BufferingConstraint_var::operator= (BufferingConstraint *p)
+ACE_INLINE
+TAO::BufferingConstraint_var &
+TAO::BufferingConstraint_var::operator= (BufferingConstraint *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::TAO::BufferingConstraint_var &
-TAO::BufferingConstraint_var::operator= (const ::TAO::BufferingConstraint_var &p)
+ACE_INLINE
+::TAO::BufferingConstraint_var &
+TAO::BufferingConstraint_var::operator= (const ::TAO::BufferingConstraint_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
         {
-          BufferingConstraint *deep_copy =
-            new BufferingConstraint (*p.ptr_);
+          BufferingConstraint *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              BufferingConstraint (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -98,8 +112,13 @@ TAO::BufferingConstraint_var::operator= (const ::TAO::BufferingConstraint &p)
   if (this->ptr_ != &p)
   {
     delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::TAO::BufferingConstraint (p), *this);
+    ACE_NEW_RETURN (
+        this->ptr_,
+        ::TAO::BufferingConstraint (p),
+        *this
+      );
   }
+  
   return *this;
 }
 
@@ -164,38 +183,63 @@ TAO::BufferingConstraint_var::ptr (void) const
   return this->ptr_;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___CI_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+TAO::BufferingConstraintPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::BufferingConstraint &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TAO::BufferingConstraint &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.mode) &&
     (strm << _tao_aggregate.timeout) &&
     (strm << _tao_aggregate.message_count) &&
     (strm << _tao_aggregate.message_bytes)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::BufferingConstraint &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    TAO::BufferingConstraint &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.mode) &&
     (strm >> _tao_aggregate.timeout) &&
     (strm >> _tao_aggregate.message_count) &&
     (strm >> _tao_aggregate.message_bytes)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 3e7fd522490..60884f498eb 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -86,7 +86,7 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
                                       CORBA::ULong request_id,
                                       CORBA::Boolean response_expected,
                                       CORBA::Boolean deferred_reply,
-                                      TAO_ObjectKey &object_key,
+                                      TAO::ObjectKey &object_key,
                                       const char *operation,
                                       TAO_OutputCDR &output,
                                       TAO_Transport *transport,
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 902dd6a1dff..60536bee8da 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -79,7 +79,7 @@ public:
                      CORBA::ULong request_id,
                      CORBA::Boolean response_expected,
                      CORBA::Boolean deferred_flag,
-                     TAO_ObjectKey &object_key,
+                     TAO::ObjectKey &object_key,
                      const char *operation,
                      TAO_OutputCDR &output,
                      TAO_Transport *transport,
@@ -140,7 +140,7 @@ public:
 
   // CORBA::Principal_ptr principal (void) const;
 
-  TAO_ObjectKey &object_key (void);
+  TAO::ObjectKey &object_key (void);
 
   /**
    * @todo This two methods should go away.
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
index 7552a3e7a24..b9f2f4c2dc6 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -80,7 +80,7 @@ return this->requesting_principal_.ptr ();
 }
 */
 
-ACE_INLINE TAO_ObjectKey &
+ACE_INLINE TAO::ObjectKey &
 TAO_ServerRequest::object_key (void)
 {
   return this->profile_.object_key ();
diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h
index 23bd56f272c..2e7d8bfc7a4 100644
--- a/TAO/tao/Tagged_Profile.h
+++ b/TAO/tao/Tagged_Profile.h
@@ -44,13 +44,13 @@ public:
   CORBA::Boolean unmarshall_object_key (TAO_InputCDR &cdr);
 
   /// Return the object key
-  TAO_ObjectKey &object_key (void);
+  TAO::ObjectKey &object_key (void);
 
   /// Save the object key
-  void object_key (TAO_ObjectKey &object_key);
+  void object_key (TAO::ObjectKey &object_key);
 
   /// Return a const object key
-  const TAO_ObjectKey &object_key (void) const;
+  const TAO::ObjectKey &object_key (void) const;
 
   /// get the tagged_profile
   const IOP::TaggedProfile &tagged_profile (void) const;
@@ -92,7 +92,7 @@ private:
   CORBA::Boolean object_key_extracted_;
 
   /// The object key
-  TAO_ObjectKey object_key_;
+  TAO::ObjectKey object_key_;
 
   /// The Tagged profile. This class would have the Tagged Profile
   IOP::TaggedProfile profile_;
diff --git a/TAO/tao/Tagged_Profile.i b/TAO/tao/Tagged_Profile.i
index 2232b8a7d3d..c134318766e 100644
--- a/TAO/tao/Tagged_Profile.i
+++ b/TAO/tao/Tagged_Profile.i
@@ -14,7 +14,7 @@ TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core)
 }
 
 
-ACE_INLINE TAO_ObjectKey &
+ACE_INLINE TAO::ObjectKey &
 TAO_Tagged_Profile::object_key (void)
 {
   if (this->object_key_extracted_ == 0)
@@ -24,7 +24,7 @@ TAO_Tagged_Profile::object_key (void)
 }
 
 ACE_INLINE void
-TAO_Tagged_Profile::object_key (TAO_ObjectKey &object_key)
+TAO_Tagged_Profile::object_key (TAO::ObjectKey &object_key)
 {
   this->object_key_.replace (object_key.length (),
                              object_key.length (),
@@ -32,7 +32,7 @@ TAO_Tagged_Profile::object_key (TAO_ObjectKey &object_key)
   this->object_key_extracted_ = 1;
 }
 
-ACE_INLINE const TAO_ObjectKey &
+ACE_INLINE const TAO::ObjectKey &
 TAO_Tagged_Profile::object_key (void) const
 {
   return ACE_const_cast(TAO_Tagged_Profile *, this)->object_key ();
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index 3bc2511a3ff..eb596fbdca0 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -26,7 +26,6 @@
 #include "ace/Synch_T.h"
 #include "ace/CORBA_macros.h"
 
-
 class ACE_Allocator;
 
 class TAO_ORB_Core;
diff --git a/TAO/tao/TimeBase.pidl b/TAO/tao/TimeBase.pidl
index 8ac0c7dfb17..eba62cb9c6f 100644
--- a/TAO/tao/TimeBase.pidl
+++ b/TAO/tao/TimeBase.pidl
@@ -11,9 +11,9 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
+ *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        TimeBase.pidl
@@ -99,6 +99,4 @@ module TimeBase
   };
 };
 
-#pragma prefix ""
-
 #endif /* TIME_BASE_PIDL */
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index dac0b617bad..fff9ea8f003 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -29,29 +29,32 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
 #include "TimeBaseC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TimeBase_TimeT[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f54696d),
-  ACE_NTOHL (0x65543a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f54696d), 
+  ACE_NTOHL (0x65543a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-  6,
-  ACE_NTOHL (0x54696d65),
+    6,
+  ACE_NTOHL (0x54696d65), 
   ACE_NTOHL (0x54000000),  // name = TimeT
-  CORBA::tk_ulonglong,
+    CORBA::tk_ulonglong,
 
 };
 
@@ -65,43 +68,50 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_TimeT (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TimeT, &_tc_TAO_tc_TimeBase_TimeT)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TimeT,
+    &_tc_TAO_tc_TimeBase_TimeT
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TimeBase_InaccuracyT[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f496e61),
-  ACE_NTOHL (0x63637572),
-  ACE_NTOHL (0x61637954),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f496e61), 
+  ACE_NTOHL (0x63637572), 
+  ACE_NTOHL (0x61637954), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/TimeBase/InaccuracyT:1.0
-  12,
-  ACE_NTOHL (0x496e6163),
-  ACE_NTOHL (0x63757261),
+    12,
+  ACE_NTOHL (0x496e6163), 
+  ACE_NTOHL (0x63757261), 
   ACE_NTOHL (0x63795400),  // name = InaccuracyT
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
-    ACE_NTOHL (0x54696d65),
+        6,
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
+        CORBA::tk_ulonglong,
 
 
 };
@@ -116,25 +126,32 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_InaccuracyT (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InaccuracyT, &_tc_TAO_tc_TimeBase_InaccuracyT)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_InaccuracyT,
+    &_tc_TAO_tc_TimeBase_InaccuracyT
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TimeBase_TdfT[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f546466),
-  ACE_NTOHL (0x543a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f546466), 
+  ACE_NTOHL (0x543a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
-  5,
-  ACE_NTOHL (0x54646654),
+    5,
+  ACE_NTOHL (0x54646654), 
   ACE_NTOHL (0x0),  // name = TdfT
-  CORBA::tk_short,
+    CORBA::tk_short,
 
 };
 
@@ -148,74 +165,81 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_TdfT (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TdfT, &_tc_TAO_tc_TimeBase_TdfT)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_TdfT,
+    &_tc_TAO_tc_TimeBase_TdfT
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TimeBase_UtcT[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f557463),
-  ACE_NTOHL (0x543a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f557463), 
+  ACE_NTOHL (0x543a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/UtcT:1.0
-  5,
-  ACE_NTOHL (0x55746354),
+    5,
+  ACE_NTOHL (0x55746354), 
   ACE_NTOHL (0x0),  // name = UtcT
   4, // member count
-  5,
-  ACE_NTOHL (0x74696d65),
+    5,
+  ACE_NTOHL (0x74696d65), 
   ACE_NTOHL (0x0),  // name = time
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
-    ACE_NTOHL (0x54696d65),
+        6,
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
+        CORBA::tk_ulonglong,
 
 
   8,
-  ACE_NTOHL (0x696e6163),
+  ACE_NTOHL (0x696e6163), 
   ACE_NTOHL (0x636c6f00),  // name = inacclo
-  CORBA::tk_ulong,
+    CORBA::tk_ulong,
 
   8,
-  ACE_NTOHL (0x696e6163),
+  ACE_NTOHL (0x696e6163), 
   ACE_NTOHL (0x63686900),  // name = inacchi
-  CORBA::tk_ushort,
+    CORBA::tk_ushort,
 
   4,
   ACE_NTOHL (0x74646600),  // name = tdf
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f546466),
-    ACE_NTOHL (0x543a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f546466), 
+    ACE_NTOHL (0x543a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
-    5,
-    ACE_NTOHL (0x54646654),
+        5,
+    ACE_NTOHL (0x54646654), 
     ACE_NTOHL (0x0),  // name = TdfT
-    CORBA::tk_short,
+        CORBA::tk_short,
 
 
 };
@@ -230,77 +254,71 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_UtcT (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UtcT, &_tc_TAO_tc_TimeBase_UtcT)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_UtcT,
+    &_tc_TAO_tc_TimeBase_UtcT
+  )
 TAO_NAMESPACE_END
 
-void TimeBase::UtcT::_tao_any_destructor (void *x)
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void TimeBase::UtcT::_tao_any_destructor (void *_tao_void_pointer)
 {
-  UtcT *tmp = ACE_static_cast (UtcT*,x);
+  UtcT *tmp = ACE_static_cast (UtcT*, _tao_void_pointer);
   delete tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_TimeBase_IntervalT[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f496e74),
-  ACE_NTOHL (0x65727661),
-  ACE_NTOHL (0x6c543a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f496e74), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6c543a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/IntervalT:1.0
-  10,
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x7276616c),
+    10,
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x7276616c), 
   ACE_NTOHL (0x54000000),  // name = IntervalT
   2, // member count
-  12,
-  ACE_NTOHL (0x6c6f7765),
-  ACE_NTOHL (0x725f626f),
+    12,
+  ACE_NTOHL (0x6c6f7765), 
+  ACE_NTOHL (0x725f626f), 
   ACE_NTOHL (0x756e6400),  // name = lower_bound
-  CORBA::tk_alias, // typecode kind for typedefs
+    CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
-    ACE_NTOHL (0x54696d65),
+        6,
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
+        CORBA::tk_ulonglong,
 
 
   12,
-  ACE_NTOHL (0x75707065),
-  ACE_NTOHL (0x725f626f),
+  ACE_NTOHL (0x75707065), 
+  ACE_NTOHL (0x725f626f), 
   ACE_NTOHL (0x756e6400),  // name = upper_bound
-  CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
-
-
+    0xffffffff, // indirection
+  0xffffffac, // negative offset (-84)
 };
 
 static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT (
@@ -313,178 +331,149 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IntervalT, &_tc_TAO_tc_TimeBase_IntervalT)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_IntervalT,
+    &_tc_TAO_tc_TimeBase_IntervalT
+  )
 TAO_NAMESPACE_END
 
-void TimeBase::IntervalT::_tao_any_destructor (void *x)
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void TimeBase::IntervalT::_tao_any_destructor (void *_tao_void_pointer)
 {
-  IntervalT *tmp = ACE_static_cast (IntervalT*,x);
+  IntervalT *tmp = ACE_static_cast (IntervalT*, _tao_void_pointer);
   delete tmp;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const TimeBase::UtcT &_tao_elem) // copying
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TimeBase::UtcT &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TimeBase::UtcT>::insert_copy (
+      _tao_any,
+      TimeBase::UtcT::_tao_any_destructor,
       TimeBase::_tc_UtcT,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TimeBase::UtcT *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TimeBase::UtcT *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TimeBase::UtcT>::insert (
+      _tao_any,
+      TimeBase::UtcT::_tao_any_destructor,
       TimeBase::_tc_UtcT,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TimeBase::UtcT::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TimeBase::UtcT *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TimeBase::UtcT *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const TimeBase::UtcT*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const TimeBase::UtcT *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TimeBase::UtcT *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TimeBase::UtcT *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (TimeBase::_tc_UtcT ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const TimeBase::UtcT*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      TimeBase::UtcT *tmp;
-      ACE_NEW_RETURN (tmp, TimeBase::UtcT, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TimeBase::_tc_UtcT,
-            1,
-            ACE_static_cast (void *, tmp),
-            TimeBase::UtcT::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<TimeBase::UtcT>::extract (
+        _tao_any,
+        TimeBase::UtcT::_tao_any_destructor,
+        TimeBase::_tc_UtcT,
+        _tao_elem
+      );
 }
 
-void operator<<= (CORBA::Any &_tao_any, const TimeBase::IntervalT &_tao_elem) // copying
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<TimeBase::UtcT>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TimeBase::UtcT>
+#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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TimeBase::IntervalT &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::insert_copy (
+      _tao_any,
+      TimeBase::IntervalT::_tao_any_destructor,
       TimeBase::_tc_IntervalT,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, TimeBase::IntervalT *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TimeBase::IntervalT *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::insert (
+      _tao_any,
+      TimeBase::IntervalT::_tao_any_destructor,
       TimeBase::_tc_IntervalT,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      TimeBase::IntervalT::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TimeBase::IntervalT *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TimeBase::IntervalT *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(const TimeBase::IntervalT*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast (
+      const TimeBase::IntervalT *&,
+      _tao_elem
+    );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TimeBase::IntervalT *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TimeBase::IntervalT *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (TimeBase::_tc_IntervalT ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const TimeBase::IntervalT*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      TimeBase::IntervalT *tmp;
-      ACE_NEW_RETURN (tmp, TimeBase::IntervalT, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            TimeBase::_tc_IntervalT,
-            1,
-            ACE_static_cast (void *, tmp),
-            TimeBase::IntervalT::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::extract (
+        _tao_any,
+        TimeBase::IntervalT::_tao_any_destructor,
+        TimeBase::_tc_IntervalT,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<TimeBase::IntervalT>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TimeBase::IntervalT>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index 8f93011521c..04632051f26 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -19,13 +19,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_TIMEBASEC_H_
 #define _TAO_IDL_ORIG_TIMEBASEC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
+#include "tao/Any_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -57,50 +59,80 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  TimeBase
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::ULongLong TimeT;
   typedef CORBA::ULongLong_out TimeT_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TimeT;
-
+  
+  // 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_TimeT;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef TimeT InaccuracyT;
   typedef TimeT_out InaccuracyT_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InaccuracyT;
-
+  
+  // 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_InaccuracyT;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
   typedef CORBA::Short TdfT;
   typedef CORBA::Short_out TdfT_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TdfT;
-
-  struct UtcT;
+  
+  // 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_TdfT;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class UtcT_var;
   
   struct TAO_Export UtcT
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef UtcT_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
-
-    ACE_NESTED_CLASS (TimeBase, TimeT) time;
+    
+    static void _tao_any_destructor (void *);
+    TimeBase::TimeT time;
     CORBA::ULong inacclo;
     CORBA::UShort inacchi;
-    ACE_NESTED_CLASS (TimeBase, TdfT) tdf;
+    TimeBase::TdfT tdf;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export UtcT_var
   {
   public:
-    UtcT_var (void); // default constructor
+    UtcT_var (void);
     UtcT_var (UtcT *);
-    UtcT_var (const UtcT_var &); // copy constructor
-    UtcT_var (const UtcT &); // fixed-size types only
-    ~UtcT_var (void); // destructor
+    UtcT_var (const UtcT_var &);
+    // Fixed-size types only.
+    UtcT_var (const UtcT &);
+    ~UtcT_var (void);
     
     UtcT_var &operator= (UtcT *);
     UtcT_var &operator= (const UtcT_var &);
-    UtcT_var &operator= (const UtcT &); // fixed-size types only
+    
+    // Fixed-size types only.
+    UtcT_var &operator= (const UtcT &);
+    
     UtcT *operator-> (void);
     const UtcT *operator-> (void) const;
     
@@ -114,43 +146,54 @@ TAO_NAMESPACE  TimeBase
     UtcT &out (void);
     UtcT _retn (void);
     UtcT *ptr (void) const;
-
+  
   private:
     UtcT *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
+  
   typedef UtcT &UtcT_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UtcT;
-
-  struct IntervalT;
+  
+  // 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_UtcT;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
   class IntervalT_var;
   
   struct TAO_Export IntervalT
   {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef IntervalT_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
-
-    ACE_NESTED_CLASS (TimeBase, TimeT) lower_bound;
-    ACE_NESTED_CLASS (TimeBase, TimeT) upper_bound;
+    
+    static void _tao_any_destructor (void *);
+    TimeBase::TimeT lower_bound;
+    TimeBase::TimeT upper_bound;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
   class TAO_Export IntervalT_var
   {
   public:
-    IntervalT_var (void); // default constructor
+    IntervalT_var (void);
     IntervalT_var (IntervalT *);
-    IntervalT_var (const IntervalT_var &); // copy constructor
-    IntervalT_var (const IntervalT &); // fixed-size types only
-    ~IntervalT_var (void); // destructor
+    IntervalT_var (const IntervalT_var &);
+    // Fixed-size types only.
+    IntervalT_var (const IntervalT &);
+    ~IntervalT_var (void);
     
     IntervalT_var &operator= (IntervalT *);
     IntervalT_var &operator= (const IntervalT_var &);
-    IntervalT_var &operator= (const IntervalT &); // fixed-size types only
+    
+    // Fixed-size types only.
+    IntervalT_var &operator= (const IntervalT &);
+    
     IntervalT *operator-> (void);
     const IntervalT *operator-> (void) const;
     
@@ -164,39 +207,67 @@ TAO_NAMESPACE  TimeBase
     IntervalT &out (void);
     IntervalT _retn (void);
     IntervalT *ptr (void) const;
-
+  
   private:
     IntervalT *ptr_;
   };
-
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
+  
   typedef IntervalT &IntervalT_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_IntervalT;
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IntervalT;
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module TimeBase
 
-// Proxy Broker Factory function pointer declarations.
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const TimeBase::UtcT &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, TimeBase::UtcT*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::UtcT *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::UtcT *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const TimeBase::IntervalT &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, TimeBase::IntervalT*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::IntervalT *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::IntervalT *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::UtcT &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::UtcT &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::IntervalT &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "TimeBaseC.i"
@@ -212,3 +283,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/TimeBaseC.i b/TAO/tao/TimeBaseC.i
index 73ba4f4d77e..3db4462317f 100644
--- a/TAO/tao/TimeBaseC.i
+++ b/TAO/tao/TimeBaseC.i
@@ -19,12 +19,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
 // *************************************************************
 // Inline operations for class TimeBase::UtcT_var
 // *************************************************************
 
 ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (void) // default constructor
+TimeBase::UtcT_var::UtcT_var (void)
   : ptr_ (0)
 {}
 
@@ -34,15 +38,19 @@ TimeBase::UtcT_var::UtcT_var (UtcT *p)
 {}
 
 ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (const ::TimeBase::UtcT_var &p) // copy constructor
+TimeBase::UtcT_var::UtcT_var (const ::TimeBase::UtcT_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::TimeBase::UtcT (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::TimeBase::UtcT (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size types only
+// Fixed-size types only.
 ACE_INLINE
 TimeBase::UtcT_var::UtcT_var (const ::TimeBase::UtcT &p)
 {
@@ -50,33 +58,39 @@ TimeBase::UtcT_var::UtcT_var (const ::TimeBase::UtcT &p)
 }
 
 ACE_INLINE
-TimeBase::UtcT_var::~UtcT_var (void) // destructor
+TimeBase::UtcT_var::~UtcT_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE TimeBase::UtcT_var &
-TimeBase::UtcT_var::operator= (UtcT *p)
+ACE_INLINE
+TimeBase::UtcT_var &
+TimeBase::UtcT_var::operator= (UtcT *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::TimeBase::UtcT_var &
-TimeBase::UtcT_var::operator= (const ::TimeBase::UtcT_var &p)
+ACE_INLINE
+::TimeBase::UtcT_var &
+TimeBase::UtcT_var::operator= (const ::TimeBase::UtcT_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
         {
-          UtcT *deep_copy =
-            new UtcT (*p.ptr_);
+          UtcT *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              UtcT (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -98,8 +112,13 @@ TimeBase::UtcT_var::operator= (const ::TimeBase::UtcT &p)
   if (this->ptr_ != &p)
   {
     delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::TimeBase::UtcT (p), *this);
+    ACE_NEW_RETURN (
+        this->ptr_,
+        ::TimeBase::UtcT (p),
+        *this
+      );
   }
+  
   return *this;
 }
 
@@ -164,12 +183,15 @@ TimeBase::UtcT_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 TimeBase::IntervalT_var
 // *************************************************************
 
 ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (void) // default constructor
+TimeBase::IntervalT_var::IntervalT_var (void)
   : ptr_ (0)
 {}
 
@@ -179,15 +201,19 @@ TimeBase::IntervalT_var::IntervalT_var (IntervalT *p)
 {}
 
 ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (const ::TimeBase::IntervalT_var &p) // copy constructor
+TimeBase::IntervalT_var::IntervalT_var (const ::TimeBase::IntervalT_var &p)
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::TimeBase::IntervalT (*p.ptr_));
+    {
+      ACE_NEW (this->ptr_, ::TimeBase::IntervalT (*p.ptr_));
+    }
   else
-    this->ptr_ = 0;
+    {
+      this->ptr_ = 0;
+    }
 }
 
-// fixed-size types only
+// Fixed-size types only.
 ACE_INLINE
 TimeBase::IntervalT_var::IntervalT_var (const ::TimeBase::IntervalT &p)
 {
@@ -195,33 +221,39 @@ TimeBase::IntervalT_var::IntervalT_var (const ::TimeBase::IntervalT &p)
 }
 
 ACE_INLINE
-TimeBase::IntervalT_var::~IntervalT_var (void) // destructor
+TimeBase::IntervalT_var::~IntervalT_var (void)
 {
   delete this->ptr_;
 }
 
-ACE_INLINE TimeBase::IntervalT_var &
-TimeBase::IntervalT_var::operator= (IntervalT *p)
+ACE_INLINE
+TimeBase::IntervalT_var &
+TimeBase::IntervalT_var::operator= (IntervalT *_tao_struct_var)
 {
   delete this->ptr_;
-  this->ptr_ = p;
+  this->ptr_ = _tao_struct_var;
   return *this;
 }
 
-ACE_INLINE ::TimeBase::IntervalT_var &
-TimeBase::IntervalT_var::operator= (const ::TimeBase::IntervalT_var &p)
+ACE_INLINE
+::TimeBase::IntervalT_var &
+TimeBase::IntervalT_var::operator= (const ::TimeBase::IntervalT_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
         {
-          IntervalT *deep_copy =
-            new IntervalT (*p.ptr_);
+          IntervalT *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              IntervalT (*_tao_struct_var.ptr_),
+              *this
+            );
           
           if (deep_copy != 0)
             {
@@ -243,8 +275,13 @@ TimeBase::IntervalT_var::operator= (const ::TimeBase::IntervalT &p)
   if (this->ptr_ != &p)
   {
     delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::TimeBase::IntervalT (p), *this);
+    ACE_NEW_RETURN (
+        this->ptr_,
+        ::TimeBase::IntervalT (p),
+        *this
+      );
   }
+  
   return *this;
 }
 
@@ -309,55 +346,89 @@ TimeBase::IntervalT_var::ptr (void) const
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TimeBase::UtcT &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TimeBase::UtcT &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.time) &&
     (strm << _tao_aggregate.inacclo) &&
     (strm << _tao_aggregate.inacchi) &&
     (strm << _tao_aggregate.tdf)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TimeBase::UtcT &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    TimeBase::UtcT &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.time) &&
     (strm >> _tao_aggregate.inacclo) &&
     (strm >> _tao_aggregate.inacchi) &&
     (strm >> _tao_aggregate.tdf)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TimeBase::IntervalT &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TimeBase::IntervalT &_tao_aggregate
+  )
 {
   if (
     (strm << _tao_aggregate.lower_bound) &&
     (strm << _tao_aggregate.upper_bound)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TimeBase::IntervalT &_tao_aggregate)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    TimeBase::IntervalT &_tao_aggregate
+  )
 {
   if (
     (strm >> _tao_aggregate.lower_bound) &&
     (strm >> _tao_aggregate.upper_bound)
-  )
-    return 1;
+   )
+    {
+      return 1;
+    }
   else
-    return 0;
-  
+    {
+      return 0;
+    }
 }
 
diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h
index 8069ee22e2f..f290209573f 100644
--- a/TAO/tao/Transport_Acceptor.h
+++ b/TAO/tao/Transport_Acceptor.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
+#include "tao/Object_KeyC.h"
 
 // Forward declarations.
 class ACE_Addr;
@@ -83,7 +83,7 @@ public:
    * in the mprofile that is of the same type.  Currently, this
    * is used when RT CORBA is enabled.
    */
-  virtual int create_profile (const TAO_ObjectKey &object_key,
+  virtual int create_profile (const TAO::ObjectKey &object_key,
                               TAO_MProfile &mprofile,
                               CORBA::Short priority) = 0;
 
@@ -105,7 +105,7 @@ public:
    * encapsulation.
    */
   virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO_ObjectKey &key) = 0;
+                          TAO::ObjectKey &key) = 0;
 
 private:
 
diff --git a/TAO/tao/TypeCodeFactory/Makefile b/TAO/tao/TypeCodeFactory/Makefile
index 57a273704cf..4f1347c896e 100644
--- a/TAO/tao/TypeCodeFactory/Makefile
+++ b/TAO/tao/TypeCodeFactory/Makefile
@@ -70,13 +70,12 @@ realclean: clean
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/TypeCodeFactoryC.o .obj/TypeCodeFactoryC.so .shobj/TypeCodeFactoryC.o .shobj/TypeCodeFactoryC.so: TypeCodeFactoryC.cpp TypeCodeFactory_Loader.h \
-  $(ACE_ROOT)/ace/pre.h typecodefactory_export.h \
+.obj/TypeCodeFactoryC.o .obj/TypeCodeFactoryC.so .shobj/TypeCodeFactoryC.o .shobj/TypeCodeFactoryC.so: TypeCodeFactoryC.cpp TypeCodeFactoryC.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/Object_Loader.h \
-  $(TAO_ROOT)/tao/Exception.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -105,10 +104,9 @@ realclean: clean
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -121,18 +119,17 @@ realclean: clean
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -142,6 +139,25 @@ realclean: clean
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -160,27 +176,11 @@ realclean: clean
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/Object_Loader.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -194,17 +194,27 @@ realclean: clean
   $(ACE_ROOT)/ace/Timer_Queue_T.i \
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h TypeCodeFactoryC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
   $(TAO_ROOT)/tao/Sequence.i \
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
@@ -212,16 +222,195 @@ realclean: clean
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i TypeCodeFactoryC.inl \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Any.i
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  typecodefactory_export.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \
+  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
+  TypeCodeFactoryC.inl $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/PICurrent.h \
+  $(TAO_ROOT)/tao/PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
+  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Condition.h \
+  $(TAO_ROOT)/tao/Condition.inl \
+  $(TAO_ROOT)/tao/Condition.cpp \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Invocation_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
+  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo_i.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo_i.inl \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/TypeCodeFactory_i.o .obj/TypeCodeFactory_i.so .shobj/TypeCodeFactory_i.o .shobj/TypeCodeFactory_i.so: TypeCodeFactory_i.cpp TypeCodeFactory_i.h \
   $(ACE_ROOT)/ace/pre.h TypeCodeFactory_Loader.h \
@@ -285,7 +474,8 @@ realclean: clean
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -314,7 +504,8 @@ realclean: clean
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -348,16 +539,31 @@ realclean: clean
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h TypeCodeFactoryC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
   $(TAO_ROOT)/tao/Sequence.i \
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
@@ -365,43 +571,82 @@ realclean: clean
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i TypeCodeFactoryC.inl \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
-  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \
+  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
   $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
   $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
+  TypeCodeFactoryC.inl $(ACE_ROOT)/ace/Containers_T.h \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp
+  $(ACE_ROOT)/ace/Containers_T.cpp
 
 .obj/TypeCodeFactory_Adapter_Impl.o .obj/TypeCodeFactory_Adapter_Impl.so .shobj/TypeCodeFactory_Adapter_Impl.o .shobj/TypeCodeFactory_Adapter_Impl.so: TypeCodeFactory_Adapter_Impl.cpp \
   TypeCodeFactory_Adapter_Impl.h $(ACE_ROOT)/ace/pre.h \
@@ -465,7 +710,8 @@ realclean: clean
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -494,7 +740,8 @@ realclean: clean
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -530,16 +777,31 @@ realclean: clean
   TypeCodeFactory_Loader.h \
   $(TAO_ROOT)/tao/Object_Loader.h \
   $(TAO_ROOT)/tao/Object_Loader.i TypeCodeFactoryC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
   $(TAO_ROOT)/tao/Sequence.i \
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
@@ -547,20 +809,35 @@ realclean: clean
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i TypeCodeFactoryC.inl \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -570,12 +847,44 @@ realclean: clean
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \
+  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
+  TypeCodeFactoryC.inl $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/params.h \
   $(TAO_ROOT)/tao/params.i \
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
@@ -591,26 +900,6 @@ realclean: clean
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -626,14 +915,6 @@ realclean: clean
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -720,7 +1001,8 @@ realclean: clean
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -749,7 +1031,8 @@ realclean: clean
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -783,16 +1066,31 @@ realclean: clean
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h TypeCodeFactoryC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
   $(TAO_ROOT)/tao/Sequence.i \
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
@@ -800,13 +1098,74 @@ realclean: clean
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i TypeCodeFactoryC.inl \
-  TypeCodeFactory_i.h $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/ObjectIDListC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \
+  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
+  TypeCodeFactoryC.inl TypeCodeFactory_i.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.dsp b/TAO/tao/TypeCodeFactory/TypeCodeFactory.dsp
index 12f204f286b..0766ad74f8f 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.dsp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TYPECODEFACTORY_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GR- /GX /Zi /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TYPECODEFACTORY_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -100,7 +100,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -128,7 +128,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GR- /GX /Zi /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -167,6 +167,7 @@ SOURCE=.\TypeCodeFactory_Loader.cpp
 # Begin Source File

 

 SOURCE=.\TypeCodeFactoryC.cpp

+# ADD CPP /GR

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
index dc81b54d6d6..4d2705ab82e 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
@@ -63,11 +63,13 @@
 
 module CORBA
 {
+// These are pulled in from #includes.
+/*
   typedef string Identifier;
   typedef string RepositoryId;
   typedef short ValueModifier;
-
-  local interface TypeCodeFactory  // PIDL
+*/
+  local interface TypeCodeFactory
   {
     TypeCode create_struct_tc (
         in RepositoryId id,
@@ -160,6 +162,7 @@ module CORBA
         in RepositoryId id,
         in Identifier name
       );
+
     TypeCode create_component_tc (
         in RepositoryId id,
         in Identifier name
@@ -169,8 +172,15 @@ module CORBA
         in RepositoryId id,
         in Identifier name
       );
+
+    TypeCode create_event_tc (
+        in RepositoryId id,
+        in Identifier name,
+        in ValueModifier type_modifier,
+        in TypeCode concrete_base,
+        in ValueMemberSeq members
+      );
   };
 };
 
-#pragma prefix ""
 #endif // _TYPECODEFACTORY_IDL_
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
index da39663cb85..560b60ce403 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
@@ -20,12 +20,21 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:314
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
+#include "TypeCodeFactoryC.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 "TypeCodeFactory_Loader.h"
-#include "tao/Sequence_T.h"
-#include "tao/Typecode.h"
-#include "tao/Any.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -35,9 +44,8 @@
 #include "TypeCodeFactoryC.inl"
 #endif /* !defined INLINE */
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::TypeCodeFactory::_tao_class_id = 0;
 
@@ -84,8 +92,17 @@ tao_CORBA_TypeCodeFactory_upcast (
   return *tmp;
 }
 
+CORBA::Boolean
+tao_CORBA_TypeCodeFactory_marshal (
+    CORBA::TypeCodeFactory_ptr p,
+    TAO_OutputCDR &strm
+  )
+{
+  return p->marshal (strm);
+}
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:721
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
 
 // *************************************************************
 // CORBA::TypeCodeFactory_var
@@ -135,7 +152,7 @@ CORBA::TypeCodeFactory_var::operator const ::CORBA::TypeCodeFactory_ptr &() cons
   return this->ptr_;
 }
 
-CORBA::TypeCodeFactory_var::operator ::CORBA::TypeCodeFactory_ptr &() // cast
+CORBA::TypeCodeFactory_var::operator ::CORBA::TypeCodeFactory_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -211,7 +228,7 @@ CORBA::TypeCodeFactory_var::tao_upcast (void *src)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1030
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
 
 // *************************************************************
 // CORBA::TypeCodeFactory_out
@@ -272,8 +289,8 @@ CORBA::TypeCodeFactory_out::operator-> (void)
   return this->ptr_;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:225
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
 
 CORBA::TypeCodeFactory::TypeCodeFactory (void)
 {}
@@ -281,7 +298,7 @@ CORBA::TypeCodeFactory::TypeCodeFactory (void)
 CORBA::TypeCodeFactory::~TypeCodeFactory (void)
 {}
 
-void
+void 
 CORBA::TypeCodeFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   TypeCodeFactory *tmp = ACE_static_cast (TypeCodeFactory *, _tao_void_pointer);
@@ -297,7 +314,7 @@ CORBA::TypeCodeFactory::_narrow (
   return TypeCodeFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::TypeCodeFactory_ptr
+CORBA::TypeCodeFactory_ptr 
 CORBA::TypeCodeFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -307,7 +324,7 @@ CORBA::TypeCodeFactory::_unchecked_narrow (
     {
       return TypeCodeFactory::_nil ();
     }
-
+  
   return
       ACE_reinterpret_cast (
           TypeCodeFactory_ptr,
@@ -327,14 +344,14 @@ CORBA::TypeCodeFactory::_duplicate (TypeCodeFactory_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
 void *CORBA::TypeCodeFactory::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, TypeCodeFactory)::_tao_class_id)
@@ -353,12 +370,12 @@ void *CORBA::TypeCodeFactory::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -368,28 +385,28 @@ const char* CORBA::TypeCodeFactory::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_TypeCodeFactory[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5479),
-  ACE_NTOHL (0x7065436f),
-  ACE_NTOHL (0x64654661),
-  ACE_NTOHL (0x63746f72),
-  ACE_NTOHL (0x793a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5479), 
+  ACE_NTOHL (0x7065436f), 
+  ACE_NTOHL (0x64654661), 
+  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x793a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/TypeCodeFactory:1.0
-  16,
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x46616374),
+    16,
+  ACE_NTOHL (0x54797065), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x46616374), 
   ACE_NTOHL (0x6f727900),  // name = TypeCodeFactory
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_TypeCodeFactory (
     CORBA::tk_objref,
@@ -409,40 +426,33 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Copying version.
+// Copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::TypeCodeFactory_ptr _tao_elem
   )
 {
-  _tao_any._tao_replace (
-      CORBA::_tc_TypeCodeFactory,
-      1,
-      CORBA::TypeCodeFactory::_duplicate (_tao_elem),
-      CORBA::TypeCodeFactory::_tao_any_destructor
-    );
-
-  _tao_any.contains_local (1);
+  CORBA::TypeCodeFactory_ptr _tao_objptr =
+    CORBA::TypeCodeFactory::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
 }
 
-// Non-copying version.
+// Non-copying insertion.
 void
 operator<<= (
     CORBA::Any &_tao_any,
     CORBA::TypeCodeFactory_ptr *_tao_elem
   )
 {
-  _tao_any._tao_replace (
+  TAO::Any_Impl_T<CORBA::TypeCodeFactory>::insert (
+      _tao_any,
+      CORBA::TypeCodeFactory::_tao_any_destructor,
       CORBA::_tc_TypeCodeFactory,
-      1,
-      *_tao_elem,
-      CORBA::TypeCodeFactory::_tao_any_destructor
+      *_tao_elem
     );
-
-  _tao_any.contains_local (1);
 }
 
 CORBA::Boolean
@@ -451,38 +461,22 @@ operator>>= (
     CORBA::TypeCodeFactory_ptr &_tao_elem
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::TypeCodeFactory::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean _tao_result =
-      type->equivalent (
-          CORBA::_tc_TypeCodeFactory
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-
-    if (!_tao_result)
-      {
-        return 0; // not equivalent
-      }
-
-    _tao_elem =
-      ACE_reinterpret_cast (
-          CORBA::TypeCodeFactory_ptr,
-          ACE_const_cast (void *, _tao_any.value ())
-        );
-
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
+  return
+    TAO::Any_Impl_T<CORBA::TypeCodeFactory>::extract (
+        _tao_any,
+        CORBA::TypeCodeFactory::_tao_any_destructor,
+        CORBA::_tc_TypeCodeFactory,
+        _tao_elem
+      );
+}
 
-  _tao_elem = CORBA::TypeCodeFactory::_nil ();
-  return 0;
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::TypeCodeFactory>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
@@ -491,3 +485,20 @@ operator>>= (
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 # pragma instantiate TAO_Object_Manager<CORBA::TypeCodeFactory,CORBA::TypeCodeFactory_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::TypeCodeFactory>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::TypeCodeFactory>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
index 485aa8bff53..42e91c491ce 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
@@ -20,24 +20,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_TYPECODEFACTORYC_H_
 #define _TAO_IDL_ORIG_TYPECODEFACTORYC_H_
 
 #include "ace/pre.h"
 
-#ifndef TAO_TYPECODEFACTORY_SAFE_INCLUDE
-#error "You should not include TypeCodeFactoryC.h directly, use TCF_Loader.h"
-#endif /* !TAO_TYPECODEFACTORY_SAFE_INCLUDE */
-
-#include "typecodefactory_export.h"
+#include "tao/corba.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Object.h"
+
+#include "typecodefactory_export.h"
+
+#include "tao/IFR_Client/IFR_ExtendedC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -63,14 +62,17 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// 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_visitor_interface/interface_ch.cpp:52
 
 #if !defined (_CORBA_TYPECODEFACTORY___PTR_CH_)
 #define _CORBA_TYPECODEFACTORY___PTR_CH_
-
+  
   class TypeCodeFactory;
   typedef TypeCodeFactory *TypeCodeFactory_ptr;
 
@@ -78,31 +80,31 @@ TAO_NAMESPACE  CORBA
 
 #if !defined (_CORBA_TYPECODEFACTORY___VAR_CH_)
 #define _CORBA_TYPECODEFACTORY___VAR_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:565
-
-  class TAO_TypeCodeFactory_Export TypeCodeFactory_var : private TAO_Base_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  
+  class TAO_TypeCodeFactory_Export TypeCodeFactory_var : public TAO_Base_var
   {
   public:
     TypeCodeFactory_var (void); // default constructor
-    TypeCodeFactory_var (TypeCodeFactory_ptr p) : ptr_ (p) {}
+    TypeCodeFactory_var (TypeCodeFactory_ptr p) : ptr_ (p) {} 
     TypeCodeFactory_var (const TypeCodeFactory_var &); // copy constructor
     ~TypeCodeFactory_var (void); // destructor
-
+    
     TypeCodeFactory_var &operator= (TypeCodeFactory_ptr);
     TypeCodeFactory_var &operator= (const TypeCodeFactory_var &);
     TypeCodeFactory_ptr operator-> (void) const;
-
+    
     operator const TypeCodeFactory_ptr &() const;
     operator TypeCodeFactory_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     TypeCodeFactory_ptr in (void) const;
     TypeCodeFactory_ptr &inout (void);
     TypeCodeFactory_ptr &out (void);
     TypeCodeFactory_ptr _retn (void);
     TypeCodeFactory_ptr ptr (void) const;
-
+    
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static TypeCodeFactory_ptr tao_duplicate (TypeCodeFactory_ptr);
@@ -110,25 +112,25 @@ TAO_NAMESPACE  CORBA
     static TypeCodeFactory_ptr tao_nil (void);
     static TypeCodeFactory_ptr tao_narrow (
         CORBA::Object *
-        ACE_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-
+  
   private:
     TypeCodeFactory_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    TypeCodeFactory_var (const TAO_Base_var & rhs);
-    TypeCodeFactory_var & operator= (const TAO_Base_var & rhs);
+    TypeCodeFactory_var (const TAO_Base_var &rhs);
+    TypeCodeFactory_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_TYPECODEFACTORY___OUT_CH_)
 #define _CORBA_TYPECODEFACTORY___OUT_CH_
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:946
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
+  
   class TAO_TypeCodeFactory_Export TypeCodeFactory_out
   {
   public:
@@ -141,19 +143,19 @@ TAO_NAMESPACE  CORBA
     operator TypeCodeFactory_ptr &();
     TypeCodeFactory_ptr &ptr (void);
     TypeCodeFactory_ptr operator-> (void);
-
+  
   private:
     TypeCodeFactory_ptr &ptr_;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
 
 #if !defined (_CORBA_TYPECODEFACTORY_CH_)
 #define _CORBA_TYPECODEFACTORY_CH_
-
+  
   class TAO_TypeCodeFactory_Export TypeCodeFactory
     : public virtual CORBA::Object
   {
@@ -161,30 +163,30 @@ TAO_NAMESPACE  CORBA
     typedef TypeCodeFactory_ptr _ptr_type;
     typedef TypeCodeFactory_var _var_type;
     static int _tao_class_id;
-
+    
     // The static operations.
     static TypeCodeFactory_ptr _duplicate (TypeCodeFactory_ptr obj);
-
+    
     static TypeCodeFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TypeCodeFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TypeCodeFactory_ptr _nil (void)
       {
         return (TypeCodeFactory_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_struct_tc (
         const char * id,
         const char * name,
@@ -194,10 +196,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_union_tc (
         const char * id,
         const char * name,
@@ -208,10 +210,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_enum_tc (
         const char * id,
         const char * name,
@@ -221,10 +223,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_alias_tc (
         const char * id,
         const char * name,
@@ -234,10 +236,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_exception_tc (
         const char * id,
         const char * name,
@@ -247,10 +249,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_interface_tc (
         const char * id,
         const char * name
@@ -259,10 +261,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_string_tc (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -270,10 +272,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_wstring_tc (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -281,10 +283,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_fixed_tc (
         CORBA::UShort digits,
         CORBA::UShort scale
@@ -293,10 +295,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_sequence_tc (
         CORBA::ULong bound,
         CORBA::TypeCode_ptr element_type
@@ -305,10 +307,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_array_tc (
         CORBA::ULong length,
         CORBA::TypeCode_ptr element_type
@@ -317,10 +319,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_value_tc (
         const char * id,
         const char * name,
@@ -332,10 +334,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_value_box_tc (
         const char * id,
         const char * name,
@@ -345,10 +347,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_native_tc (
         const char * id,
         const char * name
@@ -357,10 +359,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_recursive_tc (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -368,10 +370,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
         const char * id,
         const char * name
@@ -380,10 +382,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_local_interface_tc (
         const char * id,
         const char * name
@@ -392,10 +394,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_component_tc (
         const char * id,
         const char * name
@@ -404,10 +406,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::TypeCode_ptr create_home_tc (
         const char * id,
         const char * name
@@ -416,55 +418,75 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:267
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::TypeCode_ptr create_event_tc (
+        const char * id,
+        const char * name,
+        CORBA::ValueModifier type_modifier,
+        CORBA::TypeCode_ptr concrete_base,
+        const CORBA::ValueMemberSeq & members
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
   protected:
     TypeCodeFactory (void);
     virtual ~TypeCodeFactory (void);
-
+    
+    friend class _TAO_TypeCodeFactory_Remote_Proxy_Impl;
+    friend class _TAO_TypeCodeFactory_ThruPOA_Proxy_Impl;
+    friend class _TAO_TypeCodeFactory_Direct_Proxy_Impl;
+  
   private:
     TypeCodeFactory (const TypeCodeFactory &);
     void operator= (const TypeCodeFactory &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeCodeFactory;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_TypeCodeFactory_Export void operator<<= (CORBA::Any &, CORBA::TypeCodeFactory_ptr); // copying
 TAO_TypeCodeFactory_Export void operator<<= (CORBA::Any &, CORBA::TypeCodeFactory_ptr *); // non-copying
 TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypeCodeFactory_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1016
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "TypeCodeFactoryC.inl"
@@ -480,3 +502,5 @@ TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA
 
 #include "ace/post.h"
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
index 1e31254e5b5..d716996626b 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
@@ -21,10 +21,17 @@
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_TYPECODEFACTORY___CI_)
 #define _CORBA_TYPECODEFACTORY___CI_
 
+ACE_INLINE
+CORBA::Boolean
+CORBA::TypeCodeFactory::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 14725a62983..96d28d000e8 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -1,13 +1,13 @@
+// $Id$
+
 #include "TypeCodeFactory_Adapter_Impl.h"
 #include "TypeCodeFactory_i.h"
 #include "tao/ORB_Core.h"
 
-
 ACE_RCSID (TypeCodeFactory,
            TypeCodeFactory_Adapter_Impl,
            "$Id$")
 
-
 TAO_TypeCodeFactory_Adapter_Impl::~TAO_TypeCodeFactory_Adapter_Impl (void)
 {
 }
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
index 25fc44a48b1..a07fd035f5e 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
@@ -16,12 +16,13 @@
 
 #include "typecodefactory_export.h"
 #include "tao/Object_Loader.h"
-#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Service_Config.h"
+
 /**
  * @class TAO_TypeCodeFactory_Loader
  *
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index 5f06043fb05..442b5e99088 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -53,7 +53,8 @@ TAO_TypeCodeFactory_i::_tao_QueryInterface (ptr_arith_t type)
       return this;
     }
 
-  return this->ACE_NESTED_CLASS (CORBA, TypeCodeFactory)::_tao_QueryInterface (type);
+  return 
+    this->ACE_NESTED_CLASS (CORBA, TypeCodeFactory::_tao_QueryInterface) (type);
 }
 
 CORBA::TypeCode_ptr
@@ -63,7 +64,7 @@ TAO_TypeCodeFactory_i::create_struct_tc (
     const CORBA::StructMemberSeq &members
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->struct_except_tc_common (id,
                                         name,
@@ -80,7 +81,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
     const CORBA::UnionMemberSeq &members
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (name != 0 && !this->valid_name (name))
     {
@@ -241,6 +242,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
     }
 
   TAO_OutputCDR cdr;
+  CORBA::TypeCode::OFFSET_MAP *offset_map = 0;
 
   cdr << TAO_ENCAP_BYTE_ORDER;
 
@@ -268,12 +270,11 @@ TAO_TypeCodeFactory_i::create_union_tc (
             }
         }
 
+      CORBA::TCKind kind = discriminator_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+
       if (index == raw_default_index)
         {
           // This is the default label - we have to find a legal value.
-          CORBA::TCKind kind = discriminator_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
           this->compute_default_label (kind,
                                        index,
                                        members,
@@ -281,42 +282,36 @@ TAO_TypeCodeFactory_i::create_union_tc (
         }
       else
         {
-          // Interpretive marshaling refuses to die ;-).
-          TAO_InputCDR in (members[index].label._tao_get_cdr (),
-                           members[index].label._tao_byte_order ());
-
-          CORBA::TypeCode_var tc = members[index].label.type ();
-
-          (void) TAO_Marshal_Object::perform_append (tc.in (),
-                                                     &in,
-                                                     &cdr
-                                                     ACE_ENV_ARG_PARAMETER);
+          CORBA::Boolean good_label =
+            this->insert_label_value (kind,
+                                      members[index].label,
+                                      cdr
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+                                      
+          if (good_label == 0)
+            {
+              return CORBA::TypeCode::_nil ();
+            }
         }
 
       cdr << members[index].name;
 
+      if (members[index].type->offset_map () != 0)
+        {
+          this->update_map (offset_map,
+                            members[index].type.in (),
+                            id,
+                            cdr);
+        }
+
       cdr << members[index].type.in ();
     }
 
-  ACE_Message_Block consolidated_block;
-
-  ACE_CDR::consolidate (&consolidated_block,
-                        cdr.begin ());
-
-  CORBA::TypeCode_ptr union_typecode =
-    CORBA::TypeCode::_nil ();
-
-  ACE_NEW_THROW_EX (union_typecode,
-                    CORBA::TypeCode (CORBA::tk_union,
-                                    consolidated_block.length (),
-                                    consolidated_block.rd_ptr (),
-                                    0,
-                                    0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  return union_typecode;
+  return this->assemble_tc (cdr,
+                            CORBA::tk_union,
+                            offset_map
+                            ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -326,7 +321,7 @@ TAO_TypeCodeFactory_i::create_enum_tc (
     const CORBA::EnumMemberSeq &members
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (name != 0 && !this->valid_name (name))
     {
@@ -348,14 +343,8 @@ TAO_TypeCodeFactory_i::create_enum_tc (
 
   cdr << id;
 
-  this->string_pad (cdr,
-                    ACE_OS::strlen (id) + 1);
-
   cdr << name;
 
-  this->string_pad (cdr,
-                    ACE_OS::strlen (name) + 1);
-
   CORBA::ULong len = members.length ();
 
   cdr << len;
@@ -376,29 +365,12 @@ TAO_TypeCodeFactory_i::create_enum_tc (
         }
 
       cdr << members[index].in ();
-
-      this->string_pad (cdr,
-                        ACE_OS::strlen (members[index].in ()) + 1);
     }
 
-  ACE_Message_Block consolidated_block;
-
-  ACE_CDR::consolidate (&consolidated_block,
-                        cdr.begin ());
-
-  CORBA::TypeCode_ptr enum_typecode =
-    CORBA::TypeCode::_nil ();
-
-  ACE_NEW_THROW_EX (enum_typecode,
-                    CORBA::TypeCode (CORBA::tk_enum,
-                                    consolidated_block.length (),
-                                    consolidated_block.rd_ptr (),
-                                    0,
-                                    0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  return enum_typecode;
+  return this->assemble_tc (cdr,
+                            CORBA::tk_enum,
+                            0
+                            ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -408,68 +380,13 @@ TAO_TypeCodeFactory_i::create_alias_tc (
     CORBA::TypeCode_ptr original_type
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (name != 0 && !this->valid_name (name))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (15,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  if (id != 0 && !this->valid_id (id))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (16,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  CORBA::Boolean valid_content =
-    this->valid_content_type (original_type
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  if (!valid_content)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (2,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  TAO_OutputCDR cdr;
-
-  cdr << TAO_ENCAP_BYTE_ORDER;
-
-  cdr << id;
-
-  this->string_pad (cdr,
-                    ACE_OS::strlen (id) + 1);
-
-  cdr << name;
-
-  this->string_pad (cdr,
-                    ACE_OS::strlen (name) + 1);
-
-  cdr << original_type;
-
-  ACE_Message_Block consolidated_block;
-
-  ACE_CDR::consolidate (&consolidated_block,
-                        cdr.begin ());
-
-  CORBA::TypeCode_ptr alias_typecode =
-    CORBA::TypeCode::_nil ();
-
-  ACE_NEW_THROW_EX (alias_typecode,
-                    CORBA::TypeCode (CORBA::tk_alias,
-                                    consolidated_block.length (),
-                                    consolidated_block.rd_ptr (),
-                                    0,
-                                    0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  return alias_typecode;
+  return this->alias_value_box_tc_common (id,
+                                          name,
+                                          original_type,
+                                          CORBA::tk_alias
+                                          ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -479,7 +396,7 @@ TAO_TypeCodeFactory_i::create_exception_tc (
     const CORBA::StructMemberSeq &members
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->struct_except_tc_common (id,
                                         name,
@@ -494,7 +411,7 @@ TAO_TypeCodeFactory_i::create_interface_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
@@ -507,27 +424,11 @@ TAO_TypeCodeFactory_i::create_string_tc (
     CORBA::ULong bound
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_OutputCDR cdr;
-
-  cdr << TAO_ENCAP_BYTE_ORDER;
-
-  cdr << bound;
-
-  CORBA::TypeCode_ptr string_typecode =
-    CORBA::TypeCode::_nil ();
-
-  ACE_NEW_THROW_EX (string_typecode,
-                    CORBA::TypeCode (CORBA::tk_string,
-                                    cdr.total_length (),
-                                    cdr.buffer (),
-                                    0,
-                                    0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  return string_typecode;
+  return this->string_wstring_tc_common (bound,
+                                         CORBA::tk_string
+                                         ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -535,39 +436,24 @@ TAO_TypeCodeFactory_i::create_wstring_tc (
     CORBA::ULong bound
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_OutputCDR cdr;
-
-  cdr << TAO_ENCAP_BYTE_ORDER;
-
-  cdr << bound;
-
-  CORBA::TypeCode_ptr wstring_typecode =
-    CORBA::TypeCode::_nil ();
-
-  ACE_NEW_THROW_EX (wstring_typecode,
-                    CORBA::TypeCode (CORBA::tk_wstring,
-                                    cdr.total_length (),
-                                    cdr.buffer (),
-                                    0,
-                                    0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  return wstring_typecode;
+  return this->string_wstring_tc_common (bound,
+                                         CORBA::tk_wstring
+                                         ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_fixed_tc (
     CORBA::UShort /* digits */,
     CORBA::UShort /* scale */
-    ACE_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // TODO
-  return 0;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+                                         CORBA::COMPLETED_NO),
+                    CORBA::TypeCode::_nil ());
 }
 
 CORBA::TypeCode_ptr
@@ -576,46 +462,12 @@ TAO_TypeCodeFactory_i::create_sequence_tc (
     CORBA::TypeCode_ptr element_type
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean valid_element =
-    this->valid_content_type (element_type
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  if (!valid_element)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (2,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  TAO_OutputCDR cdr;
-
-  cdr << TAO_ENCAP_BYTE_ORDER;
-
-  cdr << element_type;
-
-  cdr << bound;
-
-  ACE_Message_Block consolidated_block;
-
-  ACE_CDR::consolidate (&consolidated_block,
-                        cdr.begin ());
-
-  CORBA::TypeCode_ptr sequence_typecode =
-    CORBA::TypeCode::_nil ();
-
-  ACE_NEW_THROW_EX (sequence_typecode,
-                    CORBA::TypeCode (CORBA::tk_sequence,
-                                    consolidated_block.length (),
-                                    consolidated_block.rd_ptr (),
-                                    0,
-                                    0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  return sequence_typecode;
+  return sequence_array_tc_common (bound,
+                                   element_type,
+                                   CORBA::tk_sequence
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -624,61 +476,32 @@ TAO_TypeCodeFactory_i::create_array_tc (
     CORBA::TypeCode_ptr element_type
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean valid_element =
-    this->valid_content_type (element_type
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  if (!valid_element)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (2,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  TAO_OutputCDR cdr;
-
-  cdr << TAO_ENCAP_BYTE_ORDER;
-
-  cdr << element_type;
-
-  cdr << length;
-
-  ACE_Message_Block consolidated_block;
-
-  ACE_CDR::consolidate (&consolidated_block,
-                        cdr.begin ());
-
-  CORBA::TypeCode_ptr array_typecode =
-    CORBA::TypeCode::_nil ();
-
-  ACE_NEW_THROW_EX (array_typecode,
-                    CORBA::TypeCode (CORBA::tk_array,
-                                    consolidated_block.length (),
-                                    consolidated_block.rd_ptr (),
-                                    0,
-                                    0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  return array_typecode;
+  return sequence_array_tc_common (length,
+                                   element_type,
+                                   CORBA::tk_array
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_value_tc (
-    const char * /* id */,
-    const char * /* name */,
-    CORBA::ValueModifier /* type_modifier */,
-    CORBA::TypeCode_ptr /* concrete_base */,
-    const CORBA::ValueMemberSeq & /* members */
-    ACE_ENV_ARG_DECL_NOT_USED
+    const char *id,
+    const char *name,
+    CORBA::ValueModifier type_modifier,
+    CORBA::TypeCode_ptr concrete_base,
+    const CORBA::ValueMemberSeq &members
+    ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // TODO
-  return 0;
+  return this->value_event_tc_common (id,
+                                      name,
+                                      type_modifier,
+                                      concrete_base,
+                                      members,
+                                      CORBA::tk_value
+                                      ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -688,63 +511,13 @@ TAO_TypeCodeFactory_i::create_value_box_tc (
     CORBA::TypeCode_ptr boxed_type
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (name != 0 && !this->valid_name (name))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (15,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  // Repo id may not be null for valueboxtype.
-  if (id == 0 || !this->valid_id (id))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (16,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  CORBA::Boolean valid_content =
-    this->valid_content_type (boxed_type
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  if (!valid_content)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (2,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  TAO_OutputCDR cdr;
-
-  cdr << TAO_ENCAP_BYTE_ORDER;
-
-  cdr << id;
-
-  cdr << name;
-
-  cdr << boxed_type;
-
-  ACE_Message_Block consolidated_block;
-
-  ACE_CDR::consolidate (&consolidated_block,
-                        cdr.begin ());
-
-  CORBA::TypeCode_ptr value_box_typecode =
-    CORBA::TypeCode::_nil ();
-
-  ACE_NEW_THROW_EX (value_box_typecode,
-                    CORBA::TypeCode (CORBA::tk_value_box,
-                                    consolidated_block.length (),
-                                    consolidated_block.rd_ptr (),
-                                    0,
-                                    0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  return value_box_typecode;
+  return this->alias_value_box_tc_common (id,
+                                          name,
+                                          boxed_type,
+                                          CORBA::tk_value_box
+                                          ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -753,7 +526,7 @@ TAO_TypeCodeFactory_i::create_native_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
@@ -763,13 +536,46 @@ TAO_TypeCodeFactory_i::create_native_tc (
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_recursive_tc (
-    const char * /* id */
-    ACE_ENV_ARG_DECL_NOT_USED
+    const char *id
+    ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // TODO
-  return 0;
+  if (id == 0 || !this->valid_id (id))
+    {
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (16,
+                                          CORBA::COMPLETED_NO),
+                        CORBA::TypeCode::_nil ());
+    }
+
+  CORBA::TypeCode::OFFSET_MAP *map = 0;
+  ACE_NEW_RETURN (map,
+                  CORBA::TypeCode::OFFSET_MAP,
+                  CORBA::TypeCode::_nil ());
+
+  CORBA::ULong initial_offset = 0;
+  CORBA::TypeCode::OFFSET_LIST *list = 0;
+  ACE_NEW_RETURN (list,
+                  CORBA::TypeCode::OFFSET_LIST,
+                  CORBA::TypeCode::_nil ());
+  list->enqueue_tail (initial_offset);
+  (void) map->bind (CORBA::string_dup (id),
+                    list);
+
+  TAO_OutputCDR cdr;
+
+  // Negative offset value, updated later with the actual value.
+  cdr << 0xffffffff;
+
+  // In an embedded recursive typecode, the indirection
+  // value -1 goes where the TCKind would go for any
+  // other embedded typecode.
+  CORBA::TCKind rec_kind = (CORBA::TCKind) 0xffffffff;
+
+  return this->assemble_tc (cdr,
+                            rec_kind,
+                            map
+                            ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -778,7 +584,7 @@ TAO_TypeCodeFactory_i::create_abstract_interface_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
@@ -792,7 +598,7 @@ TAO_TypeCodeFactory_i::create_local_interface_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
@@ -806,7 +612,7 @@ TAO_TypeCodeFactory_i::create_component_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
@@ -820,7 +626,7 @@ TAO_TypeCodeFactory_i::create_home_tc (
     const char *name
     ACE_ENV_ARG_DECL
   )
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
@@ -828,6 +634,28 @@ TAO_TypeCodeFactory_i::create_home_tc (
                                  ACE_ENV_ARG_PARAMETER);
 }
 
+CORBA::TypeCode_ptr
+TAO_TypeCodeFactory_i::create_event_tc (
+    const char *id,
+    const char *name,
+    CORBA::ValueModifier type_modifier,
+    CORBA::TypeCode_ptr concrete_base,
+    const CORBA::ValueMemberSeq &members
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->value_event_tc_common (id,
+                                      name,
+                                      type_modifier,
+                                      concrete_base,
+                                      members,
+                                      CORBA::tk_event
+                                      ACE_ENV_ARG_PARAMETER);
+}
+
+// =====================================================================
+
 void
 TAO_TypeCodeFactory_i::compute_default_label (
     CORBA::TCKind kind,
@@ -841,7 +669,6 @@ TAO_TypeCodeFactory_i::compute_default_label (
   struct disc_types
   {
     CORBA::Char char_val;
-    CORBA::WChar wchar_val;
     CORBA::Boolean bool_val;
     CORBA::Short short_val;
     CORBA::UShort ushort_val;
@@ -855,7 +682,6 @@ TAO_TypeCodeFactory_i::compute_default_label (
   } dv, u;
 
   dv.char_val = 0;
-  dv.wchar_val = 0;
   dv.bool_val = 0;
   dv.short_val = ACE_INT16_MIN;
   dv.ushort_val = 0;
@@ -892,14 +718,6 @@ TAO_TypeCodeFactory_i::compute_default_label (
                   success = 0;
                 }
               break;
-            case CORBA::tk_wchar:
-              members[i].label >>= CORBA::Any::to_wchar (u.wchar_val);
-              if (u.wchar_val == dv.wchar_val)
-                {
-                  dv.wchar_val++;
-                  success = 0;
-                }
-              break;
             case CORBA::tk_boolean:
               members[i].label >>= CORBA::Any::to_boolean (u.bool_val);
               if (u.bool_val == dv.bool_val)
@@ -978,9 +796,6 @@ TAO_TypeCodeFactory_i::compute_default_label (
     case CORBA::tk_char:
       cdr << CORBA::Any::from_char (dv.char_val);
       break;
-    case CORBA::tk_wchar:
-      cdr << CORBA::Any::from_wchar (dv.wchar_val);
-      break;
     case CORBA::tk_boolean:
       cdr << CORBA::Any::from_boolean (dv.bool_val);
       break;
@@ -1009,6 +824,60 @@ TAO_TypeCodeFactory_i::compute_default_label (
   }
 }
 
+CORBA::Boolean
+TAO_TypeCodeFactory_i::insert_label_value (
+    CORBA::TCKind kind,
+    const CORBA::Any &any,
+    TAO_OutputCDR &cdr
+    ACE_ENV_ARG_DECL
+  )
+{
+  void *value = ACE_const_cast (void *,
+                                any.value ());
+  CORBA::TypeCode_ptr disc_tc = any._tao_get_typecode ();
+
+  switch (kind)
+  {
+    case CORBA::tk_char:
+      return cdr << CORBA::Any::from_char (*ACE_reinterpret_cast (
+                                                char *, 
+                                                value
+                                              ));
+    case CORBA::tk_boolean:
+      return cdr << CORBA::Any::from_boolean (*ACE_reinterpret_cast (
+                                                   CORBA::Boolean *,
+                                                   value
+                                                 ));
+    case CORBA::tk_short:
+      return cdr << *ACE_reinterpret_cast (CORBA::Short *, value);
+    case CORBA::tk_ushort:
+      return cdr << *ACE_reinterpret_cast (CORBA::UShort *, value);
+    case CORBA::tk_long:
+      return cdr << *ACE_reinterpret_cast (CORBA::Long *, value);
+    case CORBA::tk_ulong:
+      return cdr << *ACE_reinterpret_cast (CORBA::ULong *, value);
+#if !defined (ACE_LACKS_LONGLONG_T)
+    case CORBA::tk_ulonglong:
+      return cdr << *ACE_reinterpret_cast (CORBA::ULongLong *, value);
+#endif /* ACE_LACKS_LONGLONG_T */
+    case CORBA::tk_enum:
+      {
+        TAO_InputCDR in (any._tao_get_cdr (),
+                         any._tao_byte_order ());
+
+        CORBA::TypeCode::traverse_status ts =
+          TAO_Marshal_Object::perform_append (disc_tc,
+                                              &in,
+                                              &cdr
+                                              ACE_ENV_ARG_PARAMETER);
+
+        return (ts == CORBA::TypeCode::TRAVERSE_CONTINUE);
+      }
+    default:
+      return 0;
+  }
+}
+
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_tc_common (
     const char *id,
@@ -1041,24 +910,81 @@ TAO_TypeCodeFactory_i::create_tc_common (
 
   cdr << name;
 
-  ACE_Message_Block consolidated_block;
+  return this->assemble_tc (cdr,
+                            kind,
+                            0
+                            ACE_ENV_ARG_PARAMETER);
+}
 
-  ACE_CDR::consolidate (&consolidated_block,
-                        cdr.begin ());
+CORBA::TypeCode_ptr
+TAO_TypeCodeFactory_i::string_wstring_tc_common (
+    CORBA::ULong bound,
+    CORBA::TCKind kind
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO_OutputCDR cdr;
 
-  CORBA::TypeCode_ptr result =
-    CORBA::TypeCode::_nil ();
+  cdr << TAO_ENCAP_BYTE_ORDER;
 
-  ACE_NEW_THROW_EX (result,
-                    CORBA::TypeCode (kind,
-                                    consolidated_block.length (),
-                                    consolidated_block.rd_ptr (),
-                                    0,
-                                    0),
-                    CORBA::NO_MEMORY ());
+  cdr << bound;
+
+  return this->assemble_tc (cdr,
+                            kind,
+                            0
+                            ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::TypeCode_ptr
+TAO_TypeCodeFactory_i::sequence_array_tc_common (
+    CORBA::ULong bound,
+    CORBA::TypeCode_ptr element_type,
+    CORBA::TCKind kind
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  CORBA::Boolean valid_element =
+    this->valid_content_type (element_type
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  return result;
+  if (!valid_element)
+    {
+      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (2,
+                                             CORBA::COMPLETED_NO),
+                        CORBA::TypeCode::_nil ());
+    }
+
+  TAO_OutputCDR cdr;
+  CORBA::TypeCode::OFFSET_MAP *offset_map = 0;
+
+  cdr << TAO_ENCAP_BYTE_ORDER;
+
+  if (element_type->offset_map () != 0)
+    {
+      // Arrays can't be recursive.
+      if (kind != CORBA::tk_sequence)
+        {
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                            CORBA::TypeCode::_nil ());
+        }
+
+      this->update_map (offset_map,
+                        element_type,
+                        0,
+                        cdr);
+    }
+
+  cdr << element_type;
+
+  cdr << bound;
+
+  return this->assemble_tc (cdr,
+                            kind,
+                            offset_map
+                            ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -1093,30 +1019,25 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
 
   cdr << id;
 
-  this->string_pad (cdr,
-                    ACE_OS::strlen (id) + 1);
-
   cdr << name;
 
-  this->string_pad (cdr,
-                    ACE_OS::strlen (name) + 1);
-
   // Number of members..
   CORBA::ULong len = members.length ();
 
   cdr << len;
 
-  CORBA::TypeCode_ptr tc_holder = CORBA::TypeCode::_nil ();
+  CORBA::TypeCode_ptr member_tc = CORBA::TypeCode::_nil ();
   CORBA::Boolean valid_member = 1;
   const char *member_name = 0;
   ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> map;
+  CORBA::TypeCode::OFFSET_MAP *offset_map = 0;
 
   for (CORBA::ULong index = 0; index < len; ++index)
     {
       // Valid member type?
-      tc_holder = members[index].type.in ();
+      member_tc = members[index].type.in ();
 
-      valid_member = this->valid_content_type (tc_holder
+      valid_member = this->valid_content_type (member_tc
                                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
@@ -1149,30 +1070,210 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
 
       cdr << member_name;
 
-      this->string_pad (cdr,
-                        ACE_OS::strlen (member_name) + 1);
+      if (member_tc->offset_map () != 0)
+        {
+          // Exceptions can't be recursive.
+          if (kind != CORBA::tk_struct)
+            {
+              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                                CORBA::TypeCode::_nil ());
+            }
+
+          this->update_map (offset_map,
+                            member_tc,
+                            id,
+                            cdr);
+        }
 
-      cdr << tc_holder;
+      cdr << member_tc;
     }
 
-  ACE_Message_Block consolidated_block;
+  return this->assemble_tc (cdr,
+                            kind,
+                            offset_map
+                            ACE_ENV_ARG_PARAMETER);
+}
 
-  ACE_CDR::consolidate (&consolidated_block,
-                        cdr.begin ());
+CORBA::TypeCode_ptr
+TAO_TypeCodeFactory_i::alias_value_box_tc_common (
+    const char *id,
+    const char *name,
+    CORBA::TypeCode_ptr underlying_type,
+    CORBA::TCKind kind
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (name != 0 && !this->valid_name (name))
+    {
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (15,
+                                          CORBA::COMPLETED_NO),
+                        CORBA::TypeCode::_nil ());
+    }
 
-  CORBA::TypeCode_ptr new_typecode =
-    CORBA::TypeCode::_nil ();
+  // Repo id may not be null for valueboxtype.
+  if (id == 0 || !this->valid_id (id))
+    {
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (16,
+                                          CORBA::COMPLETED_NO),
+                        CORBA::TypeCode::_nil ());
+    }
 
-  ACE_NEW_THROW_EX (new_typecode,
-                    CORBA::TypeCode (kind,
-                                    consolidated_block.length (),
-                                    consolidated_block.rd_ptr (),
-                                    0,
-                                    0),
-                    CORBA::NO_MEMORY ());
+  CORBA::Boolean valid_content =
+    this->valid_content_type (underlying_type
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  return new_typecode;
+  if (!valid_content)
+    {
+      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (2,
+                                             CORBA::COMPLETED_NO),
+                        CORBA::TypeCode::_nil ());
+    }
+
+  TAO_OutputCDR cdr;
+  CORBA::TypeCode::OFFSET_MAP *offset_map = 0;
+
+  cdr << TAO_ENCAP_BYTE_ORDER;
+
+  cdr << id;
+
+  cdr << name;
+
+  if (underlying_type->offset_map () != 0)
+    {
+      // Value boxes can't be recursive.
+      if (kind != CORBA::tk_alias)
+        {
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                            CORBA::TypeCode::_nil ());
+        }
+
+      this->update_map (offset_map,
+                        underlying_type,
+                        id,
+                        cdr);
+    }
+
+  cdr << underlying_type;
+
+  return this->assemble_tc (cdr,
+                            kind,
+                            offset_map
+                            ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::TypeCode_ptr
+TAO_TypeCodeFactory_i::value_event_tc_common (
+    const char *id,
+    const char *name,
+    CORBA::ValueModifier type_modifier,
+    CORBA::TypeCode_ptr concrete_base,
+    const CORBA::ValueMemberSeq &members,
+    CORBA::TCKind kind
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (name != 0 && !this->valid_name (name))
+    {
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (15,
+                                          CORBA::COMPLETED_NO),
+                        CORBA::TypeCode::_nil ());
+    }
+
+  // Repo id may not be null for valueboxtype.
+  if (id == 0 || !this->valid_id (id))
+    {
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (16,
+                                          CORBA::COMPLETED_NO),
+                        CORBA::TypeCode::_nil ());
+    }
+
+  TAO_OutputCDR cdr;
+
+  cdr << TAO_ENCAP_BYTE_ORDER;
+
+  cdr << id;
+
+  cdr << name;
+
+  cdr << type_modifier;
+
+  if (CORBA::is_nil (concrete_base))
+    {
+      cdr << CORBA::tk_null;
+    }
+  else
+    {
+      cdr << concrete_base;
+    }
+
+  CORBA::ULong len = members.length ();
+
+  cdr << len;
+
+  CORBA::TypeCode_ptr member_tc = CORBA::TypeCode::_nil ();
+  CORBA::Boolean valid_member = 1;
+  const char *member_name = 0;
+  ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> map;
+  CORBA::TypeCode::OFFSET_MAP *offset_map = 0;
+
+  for (CORBA::ULong index = 0; index < len; ++index)
+    {
+      // Valid member type?
+      member_tc = members[index].type.in ();
+
+      valid_member = this->valid_content_type (member_tc
+                                               ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+
+      if (!valid_member)
+        {
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (2,
+                                                 CORBA::COMPLETED_NO),
+                            CORBA::TypeCode::_nil ());
+        }
+
+      member_name = members[index].name;
+
+      if (member_name == 0 || !this->valid_name (member_name))
+        {
+          ACE_THROW_RETURN (CORBA::BAD_PARAM (15,
+                                              CORBA::COMPLETED_NO),
+                            CORBA::TypeCode::_nil ());
+        }
+
+      ACE_CString ext_id (member_name);
+      int int_id = 0;
+
+      // Is there a duplicate member name?
+      if (map.trybind (ext_id, int_id) != 0)
+        {
+          ACE_THROW_RETURN (CORBA::BAD_PARAM (17,
+                                              CORBA::COMPLETED_NO),
+                            CORBA::TypeCode::_nil ());
+        }
+
+      cdr << member_name;
+
+      if (member_tc->offset_map () != 0)
+        {
+          this->update_map (offset_map,
+                            member_tc,
+                            id,
+                            cdr);
+        }
+
+      cdr << member_tc;
+
+      cdr << members[index].access;
+    }
+
+  return this->assemble_tc (cdr,
+                            kind,
+                            offset_map
+                            ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
@@ -1203,7 +1304,9 @@ TAO_TypeCodeFactory_i::valid_name (const char *name)
 CORBA::Boolean
 TAO_TypeCodeFactory_i::valid_id (const char *id)
 {
-  ACE_CString safety (id);
+  ACE_CString safety (id, 
+                      0, 
+                      0);
 
   int pos = safety.find (':');
 
@@ -1232,14 +1335,27 @@ TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc
   CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  if (kind == CORBA::tk_null
-      || kind == CORBA::tk_void
-      || kind == CORBA::tk_except)
+  CORBA::TypeCode_var tmp = CORBA::TypeCode::_duplicate (tc);
+
+  while (kind == CORBA::tk_alias)
     {
-      return 0;
+      tmp = tmp->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      kind = tmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
     }
 
-  return 1;
+  switch (kind)
+  {
+    case CORBA::tk_null:
+      return tc->offset_map () != 0;
+    case CORBA::tk_void:
+    case CORBA::tk_except:
+      return 0;
+    default:
+      return 1;
+  }
 }
 
 CORBA::Boolean
@@ -1259,24 +1375,25 @@ TAO_TypeCodeFactory_i::unique_label_values (const CORBA::UnionMemberSeq &members
   struct label_types
   {
     CORBA::Char char_val;
-    CORBA::WChar wchar_val;
     CORBA::Boolean bool_val;
     CORBA::Short short_val;
     CORBA::UShort ushort_val;
     CORBA::Long long_val;
     CORBA::ULong ulong_val;
     CORBA::ULong enum_val;
-    // TODO - handle (u)longlong types
+    CORBA::ULongLong ulonglong_val;
+    CORBA::LongLong longlong_val;
   } s;
 
   s.char_val = 0;
-  s.wchar_val = 0;
   s.bool_val = 0;
   s.short_val = 0;
   s.ushort_val = 0;
   s.long_val = 0;
   s.ulong_val = 0;
   s.enum_val = 0;
+  s.ulonglong_val = 0;
+  s.longlong_val = ACE_CDR_LONGLONG_INITIALIZER;
 
   // Two cases - one for signed and one for unsigned discriminator types.
   if (disc_kind == CORBA::tk_long
@@ -1347,15 +1464,6 @@ TAO_TypeCodeFactory_i::unique_label_values (const CORBA::UnionMemberSeq &members
                 }
 
               break;
-            case CORBA::tk_wchar:
-              members[i].label >>= CORBA::Any::to_wchar (s.wchar_val);
-
-              if (checker.insert (s.wchar_val) != 0)
-                {
-                  return 0;
-                }
-
-              break;
             case CORBA::tk_ushort:
               members[i].label >>= s.ushort_val;
 
@@ -1409,7 +1517,6 @@ TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc
       || kind == CORBA::tk_ushort
       || kind == CORBA::tk_short
       || kind == CORBA::tk_char
-      || kind == CORBA::tk_wchar
       || kind == CORBA::tk_boolean
       || kind == CORBA::tk_longlong
       || kind == CORBA::tk_ulonglong)
@@ -1420,27 +1527,176 @@ TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc
   return 0;
 }
 
-void
-TAO_TypeCodeFactory_i::string_pad (TAO_OutputCDR &cdr,
-                                   CORBA::ULong slen)
+CORBA::TypeCode_ptr 
+TAO_TypeCodeFactory_i::assemble_tc (TAO_OutputCDR &cdr,
+                                    CORBA::TCKind kind,
+                                    CORBA::TypeCode::OFFSET_MAP *map
+                                    ACE_ENV_ARG_DECL)
 {
-  CORBA::ULong padlen = (4 - (slen % 4)) % 4;
+  ACE_Message_Block consolidated_block;
 
-  for (CORBA::ULong i = 0; i < padlen; ++i)
-    {
-      cdr.write_char ('\0');
+  ACE_CDR::consolidate (&consolidated_block,
+                        cdr.begin ());
+
+  CORBA::TypeCode_ptr new_typecode =
+    CORBA::TypeCode::_nil ();
+
+  ACE_NEW_THROW_EX (new_typecode,
+                    CORBA::TypeCode (kind,
+                                     consolidated_block.length (),
+                                     consolidated_block.rd_ptr (),
+                                     0,
+                                     0),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+
+  new_typecode->offset_map (map);
+  return new_typecode;
+}
+
+void 
+TAO_TypeCodeFactory_i::update_map (
+    CORBA::TypeCode::OFFSET_MAP *&offset_map,
+    CORBA::TypeCode_ptr member_tc,
+    const char *id,
+    TAO_OutputCDR &cdr
+  )
+{
+  ptr_arith_t unaligned_offset =
+    ACE_static_cast (ptr_arith_t,
+                     cdr.total_length ());
+
+  CORBA::Long aligned_offset =
+    ACE_static_cast (CORBA::Long,
+                     ACE_align_binary (unaligned_offset,
+                                       sizeof (CORBA::Long)));
+
+  CORBA::TypeCode::OFFSET_MAP *member_offset_map = member_tc->offset_map ();
+  CORBA::TypeCode::OFFSET_LIST *offset_list = 0;
+  CORBA::Long *list_entry = 0;
+  const char *member_id = 0;
+  int no_matching_id = 1;
+  int propagating_recursion = 1;
+
+  // For anything except the immediate product of create_recursive_tc,
+  // the insertion of a member will include an encap length.
+  CORBA::Long member_encap_len_bytes = 
+    member_tc->kind_ == ~0 ? 0 : ACE_static_cast (CORBA::Long,
+                                                  sizeof (CORBA::Long));
+
+  CORBA::Long tc_kind_bytes =
+    ACE_static_cast (CORBA::Long, sizeof (CORBA::TCKind));
+
+  for (CORBA::TypeCode::OFFSET_MAP_ITERATOR iter (*member_offset_map);
+       ! iter.done ();
+       iter.advance ())
+    { 
+      member_id = (*iter).ext_id_;
+
+      if (offset_map != 0)
+        {
+          no_matching_id = offset_map->find (member_id, offset_list);
+        }
+
+      if (no_matching_id && id != 0)
+        {
+          propagating_recursion = ACE_OS::strcmp (member_id, id);
+        }
+
+      if (propagating_recursion)
+        {
+          ACE_NEW (offset_list,
+                   CORBA::TypeCode::OFFSET_LIST);
+        }
+
+      for (CORBA::TypeCode::OFFSET_LIST_ITERATOR list_iter (*(*iter).int_id_);
+           ! list_iter.done ();
+           list_iter.advance ())
+        {
+          list_iter.next (list_entry);
+
+          if (propagating_recursion)
+            {
+              offset_list->enqueue_tail (*list_entry 
+                                         + aligned_offset
+                                         + member_encap_len_bytes
+                                         + tc_kind_bytes);  
+
+              if (offset_map == 0)
+                {
+                  ACE_NEW (offset_map,
+                           CORBA::TypeCode::OFFSET_MAP);
+                }
+            }
+          else
+            {
+              const char *slot = 
+                member_tc->buffer_ + ACE_static_cast (ptr_arith_t,
+                                                      *list_entry);
+              
+              CORBA::Long recursion_offset = 
+                -1 * (aligned_offset
+                      + *list_entry 
+                      + tc_kind_bytes               // Member TCKind.
+                      + member_encap_len_bytes      // Member encap length.
+                      + 4                           // Top level encap length.
+                      + tc_kind_bytes);             // Top level TCKind.
+
+#if !defined (ACE_ENABLE_SWAP_ON_WRITE)
+              *ACE_reinterpret_cast (CORBA::Long *, 
+                                     ACE_const_cast (char *,
+                                                     slot)) = 
+                recursion_offset;
+#else
+              if (! cdr.do_byte_swap ())
+                {
+                  *ACE_reinterpret_cast (CORBA::Long *, slot
+                                         ACE_const_cast (char *,
+                                                         slot)) = 
+                    recursion_offset;
+                }
+              else
+                {
+                  ACE_CDR::swap_4 (ACE_reinterpret_cast (char *,
+                                                         &recursion_offset),
+                                   slot);
+                }
+#endif /* ACE_ENABLE_SWAP_ON_WRITE */
+            }
+        }
+
+      if (no_matching_id && offset_map != 0)
+        {
+          (void) offset_map->bind (member_id, offset_list);
+        }
     }
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Hash_Map_Entry<ACE_CString, int>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, int, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString, int, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, 
+                                             int, 
+                                             ACE_Hash<ACE_CString>, 
+                                             ACE_Equal_To<ACE_CString>, 
+                                             ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_CString, 
+                                        int, 
+                                        ACE_Hash<ACE_CString>, 
+                                        ACE_Equal_To<ACE_CString>, 
+                                        ACE_Null_Mutex>;
 template class ACE_Equal_To<ACE_CString>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, int, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, 
+                                                int, 
+                                                ACE_Hash<ACE_CString>, 
+                                                ACE_Equal_To<ACE_CString>, 
+                                                ACE_Null_Mutex>;
 template class ACE_Hash<ACE_CString>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, int, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_CString, 
+                                       int, 
+                                       ACE_Hash<ACE_CString>, 
+                                       ACE_Equal_To<ACE_CString>, 
+                                       ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex>;
 template class ACE_Bounded_Set<CORBA::Long>;
 template class ACE_Bounded_Set<CORBA::ULong>;
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
index 0eb249d5b81..d3268d08692 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
@@ -58,8 +58,8 @@ public:
       const char *id,
       const char *name,
       const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_union_tc (
@@ -67,72 +67,72 @@ public:
       const char *name,
       CORBA::TypeCode_ptr discriminator_type,
       const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_enum_tc (
       const char *id,
       const char *name,
       const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_alias_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr original_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_exception_tc (
       const char *id,
       const char *name,
       const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_interface_tc (
       const char *id,
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_string_tc (
       CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_wstring_tc (
       CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
       CORBA::UShort scale
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
       CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
       CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_value_tc (
@@ -141,57 +141,67 @@ public:
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
       const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_value_box_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr boxed_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       const char *id,
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
       const char *id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
       const char *id,
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       const char *id,
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_component_tc (
       const char *id,
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_home_tc (
       const char *id,
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
+  virtual CORBA::TypeCode_ptr create_event_tc (
+      const char *id,
+      const char *name,
+      CORBA::ValueModifier type_modifier,
+      CORBA::TypeCode_ptr concrete_base,
+      const CORBA::ValueMemberSeq &members
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -201,13 +211,36 @@ private:
                               const CORBA::UnionMemberSeq &members,
                               TAO_OutputCDR &cdr);
 
+  /// Insert a non-default label value into the typecode being created.
+  CORBA::Boolean insert_label_value (CORBA::TCKind kind,
+                                     const CORBA::Any &any,
+                                     TAO_OutputCDR &cdr
+                                     ACE_ENV_ARG_DECL);
+
   /// Called for all types that take just an id and a name.
   CORBA::TypeCode_ptr create_tc_common (
       const char *id,
       const char *name,
       CORBA::TCKind kind
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
+  /// Code for strings and wstrings is identical except for TCKind.
+  CORBA::TypeCode_ptr string_wstring_tc_common (
+      CORBA::ULong bound,
+      CORBA::TCKind kind
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  /// Code for arrays and sequences is identical except for TCKind.
+  CORBA::TypeCode_ptr sequence_array_tc_common (
+      CORBA::ULong bound,
+      CORBA::TypeCode_ptr element_type,
+      CORBA::TCKind kind
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Code for structs and unions is identical except for TCKind.
@@ -216,8 +249,29 @@ private:
       const char *name,
       const CORBA::StructMemberSeq &members,
       CORBA::TCKind kind
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  /// Code for aliases and boxed valuetypes is identical except for TCKind.
+  CORBA::TypeCode_ptr alias_value_box_tc_common (
+      const char *id,
+      const char *name,
+      CORBA::TypeCode_ptr underlying_type,
+      CORBA::TCKind kind
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
+  CORBA::TypeCode_ptr value_event_tc_common (
+      const char *id,
+      const char *name,
+      CORBA::ValueModifier type_modifier,
+      CORBA::TypeCode_ptr concrete_base,
+      const CORBA::ValueMemberSeq &members,
+      CORBA::TCKind kind
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// If any of these fail, we raise a spec-defined minor code
@@ -233,10 +287,17 @@ private:
   CORBA::Boolean valid_disc_type (CORBA::TypeCode_ptr tc
                                   ACE_ENV_ARG_DECL);
 
-  /// A string in a TAO typecode contains padding to give it a
-  /// total size which is a multiple of 4 bytes.
-  void string_pad (TAO_OutputCDR &cdr,
-                   CORBA::ULong slen);
+  /// Common code for allocating and doing the final assembly of a typecode.
+  CORBA::TypeCode_ptr assemble_tc (TAO_OutputCDR &cdr,
+                                   CORBA::TCKind kind,
+                                   CORBA::TypeCode::OFFSET_MAP *map
+                                   ACE_ENV_ARG_DECL);
+
+  /// Update the offset map we will pass to the typecode we are constructing.
+  void update_map (CORBA::TypeCode::OFFSET_MAP *&offset_map,
+                   CORBA::TypeCode_ptr member_tc,
+                   const char *id,
+                   TAO_OutputCDR &cdr);
 
   /// Prohibited
   TAO_TypeCodeFactory_i (const TAO_TypeCodeFactory_i &src);
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index 1dc563422a4..54aa09bfaac 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -23,6 +23,14 @@
 
 #include "ace/Service_Object.h"
 
+namespace CORBA
+{
+  class EnumMemberSeq;
+  class StructMemberSeq;
+  class UnionMemberSeq;
+  class ValueMemberSeq;
+};
+
 /**
  * @class TAO_TypeCodeFactory_Adapter
  *
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index d83269e1890..da69d007592 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -1,3 +1,18 @@
+// $Id$
+
+
+// Typecodes essentially consist of just the CDR octets that get
+// marshaled and unmarshaled, and this code knows how to parse those
+// octets and answer questions CORBA's TypeCode APIs require.
+//
+// NOTE: This isn't well tuned performance-wise.  Given how much is
+// variable (byte order, alignment) it's clear tuning has its limits
+// with respect to CDR bytecode interpretation.
+//
+// THREADING NOTE: Typecodes are readonly data structures, and the
+// only mutual exclusion relates to reference counting and
+// construction.
+
 #include "tao/Typecode.h"
 #include "tao/Environment.h"
 #include "tao/Any.h"
@@ -143,7 +158,8 @@ CORBA::TypeCode::TypeCode (CORBA::TCKind kind)
     refcount_ (1),
     orb_owns_ (1),
     private_state_ (new TAO::TC_Private_State (kind)),
-    non_aligned_buffer_ (0)
+    non_aligned_buffer_ (0),
+    offset_map_ (0)
 {
 }
 
@@ -159,7 +175,8 @@ CORBA::TypeCode::TypeCode (CORBA::TCKind kind,
     refcount_ (1),
     orb_owns_ (orb_owns_tc),
     private_state_ (new TAO::TC_Private_State (kind)),
-    non_aligned_buffer_ (0)
+    non_aligned_buffer_ (0),
+    offset_map_ (0)
 {
   // The CDR code used to interpret TypeCodes requires in-memory
   // alignments to match the "on-the-wire" alignments, simplifying
@@ -264,6 +281,8 @@ CORBA::TypeCode::~TypeCode (void)
   delete this->private_state_;
   this->private_state_ = 0;
 
+  delete this->offset_map_;
+  this->offset_map_ = 0;
 }
 
 
@@ -831,10 +850,11 @@ CORBA::TypeCode::equ_common (CORBA::TypeCode_ptr tc,
       ACE_CHECK_RETURN (0);
 
       if (kind != other_kind)
-        // simple case
-        return 0;
+        {
+          return 0;
+        }
 
-      // typecode kinds are same
+      // Typecode kinds are same.
       return rcvr->private_equal (tcvar.in (),
                                   equiv_only
                                   ACE_ENV_ARG_PARAMETER);
@@ -842,14 +862,16 @@ CORBA::TypeCode::equ_common (CORBA::TypeCode_ptr tc,
 
   CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
+
   if (this->kind_ != kind)
-    // simple case
-    return 0;
+    {
+      return 0;
+    }
 
   // typecode kinds are same
   return this->private_equal (tc,
                               equiv_only
-                               ACE_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 // check if typecodes are equal. Equality is based on a mix of structural
@@ -885,7 +907,11 @@ CORBA::TypeCode::private_equal (CORBA::TypeCode_ptr tc,
       // all these are simple typecodes and the comparison is based
       // solely on the kind_ field
       return 1;
+    case CORBA::tk_component:
+    case CORBA::tk_home:
     case CORBA::tk_objref:
+    case CORBA::tk_abstract_interface:
+    case CORBA::tk_local_interface:
       return this->private_equal_objref (tc,
                                          equiv_only
                                          ACE_ENV_ARG_PARAMETER);
@@ -902,13 +928,10 @@ CORBA::TypeCode::private_equal (CORBA::TypeCode_ptr tc,
                                        equiv_only
                                        ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_string:
+    case CORBA::tk_wstring:
       return this->private_equal_string (tc,
                                          equiv_only
                                          ACE_ENV_ARG_PARAMETER);
-    case CORBA::tk_wstring:
-      return this->private_equal_wstring (tc,
-                                          equiv_only
-                                          ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_sequence:
       return this->private_equal_sequence (tc,
                                            equiv_only
@@ -917,6 +940,7 @@ CORBA::TypeCode::private_equal (CORBA::TypeCode_ptr tc,
       return this->private_equal_array (tc,
                                         equiv_only
                                         ACE_ENV_ARG_PARAMETER);
+    case CORBA::tk_value_box:
     case CORBA::tk_alias:
       return this->private_equal_alias (tc,
                                         equiv_only
@@ -926,10 +950,10 @@ CORBA::TypeCode::private_equal (CORBA::TypeCode_ptr tc,
                                          equiv_only
                                          ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_value:
+    case CORBA::tk_event:
       return this->private_equal_valuetype (tc,
                                             equiv_only
                                             ACE_ENV_ARG_PARAMETER);
-
     case ~0u: // indirection
       {
         // indirection offset must be same
@@ -948,7 +972,7 @@ CORBA::TypeCode::private_equal_objref (
     ACE_ENV_ARG_DECL
   ) const
 {
-  // compare the repoID and name, of which the name is optional as per GIOP
+  // Compare the repoID and name, of which the name is optional as per GIOP
   // spec. However, the repoID is mandatory.
   const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -956,7 +980,7 @@ CORBA::TypeCode::private_equal_objref (
   const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  if (!ACE_OS::strcmp (my_id, tc_id))
+  if (ACE_OS::strcmp (my_id, tc_id) == 0)
     {
       // Equality of repoIDs is sufficient for equivalence.
       if (equiv_only)
@@ -976,15 +1000,21 @@ CORBA::TypeCode::private_equal_objref (
           if ((ACE_OS::strlen (myname) > 1)
               && (ACE_OS::strlen (tcname) > 1))
             {
-              // both of them specify names, compare them
-              if (!ACE_OS::strcmp (myname, tcname))
-                return 1; // success
+              // Both of them specify names, compare them
+              if (ACE_OS::strcmp (myname, tcname) == 0)
+                {
+                  return 1; // success
+                }
               else
-                return 0; // failed
+                {
+                  return 0; // failed
+                }
             }
+
           return 1; // success
         }
     }
+
   return 0; // failed
 }
 
@@ -1014,7 +1044,9 @@ CORBA::TypeCode::private_equal_struct (
         {
           // Equality of repoIDs is sufficient for equivalence.
           if (equiv_only)
-            return 1;
+            {
+              return 1;
+            }
         }
     }
 
@@ -1030,8 +1062,10 @@ CORBA::TypeCode::private_equal_struct (
       // Compare names if they exist.
       if (ACE_OS::strlen (my_name) > 1
           && ACE_OS::strlen (tc_name) > 1
-          && ACE_OS::strcmp (my_name, tc_name)) // not same
-        return 0;
+          && ACE_OS::strcmp (my_name, tc_name) != 0) // not same
+        {
+          return 0;
+        }
     }
 
   // Check if the member count is same.
@@ -1042,25 +1076,34 @@ CORBA::TypeCode::private_equal_struct (
   ACE_CHECK_RETURN (0);
 
   if (my_count != tc_count)
-    return 0; // number of members don't match
+    {
+      return 0; // number of members don't match
+    }
 
   // The checks below tell if we have a recursive struct.
   CORBA::TypeCode_ptr par = this->parent_;
+
   if (par != 0)
     {
       if (this->tc_base_ == this->root_tc_base_)
-        return 1;
+        {
+          return 1;
+        }
 
       CORBA::TypeCode_ptr tc_par = tc->parent_;
+
       if (tc_par)
         {
           CORBA::TypeCode_ptr gpar = par->parent_;
           CORBA::TypeCode_ptr tc_gpar = tc_par->parent_;
+
           if (gpar != 0
               && tc_gpar != 0
               && this->tc_base_ == gpar->tc_base_
               && tc->tc_base_ == tc_gpar->tc_base_)
-            return 1;
+            {
+              return 1;
+            }
         }
     }
 
@@ -1079,20 +1122,19 @@ CORBA::TypeCode::private_equal_struct (
 
           if (ACE_OS::strlen (my_member_name) > 1
               && ACE_OS::strlen (tc_member_name) > 1
-              && ACE_OS::strcmp (my_member_name,
-                                 tc_member_name)) // not same
+              && ACE_OS::strcmp (my_member_name, tc_member_name) != 0)
             {
               return 0;
             }
         }
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_var my_member_tc =
+      CORBA::TypeCode_var my_member_tc = 
         this->member_type (i
                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc =
+      CORBA::TypeCode_var tc_member_tc = 
         tc->member_type (i
                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
@@ -1145,7 +1187,9 @@ CORBA::TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
         {
           // Equality of repoIDs is sufficient for equivalence.
           if (equiv_only)
-            return 1;
+            {
+              return 1;
+            }
         }
     }
 
@@ -1161,9 +1205,10 @@ CORBA::TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
       // Compare names if they exist.
       if (ACE_OS::strlen (my_name) > 1
           && ACE_OS::strlen (tc_name) > 1
-          && ACE_OS::strcmp (my_name,
-                             tc_name)) // not same
-        return 0;
+          && ACE_OS::strcmp (my_name, tc_name) != 0) // not same
+        {
+          return 0;
+        }
     }
 
   // check if the discriminant type is same
@@ -1180,10 +1225,12 @@ CORBA::TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  if (!status)
-    return 0;
+  if (status == 0)
+    {
+      return 0;
+    }
 
-  // check the default used
+  // Check the default used.
   CORBA::Long my_default = this->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -1191,7 +1238,9 @@ CORBA::TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
   ACE_CHECK_RETURN (0);
 
   if (my_default != tc_default)
-    return 0;
+    {
+      return 0;
+    }
 
   // check if the member count is same
   CORBA::ULong my_count = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1201,25 +1250,34 @@ CORBA::TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
   ACE_CHECK_RETURN (0);
 
   if (my_count != tc_count)
-    return 0; // number of members don't match
+    {
+      return 0;
+    }
 
   // The checks below indicate that we have a recursive union.
   CORBA::TypeCode_ptr par = this->parent_;
+
   if (par != 0)
     {
       if (this->tc_base_ == this->root_tc_base_)
-        return 1;
+        {
+          return 1;
+        }
 
       CORBA::TypeCode_ptr tc_par = tc->parent_;
+
       if (tc_par)
         {
           CORBA::TypeCode_ptr gpar = par->parent_;
           CORBA::TypeCode_ptr tc_gpar = tc_par->parent_;
+
           if (gpar != 0
               && tc_gpar != 0
               && this->tc_base_ == gpar->tc_base_
               && tc->tc_base_ == tc_gpar->tc_base_)
-            return 1;
+            {
+              return 1;
+            }
         }
     }
 
@@ -1230,12 +1288,12 @@ CORBA::TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
       // Check if member names are same - skipped by equivalent().
       if (!equiv_only)
         {
-          const char *my_member_name =
+          const char *my_member_name = 
             this->member_name (i
                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          const char *tc_member_name =
+          const char *tc_member_name = 
             tc->member_name (i
                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
@@ -1244,16 +1302,18 @@ CORBA::TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
               && ACE_OS::strlen (tc_member_name) > 1
               && ACE_OS::strcmp (my_member_name,
                                  tc_member_name)) // not same
-            return 0;
+            {
+              return 0;
+            }
         }
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_var my_member_tc =
+      CORBA::TypeCode_var my_member_tc = 
         this->member_type (i
                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc =
+      CORBA::TypeCode_var tc_member_tc = 
         tc->member_type (i
                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
@@ -1263,15 +1323,19 @@ CORBA::TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
           && my_member_tc->parent_ == tc_member_tc->parent_
           && my_member_tc->tc_base_ == tc_member_tc->tc_base_
           && my_member_tc->root_tc_base_ == tc_member_tc->root_tc_base_)
-        continue;
+        {
+          continue;
+        }
 
       CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (),
                                                       equiv_only
                                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      if (!flag)
-        return 0;
+      if (flag == 0)
+        {
+          return 0;
+        }
     }
 
   return 1; // success
@@ -1301,7 +1365,9 @@ CORBA::TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
         {
           // Equality of repoIDs is sufficient for equivalence.
           if (equiv_only)
-            return 1;
+            {
+              return 1;
+            }
         }
     }
 
@@ -1317,12 +1383,13 @@ CORBA::TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
       // Compare names if they exist.
       if (ACE_OS::strlen (my_name) > 1
           && ACE_OS::strlen (tc_name) > 1
-          && ACE_OS::strcmp (my_name,
-                             tc_name)) // not same
-        return 0;
+          && ACE_OS::strcmp (my_name, tc_name)) // not same
+        {
+          return 0;
+        }
     }
 
-  // check if the member count is same
+  // Check if the member count is same.
   CORBA::ULong my_count = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -1330,28 +1397,31 @@ CORBA::TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
   ACE_CHECK_RETURN (0);
 
   if (my_count != tc_count)
-    return 0; // number of members don't match
+    {
+      return 0;
+    }
 
   for (CORBA::ULong i=0; i < my_count; ++i)
     {
       // Check if member names are same - skipped by equivalent().
       if (!equiv_only)
         {
-          const char *my_member_name =
+          const char *my_member_name = 
             this->member_name (i
                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          const char *tc_member_name =
+          const char *tc_member_name = 
             tc->member_name (i
                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (ACE_OS::strlen (my_member_name) > 1
               && ACE_OS::strlen (tc_member_name) > 1
-              && ACE_OS::strcmp (my_member_name,
-                                 tc_member_name)) // not same
-            return 0;
+              && ACE_OS::strcmp (my_member_name, tc_member_name) != 0)
+            {
+              return 0;
+            }
         }
     }
 
@@ -1399,13 +1469,13 @@ CORBA::TypeCode::private_equal_sequence (
     ACE_ENV_ARG_DECL
   ) const
 {
-  // This involves comparing the typecodes of the element type as well
-  // as the bounds.
-  CORBA::TypeCode_var my_elem =
+  // this involves comparing the typecodes of the element type as well
+  // as the bounds
+  CORBA::TypeCode_var my_elem = 
     this->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::TypeCode_var tc_elem =
+  CORBA::TypeCode_var tc_elem = 
     tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -1414,8 +1484,10 @@ CORBA::TypeCode::private_equal_sequence (
                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  if (!status)
-    return 0;
+  if (status == 0)
+    {
+      return 0;
+    }
 
   // Now check if bounds are same.
   CORBA::ULong my_len = this->length (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1432,7 +1504,7 @@ CORBA::TypeCode::private_equal_array (CORBA::TypeCode_ptr tc,
                                       CORBA::Boolean equiv_only
                                       ACE_ENV_ARG_DECL) const
 {
-  // exactly like sequence
+  // Exactly like sequence
   return this->private_equal_sequence (tc,
                                        equiv_only
                                        ACE_ENV_ARG_PARAMETER);
@@ -1459,13 +1531,21 @@ CORBA::TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc,
 
   // Compare repository IDs if they exist.
   if (ACE_OS::strlen (my_id) > 1 && ACE_OS::strlen (tc_id) > 1)
-    if (ACE_OS::strcmp (my_id, tc_id)) // not same
-      return 0;
+    {
+      if (ACE_OS::strcmp (my_id, tc_id) != 0) // not same
+        {
+          return 0;
+        }
+    }
 
   // Compare names if they exist.
   if (ACE_OS::strlen (my_name) > 1 && ACE_OS::strlen (tc_name) > 1)
-    if (ACE_OS::strcmp (my_name, tc_name)) // not same
-      return 0;
+    {
+      if (ACE_OS::strcmp (my_name, tc_name) != 0) // not same
+        {
+          return 0;
+        }
+    }
 
   // Now compare element TypeCodes.
   CORBA::TypeCode_var my_elem =
@@ -1495,7 +1575,7 @@ CORBA::TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
   const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  if (ACE_OS::strcmp (my_id, tc_id))
+  if (ACE_OS::strcmp (my_id, tc_id) != 0)
     {
       return 0; // failed
     }
@@ -1503,27 +1583,27 @@ CORBA::TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
     {
       // Equality of repoIDs is sufficient for equivalence.
       if (equiv_only)
-        return 1;
+        {
+          return 1;
+        }
     }
 
-  // Now compare names. They may be optional - skipped by equivalent().
-  if (!equiv_only)
-    {
-      const char *my_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+  // Now compare names. They may be optional.
+  const char *my_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
 
-      const char *tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+  const char *tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
 
-      // Compare names if they exist.
-      if (ACE_OS::strlen (my_name) > 1
-          && ACE_OS::strlen (tc_name) > 1
-          && ACE_OS::strcmp (my_name,
-                             tc_name)) // not same
-        return 0;
+  // Compare names if they exist.
+  if (ACE_OS::strlen (my_name) > 1
+      && ACE_OS::strlen (tc_name) > 1
+      && ACE_OS::strcmp (my_name, tc_name) != 0) // not same
+    {
+      return 0;
     }
 
-  // Check if the member count is same
+  // Check if the member count is same.
   CORBA::ULong my_count = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -1531,36 +1611,36 @@ CORBA::TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
   ACE_CHECK_RETURN (0);
 
   if (my_count != tc_count)
-    return 0; // number of members don't match
+    {
+      return 0; // number of members don't match
+    }
 
   for (CORBA::ULong i = 0; i < my_count; ++i)
     {
-      // Check if member names are same - skipped by equivalent().
-      if (!equiv_only)
-        {
-          const char *my_member_name =
-            this->member_name (i
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+      // Check if member names are same.
+      const char *my_member_name = 
+        this->member_name (i
+                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
 
-          const char *tc_member_name =
-            tc->member_name (i
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+      const char *tc_member_name = 
+        tc->member_name (i
+                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
 
-          if (ACE_OS::strlen (my_member_name) > 1
-              && ACE_OS::strlen (tc_member_name) > 1
-              && ACE_OS::strcmp (my_member_name,
-                                 tc_member_name)) // not same
-            return 0;
+      if (ACE_OS::strlen (my_member_name) > 1
+          && ACE_OS::strlen (tc_member_name) > 1
+          && ACE_OS::strcmp (my_member_name, tc_member_name) != 0)
+        {
+          return 0;
         }
 
-      // now compare the typecodes of the members
-      CORBA::TypeCode_var my_member_tc =
+      // Now compare the typecodes of the members.
+      CORBA::TypeCode_var my_member_tc = 
         this->member_type (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc =
+      CORBA::TypeCode_var tc_member_tc = 
         tc->member_type (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
@@ -1569,14 +1649,15 @@ CORBA::TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
                                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      if (!flag)
-        return 0;
+      if (flag == 0)
+        {
+          return 0;
+        }
     }
 
   return 1; // success
 }
 
-
 //@@ boris: This version is incomplete...
 CORBA::Boolean
 CORBA::TypeCode::private_equal_valuetype (
@@ -1585,7 +1666,7 @@ CORBA::TypeCode::private_equal_valuetype (
     ACE_ENV_ARG_DECL
   ) const
 {
-  // compare the repoID and name, of which the name is optional as per GIOP
+  // Compare the repoID and name, of which the name is optional as per GIOP
   // spec. However, the repoID is mandatory.
   const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -1593,36 +1674,145 @@ CORBA::TypeCode::private_equal_valuetype (
   const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  if (!ACE_OS::strcmp (my_id, tc_id))
+  if (ACE_OS::strcmp (my_id, tc_id) != 0)
+    {
+      return 0;
+    }
+  else
     {
       // Equality of repoIDs is sufficient for equivalence.
       if (equiv_only)
         {
           return 1;
         }
-      // Name check is skipped by equivalent().
-      else
+    }
+
+  // Now check their names.
+  const char *myname = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  const char *tcname = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  if (ACE_OS::strlen (myname) > 1
+      && ACE_OS::strlen (tcname) > 1
+      && ACE_OS::strcmp (myname, tcname) != 0)
+    {
+      return 0; // failed
+    }
+
+  // Compare value modifiers.
+  CORBA::ValueModifier my_vm = 
+    this->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  CORBA::ValueModifier tc_vm = 
+    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  if (my_vm != tc_vm)
+    {
+      return 0;
+    }
+
+  // Check if the member count is same.
+  CORBA::ULong my_count = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  CORBA::ULong tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  if (my_count != tc_count)
+    {
+      return 0; // number of members don't match
+    }
+
+  // The checks below indicate that we have a recursive union.
+  CORBA::TypeCode_ptr par = this->parent_;
+
+  if (par != 0)
+    {
+      if (this->tc_base_ == this->root_tc_base_)
         {
-          // Same repository IDs.  Now check their names.
-          const char *myname = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          return 1;
+        }
 
-          const char *tcname = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+      CORBA::TypeCode_ptr tc_par = tc->parent_;
 
-          if ((ACE_OS::strlen (myname) > 1)
-              && (ACE_OS::strlen (tcname) > 1))
+      if (tc_par)
+        {
+          CORBA::TypeCode_ptr gpar = par->parent_;
+          CORBA::TypeCode_ptr tc_gpar = tc_par->parent_;
+
+          if (gpar != 0
+              && tc_gpar != 0
+              && this->tc_base_ == gpar->tc_base_
+              && tc->tc_base_ == tc_gpar->tc_base_)
             {
-              // both of them specify names, compare them
-              if (!ACE_OS::strcmp (myname, tcname))
-                return 1; // success
-              else
-                return 0; // failed
+              return 1;
             }
-          return 1; // success
         }
     }
-  return 0; // failed
+
+  for (CORBA::ULong i = 0; i < my_count; ++i)
+    {
+      // Check if the member visibilities are the same.
+      CORBA::Visibility my_vs = 
+        this->member_visibility (i
+                                 ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      CORBA::Visibility tc_vs = 
+        tc->member_visibility (i
+                               ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      if (my_vs != tc_vs)
+        {
+          return 0;
+        }
+
+      // Check if the (optional) member names are same.
+      const char *my_member_name = 
+        this->member_name (i
+                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      const char *tc_member_name = 
+        tc->member_name (i
+                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      if (ACE_OS::strlen (my_member_name) > 1
+          && ACE_OS::strlen (tc_member_name) > 1
+          && ACE_OS::strcmp (my_member_name, tc_member_name) != 0)
+        {
+          return 0;
+        }
+
+      // Now compare the typecodes of the members.
+      CORBA::TypeCode_var my_member_tc = 
+        this->member_type (i 
+                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      CORBA::TypeCode_var tc_member_tc = 
+        tc->member_type (i 
+                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (),
+                                                      equiv_only
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      if (flag == 0)
+        {
+          return 0;
+        }
+    }
+
+  return 1;
 }
 
 
@@ -1649,12 +1839,20 @@ CORBA::TypeCode::private_id (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_alias:
     case CORBA::tk_except:
     case CORBA::tk_value:
+    case CORBA::tk_component:
+    case CORBA::tk_home:
+    case CORBA::tk_event:
       {
         // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                          guard,
+                          this->private_state_->mutex_, 
+                          0);
+
         if (this->private_state_->tc_id_known_)
-          return this->private_state_->tc_id_;
+          {
+            return this->private_state_->tc_id_;
+          }
 
         this->private_state_->tc_id_known_ = 1;
         this->private_state_->tc_id_ = (ACE_const_cast (char *, buffer_)
@@ -1667,7 +1865,8 @@ CORBA::TypeCode::private_id (ACE_ENV_SINGLE_ARG_DECL) const
       }
     // No other typecodes ever have type IDs
     default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 
+                        0);
     }
 }
 
@@ -1689,12 +1888,20 @@ CORBA::TypeCode::private_name (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_alias:
     case CORBA::tk_except:
     case CORBA::tk_value:
+    case CORBA::tk_component:
+    case CORBA::tk_home:
+    case CORBA::tk_event:
       {
         // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                          guard,
+                          this->private_state_->mutex_, 
+                          0);
+
         if (this->private_state_->tc_name_known_)
-          return this->private_state_->tc_name_;
+          {
+            return this->private_state_->tc_name_;
+          }
 
         // setup an encapsulation.
         TAO_InputCDR stream (this->buffer_ + 4,
@@ -1712,13 +1919,16 @@ CORBA::TypeCode::private_name (ACE_ENV_SINGLE_ARG_DECL) const
             return this->private_state_->tc_name_;
           }
         else
-          ACE_THROW_RETURN (CORBA::INTERNAL (), (char*)0);
+          {
+            ACE_THROW_RETURN (CORBA::INTERNAL (), 
+                              0);
+          }
       }
     // No other typecodes ever have type IDs.
     default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (char*)0);
+      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
+                        0);
     }
-  ACE_NOTREACHED (return 0);
 }
 
 // Return the number of members defined by this typecode
@@ -1729,31 +1939,34 @@ CORBA::TypeCode::private_name (ACE_ENV_SINGLE_ARG_DECL) const
 CORBA::ULong
 CORBA::TypeCode::private_member_count (ACE_ENV_SINGLE_ARG_DECL) const
 {
+  // Double checked locking...
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                    guard,
+                    this->private_state_->mutex_,
+                    0);
+
+  CORBA::ULong members;
+  // setup an encapsulation
+  TAO_InputCDR stream (this->buffer_+4,
+                       this->length_-4,
+                       this->byte_order_);
+
   switch (kind_)
     {
     case CORBA::tk_alias:
+    case CORBA::tk_value_box:
       return 1;
-
     case CORBA::tk_enum:
     case CORBA::tk_except:
     case CORBA::tk_struct:
       {
-        // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                          guard,
-                          this->private_state_->mutex_,
-                          0);
         if (this->private_state_->tc_member_count_known_)
-          return this->private_state_->tc_member_count_;
-
-        CORBA::ULong members;
-        // setup an encapsulation
-        TAO_InputCDR stream (this->buffer_+4,
-                             this->length_-4,
-                             this->byte_order_);
+          {
+            return this->private_state_->tc_member_count_;
+          }
 
-        // skip rest of header (type ID and name) and collect the
-        // number of struct members
+        // Skip rest of header (type ID and name) and collect the
+        // number of struct members.
         if (!stream.skip_string ()          // ID
             || !stream.skip_string ()       // struct name
             || !stream.read_ulong (members))
@@ -1768,24 +1981,13 @@ CORBA::TypeCode::private_member_count (ACE_ENV_SINGLE_ARG_DECL) const
       }
     case CORBA::tk_union:
       {
-        // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                          guard,
-                          this->private_state_->mutex_,
-                          0);
         if (this->private_state_->tc_member_count_known_)
           {
             return this->private_state_->tc_member_count_;
           }
 
-        CORBA::ULong members;
-        // setup an encapsulation
-        TAO_InputCDR stream (this->buffer_+4,
-                             this->length_-4,
-                             this->byte_order_);
-
-        // skip rest of header (type ID, name, etc...) and collect the
-        // number of struct members
+        // Skip rest of header (type ID, name, etc...) and collect the
+        // number of struct members.
         if (!stream.skip_string ()                    // ID
             || !stream.skip_string ()                 // struct name
             || !this->skip_typecode (stream)          // discriminant TC
@@ -1801,42 +2003,29 @@ CORBA::TypeCode::private_member_count (ACE_ENV_SINGLE_ARG_DECL) const
         return this->private_state_->tc_member_count_;
       }
     case CORBA::tk_value:
+    case CORBA::tk_event:
       {
-        // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                          guard,
-                          this->private_state_->mutex_,
-                          0);
         if (this->private_state_->tc_member_count_known_)
           {
             return this->private_state_->tc_member_count_;
           }
 
-        CORBA::ULong members;
-        // setup an encapsulation
-        TAO_InputCDR stream (this->buffer_+4,
-                             this->length_-4,
-                             this->byte_order_);
-
         // skip rest of header (type ID, name, etc) and collect the
         // number of value members
         CORBA::ULong tc_kind_holder;
         CORBA::TCKind tc_kind;
 
-        // @@@ (JP) When the IDL compiler is updated to create typecodes
-        // using a CDR stream, ValueModifier will have to be changed to
-        // skip_short.
         if (!stream.skip_string ()          // ID
             || !stream.skip_string ()       // Name
-            || !stream.skip_long ()         // ValueModifier
+            || !stream.skip_short ()        // ValueModifier
             || !stream.read_ulong (tc_kind_holder)) // Base's TCKind
           {
             ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
                               0);
           }
 
-        tc_kind = ACE_static_cast (CORBA::TCKind, tc_kind_holder);
-
+        tc_kind = ACE_static_cast (CORBA::TCKind, 
+                                   tc_kind_holder);
 
         // The tc_kind can be either tk_null or tk_value.
         // In the latter case we should skip encapsulation or
@@ -1876,19 +2065,20 @@ CORBA::TypeCode::private_member_count (ACE_ENV_SINGLE_ARG_DECL) const
       ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
                         0);
     }
-
-  ACE_NOTREACHED (return 0);
 }
 
 //
-// Applicable only to struct, union, and except
+// Applicable only to struct, union, except, value and event.
 //
 
 CORBA::TypeCode_ptr
 CORBA::TypeCode::private_member_type (CORBA::ULong slot
                                       ACE_ENV_ARG_DECL) const
 {
-  CORBA::ULong temp, mcount;
+  CORBA::ULong temp = 0;
+  CORBA::ULong i = 0;
+  CORBA::ULong mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   // Build the de-encapsulating CDR stream, bypassing the stringent
   // alignment tests (we're a bit looser in what we need here, and we
@@ -1896,190 +2086,162 @@ CORBA::TypeCode::private_member_type (CORBA::ULong slot
   TAO_InputCDR stream (this->buffer_+4,
                        this->length_-4,
                        this->byte_order_);
-  CORBA::TypeCode_var tc = 0;
+  CORBA::TypeCode_var tc;
+  CORBA::TypeCode_ptr disc_tc = CORBA::TypeCode::_nil ();
+
+  // Double checked locking...
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                    guard,
+                    this->private_state_->mutex_,
+                    CORBA::TypeCode::_nil ());
 
   switch (kind_)
     {
     case CORBA::tk_except:
-    case CORBA::tk_struct:              // index from 0
-      mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                          guard,
-                          this->private_state_->mutex_,
-                          CORBA::TypeCode::_nil ());
-        if (this->private_state_->tc_member_type_list_known_)
-          {
-            if (slot < mcount)
-              {
-                return  this->private_state_->tc_member_type_list_[slot];
-              }
-            else
-              {
-                ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                                  CORBA::TypeCode::_nil ());
-              }
-          }
-
-        // the first time in. Precompute and store types of all members
+    case CORBA::tk_struct:
+      if (this->private_state_->tc_member_type_list_known_)
+        {
+          if (slot < mcount)
+            {
+              return this->private_state_->tc_member_type_list_[slot];
+            }
+          else
+            {
+              ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
+                                CORBA::TypeCode::_nil ());
+            }
+        }
 
-        // Allocate a list to hold the member typecodes
-        ACE_NEW_THROW_EX (this->private_state_->tc_member_type_list_,
-                          CORBA::TypeCode_ptr[mcount],
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      // the first time in. Precompute and store types of all members
 
-        // skip the id, name, and member_count part
-        if (!stream.skip_string ()        // type ID, hidden
-            || !stream.skip_string ()     // typedef name
-            || !stream.read_ulong (temp))  // member count
-          {
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              CORBA::TypeCode::_nil ());
-          }
+      // Allocate a list to hold the member typecodes
+      ACE_NEW_THROW_EX (this->private_state_->tc_member_type_list_,
+                        CORBA::TypeCode_ptr[mcount],
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-        // compute the typecodes for all the members and
-        // return the required one.
-        for (CORBA::ULong i = 0; i < mcount; ++i)
-          // the ith entry will have the typecode of the ith guy
-          {
-            if (!stream.skip_string ())  // skip the name
-              {
-                ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                                  CORBA::TypeCode::_nil ());
-              }
+      // skip the id, name, and member_count part
+      if (!stream.skip_string ()        // type ID, hidden
+          || !stream.skip_string ()     // typedef name
+          || !stream.read_ulong (temp))  // member count
+        {
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                            CORBA::TypeCode::_nil ());
+        }
 
-            CORBA::TypeCode_ptr& member_type =
-              this->private_state_->tc_member_type_list_[i];
-            CORBA::TypeCode::_tao_decode (this,
-                                         stream,
-                                         member_type
-                                         ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-          }
+      // compute the typecodes for all the members and
+      // return the required one.
+      for (i = 0; i < mcount; ++i)
+        // the ith entry will have the typecode of the ith guy
+        {
+          if (!stream.skip_string ())  // skip the name
+            {
+              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                                CORBA::TypeCode::_nil ());
+            }
 
-        this->private_state_->tc_member_type_list_known_ = 1;
+          CORBA::TypeCode_ptr& member_type =
+            this->private_state_->tc_member_type_list_[i];
+          CORBA::TypeCode::_tao_decode (this,
+                                       stream,
+                                       member_type
+                                       ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+        }
 
-        if (slot < mcount)
-          {
-            return this->private_state_->tc_member_type_list_[slot];
-          }
-        else
-          {
-            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                              CORBA::TypeCode::_nil ());
-          }
-      }
+      this->private_state_->tc_member_type_list_known_ = 1;
 
-      ACE_NOTREACHED (break;)
+      if (slot < mcount)
+        {
+          return this->private_state_->tc_member_type_list_[slot];
+        }
+      else
+        {
+          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
+                            CORBA::TypeCode::_nil ());
+        }
+    case CORBA::tk_union:
+      if (this->private_state_->tc_member_type_list_known_)
+        {
+          if (slot < mcount)
+            {
+              return  this->private_state_->tc_member_type_list_[slot];
+            }
+          else
+            {
+              ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
+                                CORBA::TypeCode::_nil ());
+            }
+        }
 
-    case CORBA::tk_union:            // index from 0
-      mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
+      // the first time in. Precompute and store types of all members
+      ACE_NEW_THROW_EX (this->private_state_->tc_member_type_list_,
+                        CORBA::TypeCode_ptr[mcount],
+                        CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                          guard,
-                          this->private_state_->mutex_,
-                          CORBA::TypeCode::_nil ());
-        if (this->private_state_->tc_member_type_list_known_)
-          {
-            if (slot < mcount)
-              {
-                return  this->private_state_->tc_member_type_list_[slot];
-              }
-            else
-              {
-                ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                                  CORBA::TypeCode::_nil ());
-              }
-          }
-
-        // the first time in. Precompute and store types of all members
-        ACE_NEW_THROW_EX (this->private_state_->tc_member_type_list_,
-                          CORBA::TypeCode_ptr[mcount],
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-        // skip the id, name, and discrimant type part
-        if (!stream.skip_string ()              // type ID, hidden
-            || !stream.skip_string ()           // typedef name
-            || !this->skip_typecode (stream))   // skip discriminant typecode
-          {
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              CORBA::TypeCode::_nil ());
-          }
-        else if (!stream.read_ulong (temp)      // default used
-                 || !stream.read_ulong (temp))  // member count
-          {
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              CORBA::TypeCode::_nil ());
-          }
-
-        // get the typecode for the discriminator
-        CORBA::TypeCode_ptr disc_tc =
-          this->private_discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-        // compute the typecodes for all the members and return the
-        // required one
-        ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-        for (CORBA::ULong i = 0; i < mcount; ++i)
-          // the ith entry will have the typecode of the ith guy
-          {
-            // skip member label
-            CORBA::TypeCode::traverse_status status =
-              TAO_Marshal_Object::perform_skip (disc_tc,
-                                                &stream
-                                                ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      // skip the id, name, and discrimant type part
+      if (!stream.skip_string ()              // type ID, hidden
+          || !stream.skip_string ()           // typedef name
+          || !this->skip_typecode (stream))   // skip discriminant typecode
+        {
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                            CORBA::TypeCode::_nil ());
+        }
+      else if (!stream.read_ulong (temp)      // default used
+               || !stream.read_ulong (temp))  // member count
+        {
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                            CORBA::TypeCode::_nil ());
+        }
 
-            if (status != CORBA::TypeCode::TRAVERSE_CONTINUE
-                || !stream.skip_string ())  // skip the name
-              {
-                ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                                  CORBA::TypeCode::_nil ());
-              }
+      // Get the typecode for the discriminator.
+      disc_tc =
+        this->private_discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+      // Compute the typecodes for all the members and return the
+      // required one.
+      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-            CORBA::TypeCode_ptr& member_type =
-              this->private_state_->tc_member_type_list_[i];
-            CORBA::TypeCode::_tao_decode (this,
-                                         stream,
-                                         member_type
-                                         ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-          }
+      for (i = 0; i < mcount; ++i)
+        // The ith entry will have the typecode of the ith guy.
+        {
+          // Skip member label.
+          CORBA::TypeCode::traverse_status status =
+            TAO_Marshal_Object::perform_skip (disc_tc,
+                                              &stream
+                                              ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-        this->private_state_->tc_member_type_list_known_ = 1;
+          if (status != CORBA::TypeCode::TRAVERSE_CONTINUE
+              || !stream.skip_string ())  // skip the name
+            {
+              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                                CORBA::TypeCode::_nil ());
+            }
 
-        if (slot < mcount)
-          {
-            return this->private_state_->tc_member_type_list_[slot];
-          }
-        else
-          {
-            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                              CORBA::TypeCode::_nil ());
-          }
-      }
+          CORBA::TypeCode_ptr& member_type =
+            this->private_state_->tc_member_type_list_[i];
+          CORBA::TypeCode::_tao_decode (this,
+                                       stream,
+                                       member_type
+                                       ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+        }
 
-      ACE_NOTREACHED (break);
+      this->private_state_->tc_member_type_list_known_ = 1;
 
+      if (slot < mcount)
+        {
+          return this->private_state_->tc_member_type_list_[slot];
+        }
+      else
+        {
+          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
+                            CORBA::TypeCode::_nil ());
+        }
     case CORBA::tk_value:
-      mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-      {
-        // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                          guard,
-                          this->private_state_->mutex_,
-                          CORBA::TypeCode::_nil ());
-
-        if (this->private_state_->tc_member_type_list_known_)
+    case CORBA::tk_event:
+      if (this->private_state_->tc_member_type_list_known_)
         {
           if (slot < mcount)
             {
@@ -2092,118 +2254,107 @@ CORBA::TypeCode::private_member_type (CORBA::ULong slot
             }
         }
 
-        // the first time in. Precompute and store types of all members
+      // the first time in. Precompute and store types of all members
 
-        // Allocate a list to hold the member typecodes
-        ACE_NEW_THROW_EX (this->private_state_->tc_member_type_list_,
-                          CORBA::TypeCode_ptr [mcount],
-                          CORBA::NO_MEMORY ());
-
-        ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-        // skip rest of header (type ID, name, etc) and collect the
-        // number of value members
-        CORBA::ULong tc_kind_holder;
-        CORBA::TCKind tc_kind;
+      // Allocate a list to hold the member typecodes
+      ACE_NEW_THROW_EX (this->private_state_->tc_member_type_list_,
+                        CORBA::TypeCode_ptr [mcount],
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-        // @@@ (JP) When the IDL compiler is updated to create typecodes
-        // using a CDR stream, ValueModifier will have to be changed to
-        // skip_short.
-        if (!stream.skip_string ()          // ID
-            || !stream.skip_string ()       // Name
-            || !stream.skip_long ()         // ValueModifier
-            || !stream.read_ulong (tc_kind_holder)) // Base's TCKind
-          {
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              CORBA::TypeCode::_nil ());
-          }
+      // skip rest of header (type ID, name, etc) and collect the
+      // number of value members
+      CORBA::ULong tc_kind_holder;
+      CORBA::TCKind tc_kind;
 
-        tc_kind = ACE_static_cast (CORBA::TCKind, tc_kind_holder);
+      if (!stream.skip_string ()          // ID
+          || !stream.skip_string ()       // Name
+          || !stream.skip_short ()        // ValueModifier
+          || !stream.read_ulong (tc_kind_holder)) // Base's TCKind
+        {
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                            CORBA::TypeCode::_nil ());
+        }
 
-        // The tc_kind can be either tk_null or tk_value.
-        // In the latter case we should skip encapsulation or
-        // indirection - whatever comes in.
-        CORBA::ULong encap_length;
+      tc_kind = ACE_static_cast (CORBA::TCKind, tc_kind_holder);
 
-        if (tc_kind != CORBA::tk_null)
-          {
-            if (!stream.read_ulong (encap_length))
-              {
-                ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                                  CORBA::TypeCode::_nil ());
-              }
+      // The tc_kind can be either tk_null or tk_value.
+      // In the latter case we should skip encapsulation or
+      // indirection - whatever comes in.
+      CORBA::ULong encap_length;
 
-            if (tc_kind_holder != 0xffffffff) // check for indirection
-              {
-                if (!stream.skip_bytes (encap_length))
-                  {
-                    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                                      CORBA::TypeCode::_nil ());
-                  }
-              }
-          }
-
-        // Now skip member count.
-        if (!stream.skip_ulong ())
-          {
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              CORBA::TypeCode::_nil ());
-          }
+      if (tc_kind != CORBA::tk_null)
+        {
+          if (!stream.read_ulong (encap_length))
+            {
+              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                                CORBA::TypeCode::_nil ());
+            }
 
-        // compute the typecodes for all the members and
-        // return the required one.
-        for (CORBA::ULong i = 0; i < mcount; ++i)
-          // the ith entry will have the typecode of the ith guy
-          {
-            if (!stream.skip_string ())  // skip the name
-              {
-                ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                                  CORBA::TypeCode::_nil ());
-              }
+          if (tc_kind_holder != 0xffffffff) // check for indirection
+            {
+              if (!stream.skip_bytes (encap_length))
+                {
+                  ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                                    CORBA::TypeCode::_nil ());
+                }
+            }
+        }
 
-            CORBA::TypeCode_ptr& member_type =
-              this->private_state_->tc_member_type_list_[i];
-            CORBA::TypeCode::_tao_decode (this,
-                                         stream,
-                                         member_type
-                                         ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      // Now skip member count.
+      if (!stream.skip_ulong ())
+        {
+          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                            CORBA::TypeCode::_nil ());
+        }
 
-            // @@@ (JP) When the IDL compiler is updated to create typecodes
-            // using a CDR stream, this will have to be changed to
-            // skip_short.
-            if (!stream.skip_long ())  // skip member visibility
-              {
-                ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                                  CORBA::TypeCode::_nil ());
-              }
-          }
+      // Compute the typecodes for all the members and
+      // return the required one.
+      for (i = 0; i < mcount; ++i)
+        // The ith entry will have the typecode of the ith guy.
+        {
+          if (!stream.skip_string ())  // skip the name
+            {
+              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                                CORBA::TypeCode::_nil ());
+            }
 
-        this->private_state_->tc_member_type_list_known_ = 1;
+          CORBA::TypeCode_ptr& member_type =
+            this->private_state_->tc_member_type_list_[i];
+          CORBA::TypeCode::_tao_decode (this,
+                                       stream,
+                                       member_type
+                                       ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-        if (slot < mcount)
-          {
-            return this->private_state_->tc_member_type_list_[slot];
-          }
-        else
-          {
-            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                              CORBA::TypeCode::_nil ());
-          }
-      }
+          if (!stream.skip_short ())  // skip member visibility
+            {
+              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                                CORBA::TypeCode::_nil ());
+            }
+        }
 
-      ACE_NOTREACHED (break;)
+      this->private_state_->tc_member_type_list_known_ = 1;
 
+      if (slot < mcount)
+        {
+          return this->private_state_->tc_member_type_list_[slot];
+        }
+      else
+        {
+          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
+                            CORBA::TypeCode::_nil ());
+        }
     default:
-      // bad kind
+      // Bad kind.
       ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
                         CORBA::TypeCode::_nil ());
     }
 }
 
 // Return the name for the nth member
-// Applicable only to CORBA::tk_struct, CORBA::tk_union, CORBA::tk_enum, and
-// CORBA::tk_except
+// Applicable only to CORBA::tk_struct, CORBA::tk_union, CORBA::tk_enum,
+// CORBA::tk_except, tk_value and tk_event.
 const char *
 CORBA::TypeCode::private_member_name (CORBA::ULong slot
                                       ACE_ENV_ARG_DECL) const
@@ -2213,23 +2364,32 @@ CORBA::TypeCode::private_member_name (CORBA::ULong slot
   // Build the de-encapsulating CDR stream, bypassing the stringent
   // alignment tests (we're a bit looser in what we need here, and we
   // _know_ we're OK).  Then skip the byte order code.
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
+  TAO_InputCDR stream (this->buffer_+4, 
+                       this->length_-4,
                        this->byte_order_);
-  CORBA::TypeCode_var tc = 0;
 
   mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   // out of bounds
-  ACE_CHECK_RETURN ((char *)0);
+  ACE_CHECK_RETURN (0);
 
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
-                    this->private_state_->mutex_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                    guard,
+                    this->private_state_->mutex_, 
+                    0);
 
   if (this->private_state_->tc_member_name_list_known_)
-    if (slot < mcount)
-      return this->private_state_->tc_member_name_list_[slot];
-    else
-      ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+    {
+      if (slot < mcount)
+        {
+          return this->private_state_->tc_member_name_list_[slot];
+        }
+      else
+        {
+          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 
+                            0);
+        }
+    }
 
   // the first time in. Precompute and store names of all members
   // Allocate a list to hold the member names
@@ -2237,11 +2397,6 @@ CORBA::TypeCode::private_member_name (CORBA::ULong slot
                     char* [mcount],
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
-  // this->private_state_->tc_member_name_list_ = new char* [mcount];
-
-  if (this->private_state_->tc_member_name_list_ == 0)
-      // no memory for the member_list
-      ACE_THROW_RETURN (CORBA::NO_MEMORY (), (char *)0);
 
   switch (kind_)
     {
@@ -2251,56 +2406,76 @@ CORBA::TypeCode::private_member_name (CORBA::ULong slot
         if (!stream.skip_string ()     // type ID, hidden
             || !stream.skip_string ()     // enum name
             || !stream.read_ulong (temp)) // member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (char *)0);
+          {
+            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                              0);
+          }
 
         // compute the typecodes for all the members and
         // return the required one.
         for (CORBA::ULong i = 0; i < mcount; ++i)
-          // now read this name
+          {
+          // Now read this name.
           if (!stream.read_string (
                       this->private_state_->tc_member_name_list_ [i]
                       ))
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (char *)0);
+            {
+              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                                0);
+            }
+          }
 
         this->private_state_->tc_member_name_list_known_ = 1;
 
         if (slot < mcount)
-          return this->private_state_->tc_member_name_list_[slot];
+          {
+            return this->private_state_->tc_member_name_list_[slot];
+          }
         else
-          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
+          {
+            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
+                              0);
+          }
       }
-      ACE_NOTREACHED (break;)
-
     case CORBA::tk_except:
-    case CORBA::tk_struct:              // index from 0
+    case CORBA::tk_struct:
       {
-        // skip the id, name, and member_count part
+        // Skip the id, name, and member_count part.
         if (!stream.skip_string ()        // type ID, hidden
             || !stream.skip_string ()     // struct/except name
             || !stream.read_ulong (temp)) // member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (char *)0);
+          {
+            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                              0);
+          }
 
-        // compute the typecodes for all the members and
-          // return the required one.
+        // Computes the typecodes for all the members and
+        // return the required one.
         for (CORBA::ULong i = 0; i < mcount; ++i)
           {
             if (!stream.read_string (
-                   this->private_state_->tc_member_name_list_ [i]
+                     this->private_state_->tc_member_name_list_[i]
                    )
-              || !this->skip_typecode (stream))
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+                || !this->skip_typecode (stream))
+              {
+                ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 
+                                  0);
+              }
           }
 
         this->private_state_->tc_member_name_list_known_ = 1;
 
         if (slot < mcount)
-          return this->private_state_->tc_member_name_list_[slot];
+          {
+            return this->private_state_->tc_member_name_list_[slot];
+          }
         else
-          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
+          {
+            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
+                              0);
+          }
 
       }
-      ACE_NOTREACHED (break;)
-
     case CORBA::tk_union:            // index from 0
       {
         // skip the id, name, and discrimant type part
@@ -2344,19 +2519,97 @@ CORBA::TypeCode::private_member_name (CORBA::ULong slot
             this->private_state_->tc_member_name_list_known_ = 1;
 
             if (slot < mcount)
-              return this->private_state_->tc_member_name_list_[slot];
+              {
+                return this->private_state_->tc_member_name_list_[slot];
+              }
             else
-              ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
-
+              {
+                ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
+                                  0);
+              }
           }
       }
-      ACE_NOTREACHED (break;)
+    case CORBA::tk_value:
+    case CORBA::tk_event:
+      {
+        // Skip rest of header (type ID, name, etc) and skip the
+        // number of value members.
+        CORBA::ULong tc_kind_holder;
+        CORBA::TCKind tc_kind;
 
+        if (!stream.skip_string ()          // ID
+            || !stream.skip_string ()       // Name
+            || !stream.skip_short ()        // ValueModifier
+            || !stream.read_ulong (tc_kind_holder)) // Base's TCKind
+          {
+            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                              0);
+          }
+
+        tc_kind = ACE_static_cast (CORBA::TCKind, tc_kind_holder);
+
+        // The tc_kind can be either tk_null or tk_value.
+        // In the latter case we should skip encapsulation or
+        // indirection - whatever comes in.
+        CORBA::ULong encap_length;
+
+        if (tc_kind != CORBA::tk_null)
+          {
+            if (!stream.read_ulong (encap_length))
+              {
+                ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                                  0);
+              }
+
+            if (tc_kind_holder != 0xffffffff) // check for indirection
+              {
+                if (!stream.skip_bytes (encap_length))
+                  {
+                    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                                      0);
+                  }
+              }
+          }
+
+        // Now skip member count.
+        if (!stream.skip_ulong ())
+          {
+            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                              0);
+          }
+
+        // Compute the names for all the members, skip the other
+        // member parameters and return the required name.
+        for (CORBA::ULong i = 0; i < mcount; ++i)
+          {
+            if (!stream.read_string (
+                     this->private_state_->tc_member_name_list_[i]
+                   )
+                || !this->skip_typecode (stream)    // member typecode
+                || !stream.skip_short ())           // member visibility
+              {
+                ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 
+                                  0);
+              }
+          }
+
+        this->private_state_->tc_member_name_list_known_ = 1;
+
+        if (slot < mcount)
+          {
+            return this->private_state_->tc_member_name_list_[slot];
+          }
+        else
+          {
+            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
+                              0);
+          }
+      }
     default:
-      // bad kind
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (char *)0);
+      // Bad kind.
+      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
+                        0);
     }
-  ACE_NOTREACHED (return (char *)0;)
 }
 
 // Return member labels for CORBA::tk_union typecodes.
@@ -2366,7 +2619,10 @@ CORBA::TypeCode::private_member_label (CORBA::ULong n
 {
   // this function is only applicable to the CORBA::tk_union TC
   if (this->kind_ != CORBA::tk_union)
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+    {
+      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
+                        0);
+    }
 
   TAO_InputCDR stream (this->buffer_+4,
                        this->length_-4,
@@ -2376,7 +2632,10 @@ CORBA::TypeCode::private_member_label (CORBA::ULong n
   if (!stream.skip_string ()       // type ID, hidden
       || !stream.skip_string ()    // typedef name
       || !this->skip_typecode (stream))  // skip discriminant typecode
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+    {
+      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
+                        0);
+    }
 
       // skip default used, and get member count
   CORBA::ULong member_count;
@@ -2387,22 +2646,32 @@ CORBA::TypeCode::private_member_label (CORBA::ULong n
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TypeCode::private_member_label -- ")
                   ACE_TEXT ("error reading from stream")));
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 
+                        0);
     }
 
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
-                    this->private_state_->mutex_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                    guard,
+                    this->private_state_->mutex_, 
+                    0);
+
   if (this->private_state_->tc_member_label_list_known_)
-    if (n < member_count)
-      return this->private_state_->tc_member_label_list_[n];
-    else
-      ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+    {
+      if (n < member_count)
+        {
+          return this->private_state_->tc_member_label_list_[n];
+        }
+      else
+        {
+          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
+                            0);
+        }
+    }
 
-  // member labels are of type Any. However, the actual types are
+  // MJember labels are of type Any. However, the actual types are
   // restricted to simple types
 
-
   // @@EXC@@ We should use Auto_Ptr_Array to make this exception
   // safe.
   CORBA::Any_ptr* label_list;
@@ -2499,14 +2768,24 @@ CORBA::TypeCode::private_member_label (CORBA::ULong n
             }
         }
 
+      TAO::Unknown_IDL_Type *impl = 0;
+      ACE_NEW_THROW_EX (impl,
+                        TAO::Unknown_IDL_Type (
+                            CORBA::TypeCode::_duplicate (label_tc),
+                            out.begin (),
+                            ACE_CDR_BYTE_ORDER,
+                            1
+                          ),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (0);
+
       ACE_NEW_THROW_EX (label_list[i],
-                        CORBA::Any (label_tc,
-                                    0,
-                                    ACE_CDR_BYTE_ORDER,
-                                    out.begin ()),
+                        CORBA::Any,
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
+      label_list[i]->replace (impl);
+
       if (stream.skip_string () == 0
           || this->skip_typecode (stream) == 0)
         {
@@ -2526,7 +2805,10 @@ CORBA::TypeCode::private_member_label (CORBA::ULong n
   // If caller asked for the label for a nonexistent member, they get
   // an error report!
   if (n >= member_count)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+    {
+      ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
+                        0);
+    }
 
   return this->private_state_->tc_member_label_list_[n];
 }
@@ -2537,8 +2819,10 @@ CORBA::TypeCode::private_discriminator_type (
   ) const
 {
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
-                    this->private_state_->mutex_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                    guard,
+                    this->private_state_->mutex_, 
+                    0);
 
   return this->private_discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
@@ -2549,21 +2833,27 @@ CORBA::TypeCode::private_discriminator_type_i (
   ) const
 {
   if (this->private_state_->tc_discriminator_type_known_)
-    return this->private_state_->tc_discriminator_type_;
+    {
+      return this->private_state_->tc_discriminator_type_;
+    }
 
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
+  TAO_InputCDR stream (this->buffer_+4, 
+                       this->length_-4,
                        this->byte_order_);
 
   // skip ID and name, and then get the discriminant TC
 
   if (!stream.skip_string ()      // type ID, hidden
       || !stream.skip_string ())  // typedef name
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+    {
+      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                        0);
+    }
 
   CORBA::TypeCode::_tao_decode (this,
                                stream,
                                this->private_state_->tc_discriminator_type_
-                                ACE_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   this->private_state_->tc_discriminator_type_known_ = 1;
@@ -2576,8 +2866,10 @@ CORBA::TypeCode::private_default_index (
   ) const
 {
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
-                    this->private_state_->mutex_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                    guard,
+                    this->private_state_->mutex_, 
+                    0);
 
   return this->private_default_index_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
@@ -2588,9 +2880,12 @@ CORBA::TypeCode::private_default_index_i (
   ) const
 {
   if (this->private_state_->tc_default_index_used_known_)
-    return this->private_state_->tc_default_index_used_;
+    {
+      return this->private_state_->tc_default_index_used_;
+    }
 
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
+  TAO_InputCDR stream (this->buffer_+4, 
+                       this->length_-4,
                        this->byte_order_);
 
   // skip ID and name, and then get the discriminant TC
@@ -2599,7 +2894,10 @@ CORBA::TypeCode::private_default_index_i (
       || !stream.skip_string ()               // typedef name
       || !this->skip_typecode (stream)        // skip discriminant
       || !stream.read_long (this->private_state_->tc_default_index_used_))
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+    {
+      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                        0);
+    }
 
   this->private_state_->tc_default_index_used_known_ = 1;
   return this->private_state_->tc_default_index_used_;
@@ -2608,7 +2906,8 @@ CORBA::TypeCode::private_default_index_i (
 CORBA::Long
 CORBA::TypeCode::private_length (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
+  TAO_InputCDR stream (this->buffer_+4, 
+                       this->length_-4,
                        this->byte_order_);
   switch (this->kind_)
     {
@@ -2616,31 +2915,42 @@ CORBA::TypeCode::private_length (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_array:
       {
         // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                          guard,
+                          this->private_state_->mutex_, 
+                          0);
+
         if (this->private_state_->tc_length_known_)
-          return this->private_state_->tc_length_;
+          {
+            return this->private_state_->tc_length_;
+          }
 
-        // skip the typecode of the element and get the bounds
+        // Skip the typecode of the element and get the bounds
         if (!this->skip_typecode (stream) // skip typecode
             || !stream.read_ulong (this->private_state_->tc_length_))
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+          {
+            ACE_THROW_RETURN (CORBA::BAD_PARAM (),
+                              0);
+          }
         else
           {
             this->private_state_->tc_length_known_ = 1;
             return this->private_state_->tc_length_;
           }
       }
-      ACE_NOTREACHED (break);
-
     case CORBA::tk_string:
     case CORBA::tk_wstring:
       {
         // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                          guard,
+                          this->private_state_->mutex_, 
+                          0);
+
         if (this->private_state_->tc_length_known_)
-          return this->private_state_->tc_length_;
+          {
+            return this->private_state_->tc_length_;
+          }
 
         if (stream.read_ulong (this->private_state_->tc_length_))
           {
@@ -2648,21 +2958,22 @@ CORBA::TypeCode::private_length (ACE_ENV_SINGLE_ARG_DECL) const
             return this->private_state_->tc_length_;
           }
         else
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+          {
+            ACE_THROW_RETURN (CORBA::BAD_PARAM (),
+                              0);
+          }
       }
-      ACE_NOTREACHED (break);
-
     default:
       ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
                         0);
     }
-  ACE_NOTREACHED (return 0);
 }
 
 CORBA::TypeCode_ptr
 CORBA::TypeCode::private_content_type (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
+  TAO_InputCDR stream (this->buffer_+4, 
+                       this->length_-4,
                        this->byte_order_);
   switch (kind_)
     {
@@ -2670,34 +2981,46 @@ CORBA::TypeCode::private_content_type (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_array:
       {
         // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                          guard,
+                          this->private_state_->mutex_, 
+                          0);
+
         if (this->private_state_->tc_content_type_known_)
-          return this->private_state_->tc_content_type_;
+          {
+            return this->private_state_->tc_content_type_;
+          }
 
         // retrieve the content type
         CORBA::TypeCode::_tao_decode (this,
                                      stream,
                                      this->private_state_->tc_content_type_
-                                      ACE_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         this->private_state_->tc_content_type_known_ = 1;
         return this->private_state_->tc_content_type_;
       }
-      ACE_NOTREACHED (break);
-
     case CORBA::tk_alias:
+    case CORBA::tk_value_box:
       {
         // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
-                          this->private_state_->mutex_, 0);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                          guard,
+                          this->private_state_->mutex_, 
+                          0);
+
         if (this->private_state_->tc_content_type_known_)
-          return this->private_state_->tc_content_type_;
+          {
+            return this->private_state_->tc_content_type_;
+          }
 
         if (!stream.skip_string ()  // typeID
             || !stream.skip_string ()) // name
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+          {
+            ACE_THROW_RETURN (CORBA::BAD_PARAM (),
+                              0);
+          }
 
         CORBA::TypeCode::_tao_decode (this,
                                      stream,
@@ -2708,19 +3031,18 @@ CORBA::TypeCode::private_content_type (ACE_ENV_SINGLE_ARG_DECL) const
         this->private_state_->tc_content_type_known_ = 1;
         return this->private_state_->tc_content_type_;
       }
-      /*NOTREACHED*/
-
     default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 
+                        0);
     }
-  ACE_NOTREACHED (return 0);
 }
 
 CORBA::Visibility
 CORBA::TypeCode::private_member_visibility (CORBA::ULong slot
                                            ACE_ENV_ARG_DECL) const
 {
-  if (this->kind_ != CORBA::tk_value)
+  if (this->kind_ != CORBA::tk_value
+      && this->kind_ != CORBA::tk_event)
     {
       ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
                         CORBA::PRIVATE_MEMBER);
@@ -2736,7 +3058,8 @@ CORBA::TypeCode::private_member_visibility (CORBA::ULong slot
     }
 
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                    guard,
                     this->private_state_->mutex_,
                     0);
 
@@ -2752,12 +3075,9 @@ CORBA::TypeCode::private_member_visibility (CORBA::ULong slot
 
   // Skip rest of header (type ID, name, etc) and collect the
   // number of value members.
-  // @@@ (JP) When the IDL compiler is updated to create typecodes
-  // using a CDR stream, ValueModifier will have to be changed to
-  // skip_short.
   if (!stream.skip_string ()              // ID
       || !stream.skip_string ()           // Name
-      || !stream.skip_long ()             // ValueModifier
+      || !stream.skip_short ()            // ValueModifier
       || !this->skip_typecode (stream)    // Concrete base typecode
       || !stream.skip_ulong ())           // Member count
     {
@@ -2792,14 +3112,16 @@ CORBA::TypeCode::private_member_visibility (CORBA::ULong slot
 CORBA::ValueModifier
 CORBA::TypeCode::private_type_modifier (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  if (this->kind_ != CORBA::tk_value)
+  if (this->kind_ != CORBA::tk_value
+      && this->kind_ != CORBA::tk_event)
     {
       ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
                         0);
     }
 
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                    guard,
                     this->private_state_->mutex_,
                     0);
 
@@ -2835,16 +3157,18 @@ CORBA::TypeCode::private_type_modifier (ACE_ENV_SINGLE_ARG_DECL) const
 CORBA::TypeCode_ptr
 CORBA::TypeCode::private_concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  if (this->kind_ != CORBA::tk_value)
+  if (this->kind_ != CORBA::tk_value
+      && this->kind_ != CORBA::tk_event)
     {
       ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                        0);
+                        CORBA::TypeCode::_nil ());
     }
 
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                    guard,
                     this->private_state_->mutex_,
-                    0);
+                    CORBA::TypeCode::_nil ());
 
   if (this->private_state_->tc_concrete_base_type_known_)
     {
@@ -2858,15 +3182,12 @@ CORBA::TypeCode::private_concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const
 
   // Skip rest of header (type ID, name, etc) and collect the
   // number of value members.
-  // @@@ (JP) When the IDL compiler is updated to create typecodes
-  // using a CDR stream, ValueModifier will have to be changed to
-  // skip_short.
   if (!stream.skip_string ()          // ID
       || !stream.skip_string ()       // Name
-      || !stream.skip_long ())        // ValueModifier
+      || !stream.skip_short ())       // ValueModifier
     {
       ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                        0);
+                        CORBA::TypeCode::_nil ());
     }
 
   // Retrieve the concrete base typecode.
@@ -2874,7 +3195,7 @@ CORBA::TypeCode::private_concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const
                                stream,
                                this->private_state_->tc_concrete_base_type_
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   this->private_state_->tc_concrete_base_type_known_ = 1;
   return this->private_state_->tc_concrete_base_type_;
@@ -2892,7 +3213,9 @@ CORBA::TypeCode::_tao_decode (const CORBA::TypeCode *parent,
   CORBA::ULong kind;
 
   if (!cdr.read_ulong (kind))
-    ACE_THROW (CORBA::BAD_TYPECODE ());
+    {
+      ACE_THROW (CORBA::BAD_TYPECODE ());
+    }
 
   static CORBA::TypeCode_ptr tc_consts [CORBA::TC_KIND_COUNT] =
   {
@@ -2999,7 +3322,9 @@ CORBA::TypeCode::_tao_decode (const CORBA::TypeCode *parent,
                                  cdr.byte_order ());
 
       if (!indir_stream.good_bit ())
-        ACE_THROW (CORBA::BAD_TYPECODE ());
+        {
+          ACE_THROW (CORBA::BAD_TYPECODE ());
+        }
 
       // Get "kind" and length of target typecode
       //
@@ -3014,7 +3339,9 @@ CORBA::TypeCode::_tao_decode (const CORBA::TypeCode *parent,
       if (!indir_stream.read_ulong (indir_kind)
           || indir_kind >= CORBA::TC_KIND_COUNT // no double indirections
           || !indir_stream.read_ulong (indir_len))
-        ACE_THROW (CORBA::BAD_TYPECODE ());
+        {
+          ACE_THROW (CORBA::BAD_TYPECODE ());
+        }
 
       // Now construct indirected typecode.  This shares the
       // typecode octets with the "parent" typecode,
@@ -3047,16 +3374,22 @@ CORBA::TypeCode::_tao_decode (const CORBA::TypeCode *parent,
         CORBA::ULong bound;
 
         if (!cdr.read_ulong (bound))
-          ACE_THROW (CORBA::BAD_TYPECODE ());
+          {
+            ACE_THROW (CORBA::BAD_TYPECODE ());
+          }
 
         if (bound == 0)
           {
             // unbounded string. Let us reuse the ORB owned
             // _tc_string or _tc_wstring
             if (kind == CORBA::tk_string)
-              x = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
+              {
+                x = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
+              }
             else
-              x = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
+              {
+                x = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
+              }
           }
         else
           {
@@ -3101,12 +3434,16 @@ CORBA::TypeCode::_tao_decode (const CORBA::TypeCode *parent,
 
         // get the encapsulation length
         if (!cdr.read_ulong (length))
-          ACE_THROW (CORBA::BAD_TYPECODE ());
+          {
+            ACE_THROW (CORBA::BAD_TYPECODE ());
+          }
 
         // If the length is greater that the containing CDR stream
         // that is an error...
         if (length > cdr.length ())
-          ACE_THROW (CORBA::BAD_TYPECODE ());
+          {
+            ACE_THROW (CORBA::BAD_TYPECODE ());
+          }
 
         // create a new typecode
         ACE_NEW (x,
@@ -3127,6 +3464,13 @@ CORBA::TypeCode::_tao_decode (const CORBA::TypeCode *parent,
 // ****************************************************************
 
 
+void
+CORBA::TypeCode::_tao_any_destructor (void *x)
+{
+  CORBA::TypeCode_ptr tmp = ACE_static_cast (CORBA::TypeCode_ptr, x);
+  CORBA::release (tmp);
+}
+
 // ************ The following are deprecated ****************
 
 // say how many parameters this typecode has; normally a fixed number,
@@ -3144,24 +3488,21 @@ CORBA::TypeCode::param_count (ACE_ENV_SINGLE_ARG_DECL) const
     {
     default:
       return 0;
-
     case CORBA::tk_string:
     case CORBA::tk_wstring:
       return 1;
-
     case CORBA::tk_objref:
     case CORBA::tk_sequence:
     case CORBA::tk_array:
       return 2;
-
     case CORBA::tk_alias:
       return 3;
-
     case CORBA::tk_except:
     case CORBA::tk_struct:
       {
         CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_+4, this->length_-4,
+        TAO_InputCDR stream (this->buffer_+4, 
+                             this->length_-4,
                              this->byte_order_);
 
         // skip rest of header (type ID and name) and collect the
@@ -3169,15 +3510,18 @@ CORBA::TypeCode::param_count (ACE_ENV_SINGLE_ARG_DECL) const
         if (!stream.skip_string ()                  // ID
             || !stream.skip_string ()       // struct name
             || !stream.read_ulong (members))
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          {
+            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                              0);
+          }
 
         return 3 + 2 * members;
       }
-
     case CORBA::tk_enum:
       {
         CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_+4, this->length_-4,
+        TAO_InputCDR stream (this->buffer_+4, 
+                             this->length_-4,
                              this->byte_order_);
 
         // skip rest of header (type ID and name) and collect the
@@ -3185,15 +3529,18 @@ CORBA::TypeCode::param_count (ACE_ENV_SINGLE_ARG_DECL) const
         if (!stream.skip_string ()                      // ID
             || !stream.skip_string ()           // typedef name
             || !stream.read_ulong (members))
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          {
+            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                              0);
+          }
 
         return 3 + members;
       }
-
     case CORBA::tk_union:
       {
         CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_+4, this->length_-4,
+        TAO_InputCDR stream (this->buffer_+4, 
+                             this->length_-4,
                              this->byte_order_);
 
         // skip rest of header (type ID, name, etc...) and collect the
@@ -3203,7 +3550,10 @@ CORBA::TypeCode::param_count (ACE_ENV_SINGLE_ARG_DECL) const
             || !this->skip_typecode (stream)          // discriminant TC
             || !stream.read_ulong (members)           // default used
             || !stream.read_ulong (members))          // real member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          {
+            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
+                              0);
+          }
 
         return 5 + 3 * members;
       }
@@ -3236,20 +3586,31 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
     x->kind_;
 
   if (!cdr.write_ulong (kind))
-    return 0;
+    {
+      return 0;
+    }
 
   switch (kind)
     {
     default:
       break;
 
-      // Indirected typecodes can't occur at "top level" like
-      // this, only nested inside others!
+    // Indirected typecodes can occur at "top level" like
+    // this only when constructing a recursive typecode in the 
+    // TypeCodeFactory. The check for non-null offset map suffices.
     case ~0u:
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "indirected typecode at top level!\n"));
-      return 0;
+      if (x->offset_map () == 0)
+        {
+          return 0;
+        }
+
+      if (!cdr.write_octet_array ((CORBA::Octet*)x->buffer_,
+                                  4))
+        {
+          return 0;
+        }
+
+      break;
 
       // A few have "simple" parameter lists
     case CORBA::tk_string:
@@ -3262,7 +3623,9 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
             ACE_TRY_CHECK;
 
             if (!cdr.write_ulong (length))
-              return 0;
+              {
+                return 0;
+              }
           }
         ACE_CATCHANY
           {
@@ -3288,7 +3651,9 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
         if (!cdr.write_ulong (x->length_)
             || !cdr.write_octet_array ((CORBA::Octet*)x->buffer_,
                                        x->length_))
-          return 0;
+          {
+            return 0;
+          }
       }
       break;
     }
@@ -3301,7 +3666,10 @@ operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
 {
   ACE_TRY_NEW_ENV
     {
-      CORBA::TypeCode::_tao_decode (0, cdr, x ACE_ENV_ARG_PARAMETER);
+      CORBA::TypeCode::_tao_decode (0, 
+                                    cdr, 
+                                    x 
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3314,10 +3682,48 @@ operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var>;
-
+template class TAO_Pseudo_Object_Manager<CORBA::TypeCode, 
+                                         CORBA::TypeCode_var>;
+
+template class ACE_Node<CORBA::Long>;
+template class ACE_Unbounded_Queue<CORBA::Long>;
+template class ACE_Unbounded_Queue_Iterator<CORBA::Long>;
+
+template class ACE_Hash_Map_Entry<const char *, 
+                                  ACE_Unbounded_Queue<CORBA::Long> *>;
+template class ACE_Hash_Map_Manager_Ex<const char *, 
+                                       ACE_Unbounded_Queue<CORBA::Long> *, 
+                                       ACE_Hash<const char *>, 
+                                       ACE_Equal_To<const char *>, 
+                                       ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<const char *, 
+                                             ACE_Unbounded_Queue<CORBA::Long> *, 
+                                             ACE_Hash<const char *>, 
+                                             ACE_Equal_To<const char *>, 
+                                             ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, 
+                                                ACE_Unbounded_Queue<CORBA::Long> *,
+                                                ACE_Hash<const char *>, 
+                                                ACE_Equal_To<const char *>, 
+                                                ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<const char *, 
+                                        ACE_Unbounded_Queue<CORBA::Long> *, 
+                                        ACE_Hash<const char *>, 
+                                        ACE_Equal_To<const char *>, 
+                                        ACE_Null_Mutex>;
+ 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var>
 
+#pragma instantiate ACE_Node<CORBA::Long>
+#pragma instantiate ACE_Unbounded_Queue<CORBA::Long>
+#pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::Long>
+
+#pragma instantiate ACE_Hash_Map_Entry<const char *, ACE_Unbounded_Queue<CORBA::Long> *>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, ACE_Unbounded_Queue<CORBA::Long> *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, ACE_Unbounded_Queue<CORBA::Long> *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, ACE_Unbounded_Queue<CORBA::Long> *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, ACE_Unbounded_Queue<CORBA::Long> *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+ 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index 4e231c9c829..f6c320dde99 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -19,7 +19,7 @@
 
 #include "ace/pre.h"
 
-#include "ace/Synch.h"
+#include "ace/Hash_Map_Manager_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -296,15 +296,36 @@ namespace CORBA
      */
     const char *root_tc_base_;
 
+    /// Used in our destruction when we are in an Any.
+    static void _tao_any_destructor (void *);
+
     /// skip a typecode encoding in a given CDR stream.  This is just a
     /// helper function.
     static CORBA::Boolean skip_typecode (TAO_InputCDR &stream);
 
+    typedef ACE_Unbounded_Queue<CORBA::Long> OFFSET_LIST;
+    typedef ACE_Unbounded_Queue_Iterator<CORBA::Long> OFFSET_LIST_ITERATOR;
+    typedef ACE_Hash_Map_Entry<const char *, OFFSET_LIST *> OFFSET_MAP_ENTRY;
+    typedef ACE_Hash_Map_Manager_Ex<const char *, 
+                                    OFFSET_LIST *, 
+                                    ACE_Hash<const char *>, 
+                                    ACE_Equal_To<const char *>, 
+                                    ACE_Null_Mutex>
+      OFFSET_MAP;
+
+    typedef ACE_Hash_Map_Iterator_Ex<const char *, 
+                                     OFFSET_LIST *, 
+                                     ACE_Hash<const char *>, 
+                                     ACE_Equal_To<const char *>, 
+                                     ACE_Null_Mutex>
+      OFFSET_MAP_ITERATOR;
+
+    OFFSET_MAP *offset_map (void) const;
+    void offset_map (OFFSET_MAP *map);
+
+    typedef CORBA::TypeCode_ptr _ptr_type;
+    typedef CORBA::TypeCode_var _var_type;
     // Useful for template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef TypeCode_ptr _ptr_type;
-    typedef TypeCode_var _var_type;
-#endif /* __GNUC__ */
 
   private:
     // = All the private/helper methods
@@ -503,6 +524,8 @@ namespace CORBA
      * the destructor.
      */
     char *non_aligned_buffer_;
+
+    OFFSET_MAP *offset_map_;
   };
 
   /**
diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i
index 703fe1816ee..bb6d54cd737 100644
--- a/TAO/tao/Typecode.i
+++ b/TAO/tao/Typecode.i
@@ -49,7 +49,7 @@ CORBA::TypeCode::equivalent (CORBA::TypeCode_ptr tc
 {
   return this->equ_common (tc,
                            1
-                            ACE_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 }
 
 // Returns true if the two typecodes are identical.
@@ -59,7 +59,7 @@ CORBA::TypeCode::equal (CORBA::TypeCode_ptr tc
 {
   return this->equ_common (tc,
                            0
-                            ACE_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 }
 
 // returns the Repository ID
@@ -99,6 +99,18 @@ CORBA::TypeCode::member_count (ACE_ENV_SINGLE_ARG_DECL) const
     return this->private_member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+ACE_INLINE CORBA::TypeCode::OFFSET_MAP *
+CORBA::TypeCode::offset_map (void) const
+{
+  return this->offset_map_;
+}
+
+ACE_INLINE void
+CORBA::TypeCode::offset_map (CORBA::TypeCode::OFFSET_MAP *map)
+{
+  this->offset_map_ = map;
+}
+
 // ************************************************************
 // These are in CORBA namespace
 
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index 16330eaf59b..3afb7fa5fef 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -34,7 +34,6 @@
 #include "tao/CurrentC.h"
 #include "tao/DomainC.h"
 #include "tao/WrongTransactionC.h"
-#include "tao/Services.h"
 #include "tao/NVList.h"
 #include "tao/BoundsC.h"
 
@@ -42,7 +41,9 @@
 #include "tao/PollableC.h"
 #endif /* TAO_HAS_AMI_POLLER == 1 */
 
-ACE_RCSID(tao, Typecode_Constants, "$Id$")
+ACE_RCSID (tao, 
+           Typecode_Constants, 
+           "$Id$")
 
 // Declare all the standard typecodes owned by the ORB
 
@@ -162,15 +163,9 @@ TAO_NAMESPACE_END
 // to the CORBA namespace.
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Current, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ORBid, 0)
 TAO_NAMESPACE_END
 
-CORBA::TypeCode_ptr CORBA::ORB::_tc_ObjectId = 0;
-
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
@@ -180,28 +175,6 @@ TAO_NAMESPACE_END
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-// Service definitions
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceType, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceOption, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceDetailType, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceDetail, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceInformation, 0)
-TAO_NAMESPACE_END
-
 // Internal to TAO ORB
 CORBA::TypeCode_ptr TC_opaque = 0;
 CORBA::TypeCode_ptr TC_completion_status = 0;
@@ -403,33 +376,6 @@ TAO_TypeCodes::init (void)
                                           0,
                                           sizeof (CORBA::ORBid));
 
-  static const CORBA::Long _oc_CORBA_ObjectId[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f62),
-    ACE_NTOHL (0x6a656374),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID =
-                             //   IDL:omg.org/CORBA/ObjectId:1.0
-    9,
-    ACE_NTOHL (0x4f626a65),
-    ACE_NTOHL (0x63744964),
-    ACE_NTOHL (0x0),        // name = ObjectId
-    CORBA::tk_string,
-    0,                      // string length
-  };
-  CORBA::ORB::_tc_ObjectId =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_ObjectId),
-                         (char *) &_oc_CORBA_ObjectId,
-                         0,
-                         sizeof (CORBA::ORB::ObjectId));
-
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
   static const CORBA::Long _oc_corba_NamedValue[] =
@@ -461,304 +407,8 @@ TAO_TypeCodes::init (void)
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
- // Service Types
-  static const CORBA::Long _oc_CORBA_ServiceOption[] =
-  {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   36,
-   ACE_NTOHL (0x49444c3a),
-   ACE_NTOHL (0x6f6d672e),
-   ACE_NTOHL (0x6f72672f),
-   ACE_NTOHL (0x434f5242),
-   ACE_NTOHL (0x412f5365),
-   ACE_NTOHL (0x72766963),
-   ACE_NTOHL (0x654f7074),
-   ACE_NTOHL (0x696f6e3a),
-   ACE_NTOHL (0x312e3000),  // repository ID =
-                            //   IDL:omg.org/CORBA/ServiceOption:1.0
-   14,
-   ACE_NTOHL (0x53657276),
-   ACE_NTOHL (0x6963654f),
-   ACE_NTOHL (0x7074696f),
-   ACE_NTOHL (0x6e000000),  // name = ServiceOption
-   CORBA::tk_ulong,
-  };
-
-  CORBA::_tc_ServiceOption =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_ServiceOption),
-                         (char *) &_oc_CORBA_ServiceOption,
-                         0,
-                         sizeof (CORBA::ServiceOption));
-
-  static const CORBA::Long _oc_CORBA_ServiceDetailType[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-  };
-
- CORBA::_tc_ServiceDetailType =
-   new CORBA::TypeCode (CORBA::tk_alias,
-                        sizeof (_oc_CORBA_ServiceDetailType),
-                        (char *) &_oc_CORBA_ServiceDetailType,
-                        0,
-                        sizeof (CORBA::ServiceDetailType));
-
-  static const CORBA::Long _oc_CORBA_ServiceType[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65547970),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),  // repository ID= IDL:omg.org/CORBA/ServiceType:1.0
-    12,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636554),
-    ACE_NTOHL (0x79706500),  // name = ServiceType
-    CORBA::tk_ushort,
-  };
-
- CORBA::_tc_ServiceType =
-   new CORBA::TypeCode (CORBA::tk_alias,
-                        sizeof (_oc_CORBA_ServiceType),
-                        (char *) &_oc_CORBA_ServiceType,
-                        0,
-                        sizeof (CORBA::ServiceType));
-
-  static const CORBA::Long _oc_CORBA_ServiceDetail[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c3a),
-    ACE_NTOHL (0x312e3000),  // repository ID= IDL:omg.org/CORBA/ServiceDetail:1.0
-    14,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-    2, // member count
-    20,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c5f74),
-    ACE_NTOHL (0x79706500),  // name = service_detail_type
-    CORBA::tk_alias, // typecode kind for typedefs
-    76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-    15,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c0000),  // name = service_detail
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-    0,
-  };
-
-  CORBA::_tc_ServiceDetail =
-    new CORBA::TypeCode (CORBA::tk_struct,
-                         sizeof (_oc_CORBA_ServiceDetail),
-                         (char *) &_oc_CORBA_ServiceDetail,
-                         0,
-                         sizeof (CORBA::ServiceDetail));
-
-
-  static const CORBA::Long _oc_CORBA_ServiceInformation[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65496e66),
-    ACE_NTOHL (0x6f726d61),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0
-    19,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636549),
-    ACE_NTOHL (0x6e666f72),
-    ACE_NTOHL (0x6d617469),
-    ACE_NTOHL (0x6f6e0000),  // name = ServiceInformation
-    2, // member count
-    16,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x6f707469),
-    ACE_NTOHL (0x6f6e7300),  // name = service_options
-    CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x654f7074),
-    ACE_NTOHL (0x696f6e3a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
-    14,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x6963654f),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e000000),  // name = ServiceOption
-    CORBA::tk_ulong,
-    0,
-    16,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c7300),  // name = service_details
-    CORBA::tk_sequence, // typecode kind
-    232, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    216, // encapsulation length
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c3a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
-    14,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-    2, // member count
-    20,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c5f74),
-    ACE_NTOHL (0x79706500),  // name = service_detail_type
-    CORBA::tk_alias, // typecode kind for typedefs
-    76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-    15,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c0000),  // name = service_detail
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-    0,
-    0,
-  };
-
- CORBA::_tc_ServiceInformation =
-    new CORBA::TypeCode (CORBA::tk_struct,
-                         sizeof (_oc_CORBA_ServiceInformation),
-                         (char *) &_oc_CORBA_ServiceInformation,
-                         0,
-                         sizeof (CORBA::ServiceInformation));
-
  // ****************************************************************
 
-  static const CORBA::Long _oc_CORBA_Current[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    22,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4375),
-    ACE_NTOHL (0x7272656e),
-    ACE_NTOHL (0x743a312e),
-    ACE_NTOHL (0x3000fdfd),   // repository ID = IDL:CORBA/Current:1.0
-    8,
-    ACE_NTOHL (0x43757272),
-    ACE_NTOHL (0x656e7400),   // name = Current,
-  };
- CORBA::_tc_Current = new CORBA::TypeCode (CORBA::tk_objref,
-                                           sizeof (_oc_CORBA_Current),
-                                           (char *) &_oc_CORBA_Current,
-                                           1,
-                                           sizeof (CORBA::Current));
-
  // The following are internal to the TAO ORB
 
   // Octet codes for the parameters of the "Opaque" (sequence of octet)
@@ -940,9 +590,6 @@ TAO_TypeCodes::fini (void)
 
   CORBA::release (CORBA::TypeCode::_tc_BadKind);
 
-  // additional typecodes in the CORBA namespace
-  CORBA::release (CORBA::_tc_Current);
-
   CORBA::release (CORBA::_tc_ORBid);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
@@ -950,15 +597,6 @@ TAO_TypeCodes::fini (void)
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-  CORBA::release (CORBA::ORB::_tc_ObjectId);
-
-  // Service types
-  CORBA::release (CORBA::_tc_ServiceType);
-  CORBA::release (CORBA::_tc_ServiceOption);
-  CORBA::release (CORBA::_tc_ServiceDetailType);
-  CORBA::release (CORBA::_tc_ServiceDetail);
-  CORBA::release (CORBA::_tc_ServiceInformation);
-  
   // TAO specific
   CORBA::release (TC_opaque);
 
diff --git a/TAO/tao/Utils/Makefile b/TAO/tao/Utils/Makefile
index e38bf315c32..d64054a6c00 100644
--- a/TAO/tao/Utils/Makefile
+++ b/TAO/tao/Utils/Makefile
@@ -120,7 +120,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -149,7 +150,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
@@ -158,7 +160,8 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -171,20 +174,54 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -254,10 +291,9 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -270,13 +306,13 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -286,6 +322,24 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -304,28 +358,46 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
@@ -392,12 +464,9 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -410,13 +479,13 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -426,6 +495,24 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -444,23 +531,41 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/ValueBase.cpp
index f7acebce25b..045a918d1c3 100644
--- a/TAO/tao/ValueBase.cpp
+++ b/TAO/tao/ValueBase.cpp
@@ -1,3 +1,18 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//     TAO
+//
+// = FILENAME
+//     ValueBase.cpp
+//
+// = AUTHOR
+//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
 #include "tao/CDR.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
@@ -13,7 +28,6 @@ ACE_RCSID (tao,
            ValueBase,
            "$Id$")
 
-
 CORBA::ValueBase::~ValueBase (void)
 {
 }
@@ -24,6 +38,12 @@ CORBA::ValueBase::_downcast (CORBA::ValueBase *vt)
   return vt;  // every vt is a CORBA::ValueBase :-)
 }
 
+void
+CORBA::ValueBase::_tao_any_destructor (void *x)
+{
+  CORBA::ValueBase_ptr tmp = ACE_static_cast (CORBA::ValueBase *, x);
+  CORBA::remove_ref (tmp);
+}
 
 // OBV marshaling in principle:
 // _tao_marshal () is called from the CDR operator<< ()
diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h
index 09f993b90b6..fd45078bb8d 100644
--- a/TAO/tao/ValueBase.h
+++ b/TAO/tao/ValueBase.h
@@ -35,6 +35,8 @@ namespace CORBA
   TAO_NAMESPACE_INLINE_FUNCTION void add_ref (ValueBase *);
   TAO_NAMESPACE_INLINE_FUNCTION void remove_ref (ValueBase *);
 
+  class ValueBase_var;
+
   /**
    * @class ValueBase
    *
@@ -45,6 +47,9 @@ namespace CORBA
   class TAO_Export ValueBase
   {
   public:
+    typedef ValueBase* _ptr_type;
+    typedef ValueBase_var _var_type;
+
     // reference counting
     /// %! virtual CORBA::ValueBase* _copy_value (void) = 0;
     virtual void _add_ref (void) = 0;
@@ -52,7 +57,10 @@ namespace CORBA
     virtual CORBA::ULong _refcount_value (void) = 0;
 
     // dynamic casting
-    static CORBA::ValueBase* _downcast (CORBA::ValueBase*);
+    static CORBA::ValueBase* _downcast (CORBA::ValueBase *);
+
+    /// Used in the implementation of CORBA::Any
+    static void _tao_any_destructor (void *);
 
     /// TAO extension
     virtual const char* _tao_obv_repository_id (void) const = 0;
@@ -136,6 +144,13 @@ namespace CORBA
     CORBA::ValueBase *_retn (void);
     CORBA::ValueBase *ptr (void) const;
 
+    static CORBA::ValueBase * tao_duplicate (CORBA::ValueBase *);
+    static void tao_release (CORBA::ValueBase *);
+    static CORBA::ValueBase * tao_nil (void);
+    static CORBA::ValueBase * tao_narrow (CORBA::ValueBase *
+                                          ACE_ENV_ARG_DECL_NOT_USED);
+    static CORBA::ValueBase * tao_upcast (void *);
+
   private:
     CORBA::ValueBase *ptr_;
   };
diff --git a/TAO/tao/ValueBase.i b/TAO/tao/ValueBase.i
index ae9643745b5..5520bcc80bb 100644
--- a/TAO/tao/ValueBase.i
+++ b/TAO/tao/ValueBase.i
@@ -129,6 +129,43 @@ CORBA::ValueBase_var::_retn (void)
   return val;
 }
 
+ACE_INLINE CORBA::ValueBase *
+CORBA::ValueBase_var::tao_duplicate (CORBA::ValueBase *p)
+{
+  p->_add_ref ();
+  return p;
+}
+
+ACE_INLINE void
+CORBA::ValueBase_var::tao_release (CORBA::ValueBase *p)
+{
+  p->_remove_ref ();
+}
+
+ACE_INLINE CORBA::ValueBase *
+CORBA::ValueBase_var::tao_nil (void)
+{
+  return 0;
+}
+
+ACE_INLINE CORBA::ValueBase *
+CORBA::ValueBase_var::tao_narrow (
+    CORBA::ValueBase *p
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  p->_add_ref ();
+  return CORBA::ValueBase::_downcast (p);
+}
+
+ACE_INLINE CORBA::ValueBase *
+CORBA::ValueBase_var::tao_upcast (void *src)
+{
+  CORBA::ValueBase **tmp =
+    ACE_static_cast (CORBA::ValueBase **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Inline operations for class CORBA::ValueBase_out
 // *************************************************************
diff --git a/TAO/tao/WrongTransaction.pidl b/TAO/tao/WrongTransaction.pidl
index 0c6f36a6a26..c632de95513 100644
--- a/TAO/tao/WrongTransaction.pidl
+++ b/TAO/tao/WrongTransaction.pidl
@@ -10,9 +10,9 @@
  * following command:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *        -o orig -Gp -Gd -Ge 1
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
+ *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        WrongTransaction.pidl
@@ -41,6 +41,4 @@ module CORBA
   exception WrongTransaction {};
 };
 
-#pragma prefix ""
-
 #endif /* TAO_CORBA_WRONGTRANSACTION_PIDL */
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 19cce16c767..8a9d7a222aa 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -19,6 +19,10 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
 #include "WrongTransactionC.h"
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
@@ -33,6 +37,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -41,7 +47,9 @@
 #include "WrongTransactionC.i"
 #endif /* !defined INLINE */
 
-// Default constructor.
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+
 CORBA::WrongTransaction::WrongTransaction (void)
   : CORBA::UserException (
         "IDL:omg.org/CORBA/WrongTransaction:1.0",
@@ -50,12 +58,10 @@ CORBA::WrongTransaction::WrongTransaction (void)
 {
 }
 
-// Destructor - all members are of self managing types.
 CORBA::WrongTransaction::~WrongTransaction (void)
 {
 }
 
-// Copy constructor.
 CORBA::WrongTransaction::WrongTransaction (const ::CORBA::WrongTransaction &_tao_excp)
   : CORBA::UserException (
         _tao_excp._rep_id (),
@@ -64,7 +70,6 @@ CORBA::WrongTransaction::WrongTransaction (const ::CORBA::WrongTransaction &_tao
 {
 }
 
-// Assignment operator.
 CORBA::WrongTransaction&
 CORBA::WrongTransaction::operator= (const ::CORBA::WrongTransaction &_tao_excp)
 {
@@ -79,11 +84,11 @@ void CORBA::WrongTransaction::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA::WrongTransaction *
-CORBA::WrongTransaction::_downcast (CORBA::Exception *exc)
+CORBA::WrongTransaction::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", exc->_rep_id ()))
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (WrongTransaction *, exc);
+      return ACE_dynamic_cast (WrongTransaction *, _tao_excp);
     }
   else
     {
@@ -104,13 +109,13 @@ CORBA::WrongTransaction::_tao_duplicate (void) const
   CORBA::Exception *result;
   ACE_NEW_RETURN (
       result,
-      CORBA::WrongTransaction (*this),
+      ::CORBA::WrongTransaction (*this),
       0
     );
   return result;
 }
 
-void CORBA::WrongTransaction::_raise ()
+void CORBA::WrongTransaction::_raise (void)
 {
   TAO_RAISE (*this);
 }
@@ -124,7 +129,7 @@ void CORBA::WrongTransaction::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -137,32 +142,41 @@ void CORBA::WrongTransaction::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr CORBA::WrongTransaction::_type (void) const
+{
+  return ::CORBA::_tc_WrongTransaction;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
 static const CORBA::Long _oc_CORBA_WrongTransaction[] =
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
+    TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5772),
-  ACE_NTOHL (0x6f6e6754),
-  ACE_NTOHL (0x72616e73),
-  ACE_NTOHL (0x61637469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5772), 
+  ACE_NTOHL (0x6f6e6754), 
+  ACE_NTOHL (0x72616e73), 
+  ACE_NTOHL (0x61637469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/WrongTransaction:1.0
-  17,
-  ACE_NTOHL (0x57726f6e),
-  ACE_NTOHL (0x67547261),
-  ACE_NTOHL (0x6e736163),
-  ACE_NTOHL (0x74696f6e),
+    17,
+  ACE_NTOHL (0x57726f6e), 
+  ACE_NTOHL (0x67547261), 
+  ACE_NTOHL (0x6e736163), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = WrongTransaction
   0, // member count
-};
+  };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_WrongTransaction (
     CORBA::tk_except,
@@ -174,104 +188,76 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_WrongTransaction (
 
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_WrongTransaction, &_tc_TAO_tc_CORBA_WrongTransaction)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_WrongTransaction,
+    &_tc_TAO_tc_CORBA_WrongTransaction
+  )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::WrongTransaction::_type (void) const
-{
-  return ::CORBA::_tc_WrongTransaction;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::WrongTransaction &_tao_elem) // copying
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::WrongTransaction &_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::insert_copy (
+      _tao_any,
+      CORBA::WrongTransaction::_tao_any_destructor,
       CORBA::_tc_WrongTransaction,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
+      _tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::WrongTransaction *_tao_elem) // non copying
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::WrongTransaction *_tao_elem
+  )
 {
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
+  TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::insert (
+      _tao_any,
+      CORBA::WrongTransaction::_tao_any_destructor,
       CORBA::_tc_WrongTransaction,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::WrongTransaction::_tao_any_destructor
+      _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::WrongTransaction *&_tao_elem)
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::WrongTransaction *&_tao_elem
+  )
 {
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::WrongTransaction*&,
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::WrongTransaction *&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::WrongTransaction *&_tao_elem)
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::WrongTransaction *&_tao_elem
+  )
 {
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_WrongTransaction ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (!result)
-      return 0; // not equivalent
-
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::WrongTransaction *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      CORBA::WrongTransaction *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::WrongTransaction, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      CORBA::String_var interface_repository_id;
-      if (!(stream >> interface_repository_id.out ()))
-        return 0;
-      if (ACE_OS::strcmp (
-          interface_repository_id.in (),
-          "IDL:omg.org/CORBA/WrongTransaction:1.0"))
-        return 0;
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_WrongTransaction,
-            1,
-            tmp,
-            CORBA::WrongTransaction::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
+  return
+    TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::extract (
+        _tao_any,
+        CORBA::WrongTransaction::_tao_any_destructor,
+        CORBA::_tc_WrongTransaction,
+        _tao_elem
+      );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index a29869dc5f8..f9cdb311050 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -19,6 +19,9 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
 #ifndef _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_
 #define _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_
 
@@ -59,24 +62,30 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
 TAO_NAMESPACE  CORBA
 {
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_WRONGTRANSACTION_CH_)
 #define _CORBA_WRONGTRANSACTION_CH_
-
+  
   class TAO_Export WrongTransaction : public CORBA::UserException
   {
   public:
-
+    
     WrongTransaction (void);
     WrongTransaction (const WrongTransaction &);
     ~WrongTransaction (void);
 
     WrongTransaction &operator= (const WrongTransaction &);
-
-    static void _tao_any_destructor (void*);
-
+    
+    static void _tao_any_destructor (void *);
+    
     static WrongTransaction *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -88,38 +97,57 @@ TAO_NAMESPACE  CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-
-
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
-TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WrongTransaction;
-
+  
+  // 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_WrongTransaction;
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::WrongTransaction &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::WrongTransaction*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WrongTransaction *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WrongTransaction *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WrongTransaction &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
 
 #if defined (__ACE_INLINE__)
 #include "WrongTransactionC.i"
@@ -137,3 +165,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &)
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/WrongTransactionC.i b/TAO/tao/WrongTransactionC.i
index 84fd54d23eb..bc6631d62a3 100644
--- a/TAO/tao/WrongTransactionC.i
+++ b/TAO/tao/WrongTransactionC.i
@@ -19,20 +19,33 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// *************************************************************
-// Inline operations for exception CORBA::WrongTransaction
-// *************************************************************
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::WrongTransaction &_tao_aggregate)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::WrongTransaction &_tao_aggregate
+  )
 {
-  // first marshal the repository ID
+  // First marshal the repository ID.
   if (strm << _tao_aggregate._rep_id ())
-    return 1;
+    {
+      return 1;
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,CORBA::WrongTransaction&)
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::WrongTransaction&
+  )
 {
   return 1;
 }
+
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index cefbf980b50..8bec4e4467b 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -26,7 +26,9 @@
 #include "tao/ValueBase.h"
 #include "tao/debug.h"
 
-ACE_RCSID(tao, append, "$Id$")
+ACE_RCSID (tao, 
+           append, 
+           "$Id$")
 
 // Encode instances of arbitrary data types based only on typecode.
 // "data" points to the data type; if it's not a primitve data type,
@@ -482,10 +484,11 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
        ++i)
     {
       CORBA::Any_var any = tc->member_label (i
-                                              ACE_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       CORBA::Octet o;
+
       if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
         {
           CORBA::ULong default_index =
@@ -537,15 +540,13 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
 
         case CORBA::tk_enum:
           {
-            CORBA::ULong d;
-
-            // Create an special Any to handle this case.
-            CORBA::Any tmp;
-            tmp._tao_replace (CORBA::_tc_ulong,
-                              any->_tao_byte_order (),
-                              any->_tao_get_cdr ());
-            if ((tmp >>= d) && d == enum_v)
-              current_member = i;
+            const CORBA::ULong *d = 
+              ACE_reinterpret_cast (const CORBA::ULong *,
+                                    any->value ());
+            if (*d == enum_v)
+              {
+                current_member = i;
+              }
           }
           break;
 
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index f11237e3e11..8611c9552c6 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -36,7 +36,7 @@
 // The definitions are included in the same order as they are declared
 // in corbafwd.h
 #include "tao/Typecode.h"
-#include "tao/Any.h"
+#include "tao/Any_T.h"
 
 #include "tao/Environment.h"
 #include "tao/Exception.h"
@@ -55,7 +55,7 @@
 #include "tao/ValueFactory.h"
 #include "tao/AbstractBase.h"
 #include "tao/PolicyC.h"
-#include "tao/Services.h"
+#include "tao/ServicesC.h"
 #include "tao/DomainC.h"
 #include "tao/WrongTransactionC.h"
 
@@ -66,7 +66,7 @@
 #include "tao/Sequence.h"
 #include "tao/Managed_Types.h"
 #include "tao/Object_KeyC.h"
-#include "tao/ObjectIDList.h"
+#include "tao/ObjectIDListC.h"
 
 #include "tao/Remote_Object_Proxy_Impl.h"
 
diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp
index 1fee1e19f99..f71eaa5fa0a 100644
--- a/TAO/tao/corbafwd.cpp
+++ b/TAO/tao/corbafwd.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "tao/corbafwd.h"
 
 #if !defined (__ACE_INLINE__)
@@ -9,7 +11,6 @@ ACE_RCSID (tao,
            corbafwd, 
            "$Id$")
 
-
 char *
 CORBA::string_dup (const char *str)
 {
@@ -65,7 +66,7 @@ namespace CORBA
 {
   // ****************************************************************
 
-  const CORBA::ServiceType Security = 1;
+//  const CORBA::ServiceType Security = 1;
 
   // ****************************************************************
 
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 4365185479e..e6333da1bfc 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -88,7 +88,6 @@ namespace TAO_Collocation_Strategies
 
 // forward declare sequences.
 template <class T> class TAO_Unbounded_Sequence;
-
 /**
  * @class CORBA
  *
@@ -280,7 +279,6 @@ namespace CORBA
   typedef TypeCodeFactory *TypeCodeFactory_ptr;
   class TypeCodeFactory_out;
   class TypeCodeFactory_var;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_TypeCodeFactory;
 
   class ValueBase;
   typedef ValueBase *ValueBase_ptr;
@@ -292,6 +290,22 @@ namespace CORBA
   typedef ValueFactoryBase_var ValueFactory_var;
   class DefaultValueRefCountBase;
 
+  typedef CORBA::Short Visibility;
+  typedef CORBA::Short_out Visibility_out;
+  extern TAO_Export CORBA::TypeCode_ptr _tc_Visibility;
+
+  extern TAO_Export const CORBA::Short PRIVATE_MEMBER;
+  extern TAO_Export const CORBA::Short PUBLIC_MEMBER;
+
+  typedef CORBA::Short ValueModifier;
+  typedef CORBA::Short_out ValueModifier_out;
+  extern TAO_Export CORBA::TypeCode_ptr _tc_ValueModifier;
+
+  extern TAO_Export const CORBA::Short VM_NONE;
+  extern TAO_Export const CORBA::Short VM_CUSTOM;
+  extern TAO_Export const CORBA::Short VM_ABSTRACT;
+  extern TAO_Export const CORBA::Short VM_TRUNCATABLE;
+
   class AbstractBase;
   typedef AbstractBase * AbstractBase_ptr;
   class AbstractBase_var;
@@ -573,7 +587,6 @@ namespace CORBA
   typedef CORBA::UShort ServiceType;
   typedef CORBA::UShort_out ServiceType_out;
   extern TAO_Export CORBA::TypeCode_ptr _tc_ServiceType;
-  extern TAO_Export const ServiceType Security;
 
   typedef CORBA::ULong ServiceOption;
   typedef CORBA::ULong_out ServiceOption_out;
@@ -597,381 +610,6 @@ namespace CORBA
 
   // ****************************************************************
 
-  // =================== Interface Repository =====================
-  typedef char * RepositoryId;
-  typedef CORBA::String_var RepositoryId_var;
-  typedef CORBA::String_out RepositoryId_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_RepositoryId;
-
-  typedef char * Identifier;
-  typedef CORBA::String_var Identifier_var;
-  typedef CORBA::String_out Identifier_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_Identifier;
-
-  typedef char * ScopedName;
-  typedef String_var ScopedName_var;
-  typedef String_out ScopedName_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ScopedName;
-
-  typedef char * VersionSpec;
-  typedef String_var VersionSpec_var;
-  typedef String_out VersionSpec_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_VersionSpec;
-
-  typedef CORBA::Short Visibility;
-  typedef CORBA::Short_out Visibility_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_Visibility;
-
-  extern TAO_Export const CORBA::Short PRIVATE_MEMBER;
-  extern TAO_Export const CORBA::Short PUBLIC_MEMBER;
-
-  typedef CORBA::Short ValueModifier;
-  typedef CORBA::Short_out ValueModifier_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ValueModifier;
-
-  extern TAO_Export const CORBA::Short VM_NONE;
-  extern TAO_Export const CORBA::Short VM_CUSTOM;
-  extern TAO_Export const CORBA::Short VM_ABSTRACT;
-  extern TAO_Export const CORBA::Short VM_TRUNCATABLE;
-
-  typedef char * ContextIdentifier;
-  typedef CORBA::String_var ContextIdentifier_var;
-  typedef CORBA::String_out ContextIdentifier_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ContextIdentifier;
-
-  class IRObject;
-  typedef IRObject * IRObject_ptr;
-  class IRObject_var;
-  class IRObject_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_IRObject;
-
-  enum DefinitionKind
-    {
-        dk_none,
-        dk_all,
-        dk_Attribute,
-        dk_Constant,
-        dk_Exception,
-        dk_Interface,
-        dk_Module,
-        dk_Operation,
-        dk_Typedef,
-        dk_Alias,
-        dk_Struct,
-        dk_Union,
-        dk_Enum,
-        dk_Primitive,
-        dk_String,
-        dk_Sequence,
-        dk_Array,
-        dk_Repository,
-        dk_Wstring,
-        dk_Fixed,
-        dk_Value,
-        dk_ValueBox,
-        dk_ValueMember,
-        dk_Native,
-        dk_AbstractInterface,
-        dk_LocalInterface,
-        dk_Component,
-        dk_Home,
-        dk_Factory,
-        dk_Finder,
-        dk_PrimaryKey,
-        dk_Emits,
-        dk_Publishes,
-        dk_Consumes,
-        dk_Provides,
-        dk_Uses,
-        dk_Event
-    };
-
-  typedef DefinitionKind & DefinitionKind_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_DefinitionKind;
-
-  class Contained;
-  typedef Contained * Contained_ptr;
-  class Contained_var;
-  class Contained_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_Contained;
-
-  class ContainedSeq;
-  class ContainedSeq_var;
-  class ContainedSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ContainedSeq;
-
-  class Repository;
-  typedef Repository * Repository_ptr;
-  class Repository_var;
-  class Repository_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_Repository;
-
-  class Container;
-  typedef Container * Container_ptr;
-  class Container_var;
-  class Container_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_Container;
-
-  class ModuleDef;
-  typedef ModuleDef * ModuleDef_ptr;
-  class ModuleDef_var;
-  class ModuleDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ModuleDef;
-
-  class ConstantDef;
-  typedef ConstantDef * ConstantDef_ptr;
-  class ConstantDef_var;
-  class ConstantDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ConstantDef;
-
-  class IDLType;
-  typedef IDLType * IDLType_ptr;
-  class IDLType_var;
-  class IDLType_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_IDLType;
-
-  class StructDef;
-  typedef StructDef * StructDef_ptr;
-  class StructDef_var;
-  class StructDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_StructDef;
-
-  class UnionDef;
-  typedef UnionDef * UnionDef_ptr;
-  class UnionDef_var;
-  class UnionDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_UnionDef;
-
-  class EnumDef;
-  typedef EnumDef * EnumDef_ptr;
-  class EnumDef_var;
-  class EnumDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_EnumDef;
-
-  class AliasDef;
-  typedef AliasDef * AliasDef_ptr;
-  class AliasDef_var;
-  class AliasDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_AliasDef;
-
-  class InterfaceDef;
-  typedef InterfaceDef * InterfaceDef_ptr;
-  class InterfaceDef_var;
-  class InterfaceDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_InterfaceDef;
-
-  class AbstractInterfaceDef;
-  typedef AbstractInterfaceDef * AbstractInterfaceDef_ptr;
-  class AbstractInterfaceDef_var;
-  class AbstractInterfaceDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_AbstractInterfaceDef;
-
-  class LocalInterfaceDef;
-  typedef LocalInterfaceDef * LocalInterfaceDef_ptr;
-  class LocalInterfaceDef_var;
-  class LocalInterfaceDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_LocalInterfaceDef;
-
-  class ExceptionDef;
-  typedef ExceptionDef * ExceptionDef_ptr;
-  class ExceptionDef_var;
-  class ExceptionDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ExceptionDef;
-
-  class NativeDef;
-  typedef NativeDef * NativeDef_ptr;
-  class NativeDef_var;
-  class NativeDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_NativeDef;
-
-  class InterfaceDefSeq;
-  class InterfaceDefSeq_var;
-  class InterfaceDefSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_InterfaceDefSeq;
-
-  class AbstractInterfaceDefSeq;
-  class AbstractInterfaceDefSeq_var;
-  class AbstractInterfaceDefSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_AbstractInterfaceDefSeq;
-
-  class LocalInterfaceDefSeq;
-  class LocalInterfaceDefSeq_var;
-  class LocalInterfaceDefSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_LocalInterfaceDefSeq;
-
-  class ValueDef;
-  typedef ValueDef * ValueDef_ptr;
-  class ValueDef_var;
-  class ValueDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ValueDef;
-
-  class ValueDefSeq;
-  class ValueDefSeq_var;
-  class ValueDefSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ValueDefSeq;
-
-  class ValueBoxDef;
-  typedef ValueBoxDef * ValueBoxDef_ptr;
-  class ValueBoxDef_var;
-  class ValueBoxDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ValueBoxDef;
-
-  struct StructMember;
-  class StructMember_var;
-  class StructMember_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_StructMember;
-
-  class StructMemberSeq;
-  class StructMemberSeq_var;
-  class StructMemberSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_StructMemberSeq;
-
-  struct Initializer;
-  class Initializer_var;
-  class Initializer_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_Initializer;
-
-  class InitializerSeq;
-  class InitializerSeq_var;
-  class InitializerSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_InitializerSeq;
-
-  struct UnionMember;
-  class UnionMember_var;
-  class UnionMember_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_UnionMember;
-
-  class UnionMemberSeq;
-  class UnionMemberSeq_var;
-  class UnionMemberSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_UnionMemberSeq;
-
-  class EnumMemberSeq;
-  class EnumMemberSeq_var;
-  class EnumMemberSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_EnumMemberSeq;
-
-  struct ModuleDescription;
-  class ModuleDescription_var;
-  class ModuleDescription_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ModuleDescription;
-
-  struct ConstantDescription;
-  class ConstantDescription_var;
-  class ConstantDescription_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ConstantDescription;
-
-  class TypedefDef;
-  typedef TypedefDef * TypedefDef_ptr;
-  class TypedefDef_var;
-  class TypedefDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_TypedefDef;
-
-  struct TypeDescription;
-  class TypeDescription_var;
-  class TypeDescription_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_TypeDescription;
-
-  class PrimitiveDef;
-  typedef PrimitiveDef * PrimitiveDef_ptr;
-  class PrimitiveDef_var;
-  class PrimitiveDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_PrimitiveDef;
-
-  class StringDef;
-  typedef StringDef * StringDef_ptr;
-  class StringDef_var;
-  class StringDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_StringDef;
-
-  class WstringDef;
-  typedef WstringDef * WstringDef_ptr;
-  class WstringDef_var;
-  class WstringDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_WstringDef;
-
-  class FixedDef;
-  typedef FixedDef * FixedDef_ptr;
-  class FixedDef_var;
-  class FixedDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_FixedDef;
-
-  class SequenceDef;
-  typedef SequenceDef * SequenceDef_ptr;
-  class SequenceDef_var;
-  class SequenceDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_SequenceDef;
-
-  class ArrayDef;
-  typedef ArrayDef * ArrayDef_ptr;
-  class ArrayDef_var;
-  class ArrayDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ArrayDef;
-
-  struct ExceptionDescription;
-  class ExceptionDescription_var;
-  class ExceptionDescription_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ExceptionDescription;
-
-  class ExceptionDefSeq;
-  class ExceptionDefSeq_var;
-  class ExceptionDefSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ExceptionDefSeq;
-
-  class ExcDescriptionSeq;
-  class ExcDescriptionSeq_var;
-  class ExcDescriptionSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
-
-  enum AttributeMode
-  {
-    ATTR_NORMAL,
-    ATTR_READONLY
-  };
-
-  typedef AttributeMode & AttributeMode_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_AttributeMode;
-
-  class AttributeDef;
-  typedef AttributeDef * AttributeDef_ptr;
-  class AttributeDef_var;
-  class AttributeDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_AttributeDef;
-
-  struct AttributeDescription;
-  class AttributeDescription_var;
-  class AttributeDescription_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_AttributeDescription;
-
-  enum PrimitiveKind
-    {
-      pk_null,
-      pk_void,
-      pk_short,
-      pk_long,
-      pk_ushort,
-      pk_ulong,
-      pk_float,
-      pk_double,
-      pk_boolean,
-      pk_char,
-      pk_octet,
-      pk_any,
-      pk_TypeCode,
-      pk_Principal,
-      pk_string,
-      pk_objref,
-      pk_longlong,
-      pk_ulonglong,
-      pk_longdouble,
-      pk_wchar,
-      pk_wstring,
-      pk_value_base
-    };
-
-  typedef PrimitiveKind & PrimitiveKind_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_PrimitiveKind;
-
   enum ParameterMode
     {
       PARAM_IN,
@@ -979,86 +617,6 @@ namespace CORBA
       PARAM_INOUT
     };
 
-  typedef ParameterMode & ParameterMode_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ParameterMode;
-
-  struct ParameterDescription;
-  class ParameterDescription_var;
-  class ParameterDescription_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ParameterDescription;
-
-  class ParDescriptionSeq;
-  class ParDescriptionSeq_var;
-  class ParDescriptionSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ParDescriptionSeq;
-
-  class ContextIdSeq;
-  class ContextIdSeq_var;
-  class ContextIdSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ContextIdSeq;
-
-  class OperationDef;
-  typedef OperationDef * OperationDef_ptr;
-  class OperationDef_var;
-  class OperationDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_OperationDef;
-
-  enum OperationMode
-    {
-      OP_NORMAL,
-      OP_ONEWAY
-    };
-
-  typedef OperationMode & OperationMode_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_OperationMode;
-
-  struct OperationDescription;
-  class OperationDescription_var;
-  class OperationDescription_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_OperationDescription;
-
-  class RepositoryIdSeq;
-  class RepositoryIdSeq_var;
-  class RepositoryIdSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
-
-  class OpDescriptionSeq;
-  class OpDescriptionSeq_var;
-  class OpDescriptionSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_OpDescriptionSeq;
-
-  class AttrDescriptionSeq;
-  class AttrDescriptionSeq_var;
-  class AttrDescriptionSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_AttrDescriptionSeq;
-
-  struct InterfaceDescription;
-  class InterfaceDescription_var;
-  class InterfaceDescription_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_InterfaceDescription;
-
-  struct ValueMember;
-  class ValueMember_var;
-  class ValueMember_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ValueMember;
-
-  class ValueMemberSeq;
-  class ValueMemberSeq_var;
-  class ValueMemberSeq_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ValueMemberSeq;
-
-  class ValueMemberDef;
-  typedef ValueMemberDef * ValueMemberDef_ptr;
-  class ValueMemberDef_var;
-  class ValueMemberDef_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ValueMemberDef;
-
-  struct ValueDescription;
-  class ValueDescription_var;
-  class ValueDescription_out;
-  extern TAO_Export CORBA::TypeCode_ptr _tc_ValueDescription;
-  // ================== Interface Repository =====================
-
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   class ConstructionPolicy;
   typedef ConstructionPolicy * ConstructionPolicy_ptr;
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index 65714ddb943..5f6f56d77dd 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -8,6 +8,7 @@
 #define TAO_ORB_IDL
 
 #include <Policy.pidl>
+#include <Services.pidl>
 
 #pragma prefix "omg.org"
 
@@ -80,24 +81,18 @@ module CORBA
     PARAM_INOUT
   };
 
-  typedef string ObjectId;
-  typedef sequence <ObjectId> ObjectIdList;
-
-  typedef unsigned short ServiceType;
-  typedef unsigned long ServiceOption;
-  typedef unsigned long ServiceDetailType;
+  typedef short ValueModifier;
+  const ValueModifier VM_NONE = 0;
+  const ValueModifier VM_CUSTOM = 1;
+  const ValueModifier VM_ABSTRACT = 2;
+  const ValueModifier VM_TRUNCATABLE = 3;
 
-  struct ServiceDetail
-  {
-    ServiceDetailType service_detail_type;
-    sequence <octet> service_detail;
-  };
+  typedef short Visibility;
+  const Visibility PRIVATE_MEMBER = 0;
+  const Visibility PUBLIC_MEMBER = 1;
 
-  struct ServiceInformation
-  {
-    sequence <ServiceOption> service_options;
-    sequence <ServiceDetail> service_details;
-  };
+  typedef string ObjectId;
+  typedef sequence <ObjectId> ObjectIdList;
 
   // Portable Interceptor specification adds these types.
   typedef sequence<string> StringSeq;
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index d10a9f4526e..1907dfdc9d4 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -487,15 +487,13 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
 
         case CORBA::tk_enum:
           {
-            CORBA::ULong d;
-
-            // Create an special Any to handle this case.
-            CORBA::Any tmp;
-            tmp._tao_replace (CORBA::_tc_ulong,
-                              any->_tao_byte_order (),
-                              any->_tao_get_cdr ());
-            if ((tmp >>= d) && d == enum_v)
-              current_member = i;
+            const CORBA::ULong *d = 
+              ACE_reinterpret_cast (const CORBA::ULong *,
+                                    any->value ());
+            if (*d == enum_v)
+              {
+                current_member = i;
+              }
           }
           break;
 
diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h
index 488511a0ca8..4c9f8d552aa 100644
--- a/TAO/tao/target_specification.h
+++ b/TAO/tao/target_specification.h
@@ -81,7 +81,7 @@ public:
   // stack. These methods does not make a copy but holds the pointer
   // passed in.
   /// Set the target specification by giving the object key.
-  void target_specifier (const TAO_ObjectKey &key);
+  void target_specifier (const TAO::ObjectKey &key);
 
 
   /// Set the target specification by passing in an IOP::TaggedProfile.
@@ -101,7 +101,7 @@ public:
    * the stored specifier is not of the right type then this would
    * return a NULL
    */
-  const TAO_ObjectKey* object_key (void);
+  const TAO::ObjectKey* object_key (void);
 
   /**
    * Returns the IOP::TaggedProfile after a check of the stored specifier. If
@@ -124,7 +124,7 @@ public:
 private:
   union
   {
-    TAO_ObjectKey *object_key_;
+    TAO::ObjectKey *object_key_;
     IOP::TaggedProfile *profile_;
     IOP::IOR *ior_;
   } u_;
diff --git a/TAO/tao/target_specification.i b/TAO/tao/target_specification.i
index 17b942b85c3..75fd8e7af24 100644
--- a/TAO/tao/target_specification.i
+++ b/TAO/tao/target_specification.i
@@ -11,7 +11,7 @@ TAO_Target_Specification::TAO_Target_Specification (void)
 }
 
 ACE_INLINE void
-TAO_Target_Specification::target_specifier (const TAO_ObjectKey &key)
+TAO_Target_Specification::target_specifier (const TAO::ObjectKey &key)
 {
   this->specifier_ = TAO_Target_Specification::Key_Addr;
   // @@ Bala: this is a good recipe for a crash, if the <key> was on
@@ -23,7 +23,7 @@ TAO_Target_Specification::target_specifier (const TAO_ObjectKey &key)
   // general is better....  but you are probably right in this case, i
   // suspect this stuff goes right in the critical path, right? So
   // making a copy of the object key would be too expensive..
-  this->u_.object_key_ = ACE_const_cast (TAO_ObjectKey *,
+  this->u_.object_key_ = ACE_const_cast (TAO::ObjectKey *,
                                          &key);
 }
 
@@ -48,7 +48,7 @@ TAO_Target_Specification::target_specifier (IOP::IOR &ior,
       
 }
 
-ACE_INLINE const TAO_ObjectKey*
+ACE_INLINE const TAO::ObjectKey*
 TAO_Target_Specification::object_key (void)
 {
   if (this->specifier_ == TAO_Target_Specification::Key_Addr)